From 0a8b731d9cf46c78c0c4c66fa9954eeb262e4017 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Mon, 10 Aug 2020 09:20:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java | 60 +++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 21 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 b8e9934..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;
@@ -45,8 +44,6 @@
@Autowired
private ISysHospitalService sysHospitalService;
@Autowired
- private ISysDepartmentService departmentService;
- @Autowired
private ISysOrganizationService organizationService;
/**
@@ -80,7 +77,7 @@
params.put("page", 1);
params.put("limit", 10);
}
- return sysHospitalService.findHospitalList(params,user);
+ return sysHospitalService.findHospitalList(params, user);
}
@PostMapping("findAll")
@@ -96,7 +93,7 @@
@PostMapping("findAllByMap")
@ApiOperation(value = "查询所有列表")
public ResultBody<SysHospital> findAllByMap(@RequestBody Map<String, Object> params) {
- return sysHospitalService.findAll(params);
+ return sysHospitalService.findAll(params);
}
/**
@@ -108,6 +105,7 @@
SysHospital model = sysHospitalService.getById(id);
return ResultBody.ok().data(model).msg("查询成功");
}
+
/**
* 查询
*/
@@ -120,6 +118,7 @@
return ResultBody.ok().data(null).msg("");
}
}
+
/**
* 根据SysHospital当做查询条件进行查询
*/
@@ -129,15 +128,16 @@
SysHospital model = sysHospitalService.findByObject(sysHospital);
return ResultBody.ok().data(model).msg("查询成功");
}
+
/**
* 修改医院logo
*/
@ApiOperation(value = "保存")
@PostMapping("/updateLogo")
- public ResultBody updateLogo(@RequestBody Map<String, Object> params)
- {
+ public ResultBody updateLogo(@RequestBody Map<String, Object> params) {
return sysHospitalService.updateLogo(params);
}
+
/**
* 新增or更新
*/
@@ -152,32 +152,36 @@
return ResultBody.failed().msg(errMsg.toString());
} else {
//先检查该医院是否存在组织信息
- SysOrganization sysOrganization=new SysOrganization();
- if(sysHospital.getOrgId()!=null){
- sysOrganization.setId(sysHospital.getOrgId());}
- else{
+ SysOrganization sysOrganization = new SysOrganization();
+ if (sysHospital.getOrgId() != null) {
+ sysOrganization.setId(sysHospital.getOrgId());
+ } else {
sysOrganization.setOrgName(sysHospital.getHospitalName());
sysOrganization.setOrgParentId(DictionariesConstants.ORG_PARENT_ID);
}
- sysOrganization=organizationService.findByObject(sysOrganization);
- if(sysOrganization==null)
- {
+ sysOrganization = organizationService.findByObject(sysOrganization);
+ if (sysOrganization == null) {
//创建一个组织
- sysOrganization=new SysOrganization();
+ sysOrganization = new SysOrganization();
sysOrganization.setOrgName(sysHospital.getHospitalName());
sysOrganization.setOrgAttr(1);
sysOrganization.setOrgLevel(1);
sysOrganization.setOrgParentId(DictionariesConstants.ORG_PARENT_ID);
- }
- else
- {
+ 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 (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