From 56246bf398ad14811d0074cc3391c40a5243a0f9 Mon Sep 17 00:00:00 2001 From: hujl Date: Wed, 5 Jan 2022 08:47:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8F=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=BA=E5=A7=93=E5=90=8D=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ipml/Archive_MasterServiceImpl.java | 258 +++++++++--------- .../ipml/Emr_Fault_DetailServiceImpl.java | 55 +++- .../views/dictionaryDir/dictionary.jsp | 2 +- .../views/faultTypeDir/faultTypeList.jsp | 19 +- 4 files changed, 199 insertions(+), 135 deletions(-) diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index 611f4705..e34967ba 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -387,28 +387,30 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Override public List selectOverdue(Archive_Master_Vo archiveMasterVo) { List list = archiveMasterMapper.selectOverdue(archiveMasterVo); - //查询用户集合 - JSONArray powerUsers = powerUserService.getPowerUserList("1"); - List powerUserList = null; - if (!CollectionUtils.isEmpty(powerUsers)) { - //转换对象 - powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); - } - //遍历赋值 - for (Archive_Master_Vo archiveMaster : list) { - if (null != powerUserList) { - //获取主管医生 - String doctorInCharge = archiveMaster.getDoctorInCharge(); - //获取 初审人 - String firstInstance = archiveMaster.getFirstInstance(); - //遍历匹配工号赋值姓名 - for (Power_User_Dto powerUserDto : powerUserList) { - String name = powerUserDto.getName(); - if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) { - archiveMaster.setDoctorInCharge(name); - } - if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) { - archiveMaster.setFirstInstance(name); + if(list!=null && list.size()>0){ + //查询用户集合 + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = null; + if (!CollectionUtils.isEmpty(powerUsers)) { + //转换对象 + powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); + } + //遍历赋值 + for (Archive_Master_Vo archiveMaster : list) { + if (null != powerUserList) { + //获取主管医生 + String doctorInCharge = archiveMaster.getDoctorInCharge(); + //获取 初审人 + String firstInstance = archiveMaster.getFirstInstance(); + //遍历匹配工号赋值姓名 + for (Power_User_Dto powerUserDto : powerUserList) { + String name = powerUserDto.getName(); + if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) { + archiveMaster.setDoctorInCharge(name); + } + if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) { + archiveMaster.setFirstInstance(name); + } } } } @@ -420,29 +422,30 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { public OffsetLimitPage selectOverdue(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = archiveMasterMapper.selectOverdue(archiveMasterVo); - - //查询用户集合 - JSONArray powerUsers = powerUserService.getPowerUserList("1"); - List powerUserList = null; - if (!CollectionUtils.isEmpty(powerUsers)) { - //转换对象 - powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); - } - //遍历赋值 - for (Archive_Master_Vo archiveMaster : list) { - if (null != powerUserList) { - //获取主管医生 - String doctorInCharge = archiveMaster.getDoctorInCharge(); - //获取 初审人 - String firstInstance = archiveMaster.getFirstInstance(); - //遍历匹配工号赋值姓名 - for (Power_User_Dto powerUserDto : powerUserList) { - String name = powerUserDto.getName(); - if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) { - archiveMaster.setDoctorInCharge(name); - } - if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) { - archiveMaster.setFirstInstance(name); + if(list!=null && list.size()>0) { + //查询用户集合 + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = null; + if (!CollectionUtils.isEmpty(powerUsers)) { + //转换对象 + powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); + } + //遍历赋值 + for (Archive_Master_Vo archiveMaster : list) { + if (null != powerUserList) { + //获取主管医生 + String doctorInCharge = archiveMaster.getDoctorInCharge(); + //获取 初审人 + String firstInstance = archiveMaster.getFirstInstance(); + //遍历匹配工号赋值姓名 + for (Power_User_Dto powerUserDto : powerUserList) { + String name = powerUserDto.getName(); + if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) { + archiveMaster.setDoctorInCharge(name); + } + if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) { + archiveMaster.setFirstInstance(name); + } } } } @@ -453,28 +456,30 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Override public List selectOverdue2(Archive_Master_Vo archiveMasterVo) { List list = archiveMasterMapper.selectOverdue2(archiveMasterVo); - //查询用户集合 - JSONArray powerUsers = powerUserService.getPowerUserList("1"); - List powerUserList = null; - if (!CollectionUtils.isEmpty(powerUsers)) { - //转换对象 - powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); - } - //遍历赋值 - for (Archive_Master_Vo archiveMaster : list) { - if (null != powerUserList) { - //获取主管医生 - String doctorInCharge = archiveMaster.getDoctorInCharge(); - //获取 初审人 - String firstInstance = archiveMaster.getFirstInstance(); - //遍历匹配工号赋值姓名 - for (Power_User_Dto powerUserDto : powerUserList) { - String name = powerUserDto.getName(); - if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) { - archiveMaster.setDoctorInCharge(name); - } - if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) { - archiveMaster.setFirstInstance(name); + if(list!=null && list.size()>0) { + //查询用户集合 + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = null; + if (!CollectionUtils.isEmpty(powerUsers)) { + //转换对象 + powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); + } + //遍历赋值 + for (Archive_Master_Vo archiveMaster : list) { + if (null != powerUserList) { + //获取主管医生 + String doctorInCharge = archiveMaster.getDoctorInCharge(); + //获取 初审人 + String firstInstance = archiveMaster.getFirstInstance(); + //遍历匹配工号赋值姓名 + for (Power_User_Dto powerUserDto : powerUserList) { + String name = powerUserDto.getName(); + if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) { + archiveMaster.setDoctorInCharge(name); + } + if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) { + archiveMaster.setFirstInstance(name); + } } } } @@ -486,29 +491,30 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { public OffsetLimitPage selectOverdue2(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = archiveMasterMapper.selectOverdue2(archiveMasterVo); - - //查询用户集合 - JSONArray powerUsers = powerUserService.getPowerUserList("1"); - List powerUserList = null; - if (!CollectionUtils.isEmpty(powerUsers)) { - //转换对象 - powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); - } - //遍历赋值 - for (Archive_Master_Vo archiveMaster : list) { - if (null != powerUserList) { - //获取主管医生 - String doctorInCharge = archiveMaster.getDoctorInCharge(); - //获取 初审人 - String firstInstance = archiveMaster.getFirstInstance(); - //遍历匹配工号赋值姓名 - for (Power_User_Dto powerUserDto : powerUserList) { - String name = powerUserDto.getName(); - if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) { - archiveMaster.setDoctorInCharge(name); - } - if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) { - archiveMaster.setFirstInstance(name); + if(list!=null && list.size()>0) { + //查询用户集合 + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = null; + if (!CollectionUtils.isEmpty(powerUsers)) { + //转换对象 + powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); + } + //遍历赋值 + for (Archive_Master_Vo archiveMaster : list) { + if (null != powerUserList) { + //获取主管医生 + String doctorInCharge = archiveMaster.getDoctorInCharge(); + //获取 初审人 + String firstInstance = archiveMaster.getFirstInstance(); + //遍历匹配工号赋值姓名 + for (Power_User_Dto powerUserDto : powerUserList) { + String name = powerUserDto.getName(); + if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) { + archiveMaster.setDoctorInCharge(name); + } + if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) { + archiveMaster.setFirstInstance(name); + } } } } @@ -645,23 +651,25 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Override public List copyDetailList(Archive_Master_Vo archiveMasterVo) { List list = archiveMasterMapper.copyDetailList(archiveMasterVo); - //查询用户集合 - JSONArray powerUsers = powerUserService.getPowerUserList("1"); - List powerUserList = null; - if (!CollectionUtils.isEmpty(powerUsers)) { - //转换对象 - powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); - } - //遍历赋值 - for (Archive_Master_Vo archiveMaster : list) { - if (null != powerUserList) { - //获取主管医生 - String doctorInCharge = archiveMaster.getDoctorInCharge(); - //遍历匹配工号赋值姓名 - for (Power_User_Dto powerUserDto : powerUserList) { - String name = powerUserDto.getName(); - if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) { - archiveMaster.setDoctorInCharge(name); + if(list!=null && list.size()>0) { + //查询用户集合 + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = null; + if (!CollectionUtils.isEmpty(powerUsers)) { + //转换对象 + powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); + } + //遍历赋值 + for (Archive_Master_Vo archiveMaster : list) { + if (null != powerUserList) { + //获取主管医生 + String doctorInCharge = archiveMaster.getDoctorInCharge(); + //遍历匹配工号赋值姓名 + for (Power_User_Dto powerUserDto : powerUserList) { + String name = powerUserDto.getName(); + if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) { + archiveMaster.setDoctorInCharge(name); + } } } } @@ -673,23 +681,25 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { public OffsetLimitPage copyDetailList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = archiveMasterMapper.copyDetailList(archiveMasterVo); - //查询用户集合 - JSONArray powerUsers = powerUserService.getPowerUserList("1"); - List powerUserList = null; - if (!CollectionUtils.isEmpty(powerUsers)) { - //转换对象 - powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); - } - //遍历赋值 - for (Archive_Master_Vo archiveMaster : list) { - if (null != powerUserList) { - //获取主管医生 - String doctorInCharge = archiveMaster.getDoctorInCharge(); - //遍历匹配工号赋值姓名 - for (Power_User_Dto powerUserDto : powerUserList) { - String name = powerUserDto.getName(); - if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) { - archiveMaster.setDoctorInCharge(name); + if(list!=null && list.size()>0) { + //查询用户集合 + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = null; + if (!CollectionUtils.isEmpty(powerUsers)) { + //转换对象 + powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); + } + //遍历赋值 + for (Archive_Master_Vo archiveMaster : list) { + if (null != powerUserList) { + //获取主管医生 + String doctorInCharge = archiveMaster.getDoctorInCharge(); + //遍历匹配工号赋值姓名 + for (Power_User_Dto powerUserDto : powerUserList) { + String name = powerUserDto.getName(); + if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) { + archiveMaster.setDoctorInCharge(name); + } } } } diff --git a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java index b9d39b4e..31abdc6f 100644 --- a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java @@ -15,6 +15,7 @@ import com.emr.service.Emr_DictionaryService; import com.emr.service.Emr_Fault_DetailService; import com.emr.service.Emr_Fault_TypeService; import com.emr.service.PowerUserService; +import com.emr.vo.Power_User_Dto; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.google.common.base.Function; @@ -22,6 +23,7 @@ import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -123,13 +125,64 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { @Override public List selectByColumn(Emr_Fault_Detail emrFaultDetail) { - return emrFaultDetailMapper.selectByColumn(emrFaultDetail); + List list=emrFaultDetailMapper.selectByColumn(emrFaultDetail); + if(list!=null && list.size()>0){ + //查询用户集合 + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = null; + if (!CollectionUtils.isEmpty(powerUsers)) { + //转换对象 + powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); + } + //遍历赋值 + for (Emr_Fault_Vo emrFaultVo : list) { + if (null != powerUserList) { + //获取处理人 + String dealPerson = emrFaultVo.getDealPerson(); + + //遍历匹配工号赋值姓名 + for (Power_User_Dto powerUserDto : powerUserList) { + String name = powerUserDto.getName(); + if (StringUtils.isNotBlank(dealPerson) && powerUserDto.getUserName().equals(dealPerson)) { + emrFaultVo.setDealPerson(name); + } + + } + } + } + } + return list; } @Override public OffsetLimitPage selectByColumn(Emr_Fault_Detail emrFaultDetail, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = emrFaultDetailMapper.selectByColumn(emrFaultDetail); + if(list!=null && list.size()>0){ + //查询用户集合 + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = null; + if (!CollectionUtils.isEmpty(powerUsers)) { + //转换对象 + powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); + } + //遍历赋值 + for (Emr_Fault_Vo emrFaultVo : list) { + if (null != powerUserList) { + //获取处理人 + String dealPerson = emrFaultVo.getDealPerson(); + + //遍历匹配工号赋值姓名 + for (Power_User_Dto powerUserDto : powerUserList) { + String name = powerUserDto.getName(); + if (StringUtils.isNotBlank(dealPerson) && powerUserDto.getUserName().equals(dealPerson)) { + emrFaultVo.setDealPerson(name); + } + + } + } + } + } return new OffsetLimitPage((Page) list); } diff --git a/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp b/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp index 82c164aa..5dddf169 100644 --- a/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp +++ b/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp @@ -155,7 +155,7 @@
- + <%----%> diff --git a/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp b/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp index 3bec70e8..89b53dc5 100644 --- a/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp @@ -147,9 +147,9 @@
- - + +