From f30a977b18541d2f1b9a7863b1377e5f366df9dc Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 16 Nov 2020 18:01:41 +0800
Subject: [PATCH] 修改时间的bug
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
index 2ee5b2d..090a6ec 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
@@ -8,7 +8,6 @@
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.usercenter.model.SysHospital;
-import com.kidgrow.usercenter.service.ISysDepartmentService;
import com.kidgrow.usercenter.service.ISysHospitalService;
import com.kidgrow.usercenter.service.ISysOrganizationService;
import com.kidgrow.usercenter.vo.HospitalListVo;
@@ -44,8 +43,6 @@
public class SysHospitalController extends BaseController {
@Autowired
private ISysHospitalService sysHospitalService;
- @Autowired
- private ISysDepartmentService departmentService;
@Autowired
private ISysOrganizationService organizationService;
@@ -170,14 +167,21 @@
sysOrganization.setOrgAttr(1);
sysOrganization.setOrgLevel(1);
sysOrganization.setOrgParentId(DictionariesConstants.ORG_PARENT_ID);
+ if(!sysUser.getOrganizations().isEmpty()){
+ sysOrganization.setCreateUserOrgCode(sysUser.getOrganizations().get(1).getOrgCode());
+ }
} else {
sysOrganization.setOrgName(sysHospital.getHospitalName());
}
- boolean org = organizationService.saveOrUpdate(sysOrganization);
+ boolean org = organizationService.saveOrUpdateSer(sysOrganization);
sysHospital.setOrgId(sysOrganization.getId());
List<SysOrganization> organizations = sysUser.getOrganizations();
if (organizations.size() > 0) {
sysHospital.setCreateUserOrgCode(organizations.get(organizations.size() - 1).getOrgCode());
+ }
+ //运营平台添加的医院默认就是正式的
+ if (sysHospital.getHospitalState()==null) {
+ sysHospital.setHospitalState(1);
}
boolean v = sysHospitalService.saveOrUpdate(sysHospital);
if (v) {
@@ -223,4 +227,18 @@
}
return sysHospitalService.updateEnabled(params);
}
+
+ /**
+ * 统计医院数量
+ * @param datatype 医院类型
+ * 0 试用医院
+ * 1 正式医院
+ * 11 筛查医院
+ * @return
+ */
+ @ApiOperation(value = "统计医院数量")
+ @GetMapping("/chartHospital")
+ public ResultBody chartHospital(int datatype) {
+ return sysHospitalService.chartHospital(datatype);
+ }
}
--
Gitblit v1.8.0