From 24679b74b46479acf248151f70a3768a9588249b Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 15 Oct 2020 16:58:55 +0800
Subject: [PATCH] 修改 h端添加的用户不能在h端登录的问题
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java | 62 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 29 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 d40fa17..799c9b4 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
@@ -157,30 +157,30 @@
//科室数据
SysDepartment sysDepartment=departmentMapper.selectById(departmentId);
//医院数据
- SysHospital sysHospital = baseMapper.selectById(id);
- if (sysHospital == null) {
- return ResultBody.failed("医院数据不存在！");
- }
+ //SysHospital sysHospital = baseMapper.selectById(id);
+// 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(sysOrganizationList.size()==1)
- {
- sysHospital.setIsDel(true);
- baseMapper.updateById(sysHospital);
- SysOrganization sysOrganizationH=sysOrganizationMapper.selectById(sysHospital.getOrgId());
- if (sysOrganizationH != null) {
- sysOrganizationH.setIsDel(true);
- sysOrganizationMapper.updateById(sysOrganizationH);
- }
- }
+// 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(sysOrganizationList.size()==1)
+// {
+// sysHospital.setIsDel(true);
+// 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);
//删除组织数据
@@ -189,7 +189,7 @@
sysOrganizationD.setIsDel(true);
sysOrganizationMapper.updateById(sysOrganizationD);
}
- return (j>0) ? ResultBody.ok().data(sysHospital).msg("删除成功") : ResultBody.failed("删除失败");
+ return (j>0) ? ResultBody.ok().data(sysDepartment).msg("科室删除成功") : ResultBody.failed("科室删除失败");
}
/**
@@ -221,14 +221,18 @@
}
}
+
+ /**
+ * 统计医院数量
+ * @param datatype 医院类型
+ * 0 试用医院
+ * 1 正式医院
+ * 11 筛查医院
+ * @return
+ */
@Override
- public ResultBody chartsUserDatas() {
- //正式医院数据
- int hospitalCount=baseMapper.chartHospital(1);
- //试用医院数据
- int tempHospitalCount=baseMapper.chartHospital(0);
- //筛查医院
- int screenHospitalCount=baseMapper.chartHospital(11);
- return null;
+ public ResultBody chartHospital(int datatype) {
+ int hospitalCount=baseMapper.chartHospital(datatype);
+ return ResultBody.ok().data(hospitalCount).msg("获取数据成功");
}
}
--
Gitblit v1.8.0