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-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java | 74 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 15 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java
index e5f1a18..2daf614 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java
@@ -3,11 +3,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.usercenter.mapper.SysDepartmentMapper;
import com.kidgrow.usercenter.mapper.SysHospitalMapper;
+import com.kidgrow.usercenter.mapper.SysOrganizationMapper;
import com.kidgrow.usercenter.model.SysDepartment;
import com.kidgrow.usercenter.model.SysHospital;
import com.kidgrow.usercenter.service.ISysHospitalService;
@@ -38,6 +40,8 @@
private SysDepartmentMapper departmentMapper;
@Autowired
private SysRoleOrganizationServiceImpl SysRoleOrganizationServiceImpl;
+ @Autowired
+ private SysOrganizationMapper sysOrganizationMapper;
/**
* 列表
* @param params
@@ -59,6 +63,9 @@
public PageResult<HospitalListVo> findHospitalList(Map<String, Object> params, SysUser user) {
Page<HospitalListVo> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
SysRoleOrganizationServiceImpl.getRoleOrg(params, user);
+ if(params.get("roleOrg")==null){
+ return PageResult.<HospitalListVo>builder().data(null).code(0).count(page.getTotal()).build();
+ }
List<HospitalListVo> list = baseMapper.findHospitalList(page, params);
return PageResult.<HospitalListVo>builder().data(list).code(0).count(page.getTotal()).build();
}
@@ -105,10 +112,10 @@
SysHospital sysHospital = baseMapper.selectById(id);
//医院下的所有数据
Map<String,Object> columnMap=new HashMap<String,Object>();
- columnMap.put("hospital_id",id);
- columnMap.put("is_del",(boolean)false);
- columnMap.put("enabled",!enabled);
- List<SysDepartment> sysDepartmentList=departmentMapper.selectByMap(columnMap);
+ columnMap.put("is_del",0);
+ columnMap.put("enabled",(enabled)?0:1);
+ columnMap.put("org_parent_id",sysHospital.getOrgId());
+ List<SysOrganization> sysOrganizationList=sysOrganizationMapper.selectByMap(columnMap);
if (sysHospital == null) {
return ResultBody.failed("医院数据不存在！");
}
@@ -116,14 +123,24 @@
return ResultBody.failed("科室数据不存在！");
}
//如果这个医院下有多个科室，禁用只对当前科室有效，否则也要禁用医院
- if(sysDepartmentList.size()==1)
+ if(sysOrganizationList.size()==1)
{
sysHospital.setEnabled(enabled);
- int i =baseMapper.updateById(sysHospital);
- //Log.info("修改医院状态为:{}",enabled+" "+i);
+ baseMapper.updateById(sysHospital);
+ SysOrganization sysOrganizationH=sysOrganizationMapper.selectById(sysHospital.getOrgId());
+ if (sysOrganizationH != null) {
+ sysOrganizationH.setEnabled(enabled);
+ sysOrganizationMapper.updateById(sysOrganizationH);
+ }
}
sysDepartment.setEnabled(enabled);
int j=departmentMapper.updateById(sysDepartment);
+ //更新组织数据
+ SysOrganization sysOrganizationD=sysOrganizationMapper.selectById(sysDepartment.getOrgId());
+ if (sysOrganizationD != null) {
+ sysOrganizationD.setEnabled(enabled);
+ sysOrganizationMapper.updateById(sysOrganizationD);
+ }
return (j > 0) ? ResultBody.ok().data(sysHospital).msg("更新成功") : ResultBody.failed("更新失败");
}
@@ -141,26 +158,38 @@
SysDepartment sysDepartment=departmentMapper.selectById(departmentId);
//医院数据
SysHospital sysHospital = baseMapper.selectById(id);
- //医院下的所有数据
- Map<String,Object> columnMap=new HashMap<String,Object>();
- columnMap.put("hospital_id",id);
- List<SysDepartment> sysDepartmentList=departmentMapper.selectByMap(columnMap);
if (sysHospital == null) {
return ResultBody.failed("医院数据不存在！");
}
if (sysDepartment == null) {
return ResultBody.failed("科室数据不存在！");
}
+ //医院下的所有科室数据
+ Map<String,Object> columnMap=new HashMap<String,Object>();
+ columnMap.put("org_parent_id",sysHospital.getOrgId());
+ columnMap.put("is_del",0);
+ columnMap.put("enabled",1);
+ List<SysOrganization> sysOrganizationList=sysOrganizationMapper.selectByMap(columnMap);
//如果这个医院下有多个科室，禁用只对当前科室有效，否则也要禁用医院
- if(sysDepartmentList.size()==1)
+ if(sysOrganizationList.size()==1)
{
sysHospital.setIsDel(true);
- int i =baseMapper.updateById(sysHospital);
- //Log.info("修改医院状态为:{}",enabled+" "+i);
+ baseMapper.updateById(sysHospital);
+ SysOrganization sysOrganizationH=sysOrganizationMapper.selectById(sysHospital.getOrgId());
+ if (sysOrganizationH != null) {
+ sysOrganizationH.setIsDel(true);
+ sysOrganizationMapper.updateById(sysOrganizationH);
+ }
}
sysDepartment.setIsDel(true);
int j=departmentMapper.updateById(sysDepartment);
- return (j > 0) ? ResultBody.ok().data(sysHospital).msg("删除成功") : ResultBody.failed("删除失败");
+ //删除组织数据
+ SysOrganization sysOrganizationD=sysOrganizationMapper.selectById(sysDepartment.getOrgId());
+ if (sysOrganizationD != null) {
+ sysOrganizationD.setIsDel(true);
+ sysOrganizationMapper.updateById(sysOrganizationD);
+ }
+ return (j>0) ? ResultBody.ok().data(sysHospital).msg("删除成功") : ResultBody.failed("删除失败");
}
/**
@@ -191,4 +220,19 @@
return ResultBody.failed("修改数据有误！");
}
}
+
+
+ /**
+ * 统计医院数量
+ * @param datatype 医院类型
+ * 0 试用医院
+ * 1 正式医院
+ * 11 筛查医院
+ * @return
+ */
+ @Override
+ public ResultBody chartHospital(int datatype) {
+ int hospitalCount=baseMapper.chartHospital(datatype);
+ return ResultBody.ok().data(hospitalCount).msg("获取数据成功");
+ }
}
--
Gitblit v1.8.0