From 197b7cea51eb17ba1f37f25ffafc8d644984c0de Mon Sep 17 00:00:00 2001 From: hujl Date: Thu, 16 Dec 2021 09:29:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E4=B8=AA=E6=8A=A5=E8=A1=A8=EF=BC=9A?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E7=AD=BE=E6=94=B6+=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/medicalOverdueController.java | 87 +- .../com/emr/dao/Archive_MasterMapper.java | 14 +- .../dao/Archive_Master_FollowingMapper.java | 8 + .../com/emr/dao/Emr_Fault_DetailMapper.java | 31 +- .../com/emr/entity/Archive_Master_Vo.java | 11 + .../java/com/emr/entity/Emr_Fault_Vo.java | 44 + .../emr/service/Archive_MasterService.java | 30 +- .../Archive_Master_FollowingService.java | 8 + .../emr/service/Emr_Fault_DetailService.java | 43 + .../ipml/Archive_MasterServiceImpl.java | 48 + .../Archive_Master_FollowingServiceImpl.java | 8 + .../ipml/Emr_Fault_DetailServiceImpl.java | 269 ++ src/main/resources/config/jdbc.properties | 15 +- .../mapper/Archive_Master_FollowingMapper.xml | 29 + .../medicalOverdueDir/medicalOverdueList.jsp | 3244 +++-------------- 15 files changed, 1151 insertions(+), 2738 deletions(-) diff --git a/src/main/java/com/emr/controller/medicalOverdueController.java b/src/main/java/com/emr/controller/medicalOverdueController.java index f44eea07..bd808a54 100644 --- a/src/main/java/com/emr/controller/medicalOverdueController.java +++ b/src/main/java/com/emr/controller/medicalOverdueController.java @@ -38,7 +38,7 @@ public class medicalOverdueController { @ResponseBody @RequestMapping(value = "/medicalOverdueList") public OffsetLimitPage medicalOverdueList(HttpServletRequest request, HttpServletResponse response, Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { - OffsetLimitPage result = archiveMasterService.selectOverdue(archiveMasterVo, offset, limit); + OffsetLimitPage result =archiveMasterService.selectOverdue(archiveMasterVo, offset, limit); return result; } @@ -54,10 +54,10 @@ public class medicalOverdueController { @RequestMapping(value = "/exportExcel") public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception { response.setContentType("application/vnd.ms-excel;charset=UTF-8"); - String[] header = {"住院号","住院次数","姓名","入院科室","出院科室","出院日期","科室提交","初审人","主管医生","是否死亡","间隔天数","超期天数"}; - String[] fileNames = {"inpNo","visitId","name","deptAdmissionTo","deptName","dischargeDateTime","createTime","firstInstance","doctorInCharge","deathFlag","overdue","score"}; + String[] header = {"住院号","住院次数","姓名","入院科室","出院科室","出院日期","初审日期","初审人","主管医生","是否死亡","间隔天数","超期天数"}; + String[] fileNames = {"inpNo","visitId","name","deptAdmissionTo","deptName","dischargeDateTime","handleTime","handleName","doctorInCharge","deathFlag","diffDay","overdue"}; //文件名 - String fileName = "首次签收超期列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; + String fileName = "初次提交归档列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; //构造excel的数据overdueDays List list = archiveMasterService.selectOverdue(archiveMasterVo); @@ -116,4 +116,83 @@ public class medicalOverdueController { ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames); String result=utils.exportExcelToFilePath(response,utils.listConvert(list)); } + + + @ResponseBody + @RequestMapping(value = "/medicalOverdueList2") + public OffsetLimitPage medicalOverdueList2(HttpServletRequest request, HttpServletResponse response, Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { + OffsetLimitPage result =archiveMasterService.selectOverdue2(archiveMasterVo, offset, limit); + return result; + } + + @ResponseBody + @RequestMapping(value = "/exportExcel2") + public void exportExcel2(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception { + response.setContentType("application/vnd.ms-excel;charset=UTF-8"); + String[] header = {"住院号","住院次数","姓名","入院科室","出院科室","出院日期","退回日期","退回人","主管医生","是否死亡","间隔天数","超期天数"}; + String[] fileNames = {"inpNo","visitId","name","deptAdmissionTo","deptName","dischargeDateTime","handleTime","handleName","doctorInCharge","deathFlag","diffDay","overdue"}; + //文件名 + String fileName = "住院返修病历列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; + //构造excel的数据overdueDays + List list = archiveMasterService.selectOverdue2(archiveMasterVo); + + List medicalRecordHomepageCacheList = null; + + if(archiveMasterVo.getOverdueDays()!=null && archiveMasterVo.getOverdueDays()!="") { + if (list != null && list.size() > 0) { + for (int i = 0; i < list.size(); i++) { + if (list.get(i).getOverdue() != null && !list.get(i).getOverdue().equals("")) { + int score = Integer.parseInt(list.get(i).getOverdue()) - Integer.parseInt(archiveMasterVo.getOverdueDays()); + list.get(i).setScore("" + score); + } + if (list.get(i).getDeathFlag() != null && !list.get(i).getDeathFlag().equals("")){ + if (list.get(i).getDeathFlag().equals("0")){ + list.get(i).setDeathFlag("否"); + }else { + list.get(i).setDeathFlag("是"); + } + } + + //2021-09-17 + String doctorInChargeInHomePage = ""; + String directorDoctorInHomePage = ""; + + //根据masterId查出该条首页缓存表中content内容 + MedicalRecordHomepageCacheExample medicalRecordHomepageCacheExample = new MedicalRecordHomepageCacheExample(); + MedicalRecordHomepageCacheExample.Criteria criteria = medicalRecordHomepageCacheExample.createCriteria(); + if (!StringUtils.isEmpty(list.get(i).getId())){ + criteria.andMasterIdEqualTo(list.get(i).getId()); + } + medicalRecordHomepageCacheList = medicalRecordHomepageCacheMapper.selectByExample(medicalRecordHomepageCacheExample); + + if (medicalRecordHomepageCacheList.size()>0){ + //查出content + String content = medicalRecordHomepageCacheList.get(0).getContent(); + //根据content内容获取首页中主治医生name、主任（副主任）医生name + doctorInChargeInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable").getString("yZY054"); + directorDoctorInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable1").getString("yZY052"); + } + //重新赋值主管医生、主任（副主任）医生 + if (doctorInChargeInHomePage != null && !doctorInChargeInHomePage.equals("")){ + list.get(i).setDoctorInCharge(doctorInChargeInHomePage); + }else { + list.get(i).setDoctorInCharge("首页尚未填写主治医生！"); + } + + if (directorDoctorInHomePage != null && !directorDoctorInHomePage.equals("")){ + list.get(i).setFirstInstance(directorDoctorInHomePage); + }else { + list.get(i).setFirstInstance("首页尚未填写主任（副主任）医生！"); + } + //2021-09-17 + } + } + } + ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames); + String result=utils.exportExcelToFilePath(response,utils.listConvert(list)); + } + + + + } diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index 4a0de797..28e3686f 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -132,9 +132,21 @@ public interface Archive_MasterMapper { */ List selectHandleDetail(Archive_Master_Vo record); - //查询超期天数列表 + /** + * 查询初次提交归档-超期天数列表 + * @param record + * @return + */ List selectOverdue(Archive_Master_Vo record); + /** + * 查询住院返修病历-超期天数列表 + * @param record + * @return + */ + List selectOverdue2(Archive_Master_Vo record); + + //封存日志 List selectByFollowinglog(Archive_Master_Vo record); diff --git a/src/main/java/com/emr/dao/Archive_Master_FollowingMapper.java b/src/main/java/com/emr/dao/Archive_Master_FollowingMapper.java index ba7e9d0c..f6bfd9df 100644 --- a/src/main/java/com/emr/dao/Archive_Master_FollowingMapper.java +++ b/src/main/java/com/emr/dao/Archive_Master_FollowingMapper.java @@ -54,4 +54,12 @@ public interface Archive_Master_FollowingMapper { * @return */ List selectByMasterId(HashMap param); + + /** + * 根据条件查询跟随流程记录的退回次数排序列表，remark暂存退回次数 + * @param archiveMasterFollowing + * @return + */ + List selByCol(Archive_Master_Following archiveMasterFollowing); + } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java b/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java index 26c1cd19..8d5f01d0 100644 --- a/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java +++ b/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java @@ -106,9 +106,36 @@ public interface Emr_Fault_DetailMapper { List selectStorageByCol(Emr_Fault_Vo emrFaultVo); /** - * + * 获取质控缺陷评分列表 + * @param emrFaultVo + * @return + */ + List getQualityControlList(Emr_Fault_Vo emrFaultVo); + + /** + * 根据条件查询病案信息、退回总次数、总费用和总评分 + * @param emrFaultVo + * @return + */ + List masterTotalList(Emr_Fault_Vo emrFaultVo); + + /** + * 根据条件查询病案缺陷的退回及评分列表 * @param emrFaultVo * @return */ - List getQualityControlList(Emr_Fault_Vo emrFaultVo);//获取质控缺陷评分列表 + List faultBackScoreList(Emr_Fault_Vo emrFaultVo); + + /** + * 根据条件查询病案缺陷列表 + * @param emrFaultVo + * @return + */ + List selByCol(Emr_Fault_Vo emrFaultVo); + + + + + + } \ No newline at end of file diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java index 5f54b9c3..a9597163 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -110,6 +110,9 @@ public class Archive_Master_Vo { private String transferDept; + //2021-02-02新增 + private String diffDay;//间隔天数 + //2021-02-02新增 private String overdue;//超期天数 @@ -235,6 +238,14 @@ public class Archive_Master_Vo { this.createTime = createTime; } + public String getDiffDay() { + return diffDay; + } + + public void setDiffDay(String diffDay) { + this.diffDay = diffDay; + } + public String getOverdue() { return overdue; } diff --git a/src/main/java/com/emr/entity/Emr_Fault_Vo.java b/src/main/java/com/emr/entity/Emr_Fault_Vo.java index f89a4b59..264f4063 100644 --- a/src/main/java/com/emr/entity/Emr_Fault_Vo.java +++ b/src/main/java/com/emr/entity/Emr_Fault_Vo.java @@ -94,6 +94,18 @@ public class Emr_Fault_Vo { private String backTime; + //退回次数 + private String backNum; + + //退回费用 + private String backFee; + + //退回总次数 + private String totalBackNum; + + //退回总费用 + private String totalBackFee; + public String getBackTime() { return backTime; } @@ -429,6 +441,38 @@ public class Emr_Fault_Vo { public void setArchiveState(String archiveState) { this.archiveState = archiveState; } + + public String getBackNum() { + return backNum; + } + + public void setBackNum(String backNum) { + this.backNum = backNum == null ? null : backNum.trim(); + } + + public String getBackFee() { + return backFee; + } + + public void setBackFee(String backFee) { + this.backFee = backFee; + } + + public String getTotalBackNum() { + return totalBackNum; + } + + public void setTotalBackNum(String totalBackNum) { + this.totalBackNum = totalBackNum; + } + + public String getTotalBackFee() { + return totalBackFee; + } + + public void setTotalBackFee(String totalBackFee) { + this.totalBackFee = totalBackFee; + } } diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index d3a71c46..db7874a6 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -178,7 +178,7 @@ public interface Archive_MasterService { OffsetLimitPage selectHandleDetail(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit); /** - * 根据条件查找超期天数列表 + * 根据条件查找超期天数列表（初次提交归档） * * @param archiveMasterVo * @return @@ -186,14 +186,38 @@ public interface Archive_MasterService { List selectOverdue(Archive_Master_Vo archiveMasterVo); /** - * 根据条件查找超期天数列表 + * 根据条件查找超期天数列表（初次提交归档） * * @param archiveMasterVo * @return */ OffsetLimitPage selectOverdue(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit); - //封存日志 + + /** + * 根据条件查找超期天数列表（住院返修病历） + * + * @param archiveMasterVo + * @return + */ + List selectOverdue2(Archive_Master_Vo archiveMasterVo); + + /** + * 根据条件查找超期天数列表（住院返修病历） + * + * @param archiveMasterVo + * @return + */ + OffsetLimitPage selectOverdue2(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit); + + + /** + * 封存日志 + * @param record + * @param offset + * @param limit + * @return + */ OffsetLimitPage selectByFollowinglog(Archive_Master_Vo record, Integer offset, Integer limit); /** diff --git a/src/main/java/com/emr/service/Archive_Master_FollowingService.java b/src/main/java/com/emr/service/Archive_Master_FollowingService.java index 7b52166e..4ed538ba 100644 --- a/src/main/java/com/emr/service/Archive_Master_FollowingService.java +++ b/src/main/java/com/emr/service/Archive_Master_FollowingService.java @@ -1,11 +1,19 @@ package com.emr.service; import com.emr.entity.Archive_Master_Following; +import com.emr.entity.Emr_Fault_Vo; +import java.util.HashMap; import java.util.List; public interface Archive_Master_FollowingService { int insertSelective(Archive_Master_Following record); List selectByMasterId(Integer roleId,String masterId); + /** + * 根据条件查询跟随流程记录的退回次数排序列表 + * @param archiveMasterFollowing + * @return + */ + List selByCol(Archive_Master_Following archiveMasterFollowing); } diff --git a/src/main/java/com/emr/service/Emr_Fault_DetailService.java b/src/main/java/com/emr/service/Emr_Fault_DetailService.java index a7247c4d..1fda1185 100644 --- a/src/main/java/com/emr/service/Emr_Fault_DetailService.java +++ b/src/main/java/com/emr/service/Emr_Fault_DetailService.java @@ -118,6 +118,49 @@ public interface Emr_Fault_DetailService { * @return */ OffsetLimitPage getQualityControlList(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit); + + /** + * 根据条件查询病案信息、退回总次数、总费用和总评分列表 + * @param emrFaultVo + * @return + */ + List masterTotalList(Emr_Fault_Vo emrFaultVo); + + /** + * 根据条件查询病案信息、退回总次数、总费用和总评分列表分页 + * @param emrFaultVo + * @return + */ + OffsetLimitPage masterTotalList(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit); + + /** + * 根据条件查询病案缺陷的退回及评分列表 + * @param emrFaultVo + * @return + */ + List faultBackScoreList(Emr_Fault_Vo emrFaultVo); + + /** + * 获取质控缺陷评分列表分页 + * @param emrFaultVo + * @return + */ + OffsetLimitPage faultBackScoreList(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit); + + /** + * 根据条件查询病案缺陷列表 + * @param emrFaultVo + * @return + */ + List selByCol(Emr_Fault_Vo emrFaultVo); + + /** + * 根据条件查询病案缺陷列表 + * @param emrFaultVo + * @return + */ + OffsetLimitPage selByCol(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit); + } 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 38f86367..66ec8a63 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -421,6 +421,54 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return new OffsetLimitPage((Page) list); } + @Override + public List selectOverdue2(Archive_Master_Vo archiveMasterVo) { + List list = archiveMasterMapper.selectOverdue2(archiveMasterVo); + return list; + } + + @Override + public OffsetLimitPage selectOverdue2(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List list = archiveMasterMapper.selectOverdue2(archiveMasterVo); + + List medicalRecordHomepageCacheList = null; + + for (Archive_Master_Vo archive_master : list) { + String doctorInChargeInHomePage = ""; + String directorDoctorInHomePage = ""; + + //根据masterId查出该条首页缓存表中content内容 + MedicalRecordHomepageCacheExample medicalRecordHomepageCacheExample = new MedicalRecordHomepageCacheExample(); + MedicalRecordHomepageCacheExample.Criteria criteria = medicalRecordHomepageCacheExample.createCriteria(); + if (!StringUtils.isEmpty(archive_master.getId())){ + criteria.andMasterIdEqualTo(archive_master.getId()); + } + medicalRecordHomepageCacheList = medicalRecordHomepageCacheMapper.selectByExample(medicalRecordHomepageCacheExample); + + if (medicalRecordHomepageCacheList.size()>0){ + //查出content + String content = medicalRecordHomepageCacheList.get(0).getContent(); + //根据content内容获取首页中主治医生name、主任（副主任）医生name + doctorInChargeInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable").getString("yZY054"); + directorDoctorInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable1").getString("yZY052"); + } + //重新赋值主管医生、主任（副主任）医生 + if (doctorInChargeInHomePage != null && !doctorInChargeInHomePage.equals("")){ + archive_master.setDoctorInCharge(doctorInChargeInHomePage); + }else { + archive_master.setDoctorInCharge("首页尚未填写主治医生！"); + } + + if (directorDoctorInHomePage != null && !directorDoctorInHomePage.equals("")){ + archive_master.setFirstInstance(directorDoctorInHomePage); + }else { + archive_master.setFirstInstance("首页尚未填写主任（副主任）医生！"); + } + } + return new OffsetLimitPage((Page) list); + } + @Override public OffsetLimitPage selectByFollowinglog(Archive_Master_Vo record, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); diff --git a/src/main/java/com/emr/service/ipml/Archive_Master_FollowingServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_Master_FollowingServiceImpl.java index 2afe017e..0aaa4bf8 100644 --- a/src/main/java/com/emr/service/ipml/Archive_Master_FollowingServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_Master_FollowingServiceImpl.java @@ -2,6 +2,7 @@ package com.emr.service.ipml; import com.emr.dao.Archive_Master_FollowingMapper; import com.emr.entity.Archive_Master_Following; +import com.emr.entity.Emr_Fault_Vo; import com.emr.service.Archive_Master_FollowingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,4 +31,11 @@ public class Archive_Master_FollowingServiceImpl implements Archive_Master_Follo } return archive_master_followingMapper.selectByMasterId(param); } + + @Override + public List selByCol(Archive_Master_Following archiveMasterFollowing) { + return archive_master_followingMapper.selByCol(archiveMasterFollowing); + } + + } 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 ef6ae9b2..c420fd2c 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 @@ -8,6 +8,7 @@ package com.emr.service.ipml; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.emr.dao.Archive_Master_FollowingMapper; import com.emr.dao.Emr_Fault_DetailMapper; import com.emr.entity.*; import com.emr.service.Emr_DictionaryService; @@ -21,7 +22,10 @@ import com.google.common.collect.Maps; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -39,6 +43,8 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { @Autowired private PowerUserService powerUserService; + @Autowired + private Archive_Master_FollowingMapper archiveMasterFollowingMapper; /** * 根据条件查询缺陷列表 * @param emrFaultVo @@ -249,6 +255,269 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { } return new OffsetLimitPage((Page) list); } + + @Override + public List masterTotalList(Emr_Fault_Vo emrFaultVo) { + List list= emrFaultDetailMapper.masterTotalList(emrFaultVo); + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); + if (powerUserList != null){ + Map mappedMovies = Maps.uniqueIndex(powerUserList, new Function() { + @Override + public String apply(JSONObject temp) { + return temp.getString("userName"); + }}); + + for (Emr_Fault_Vo emr_fault_vo : list) { + //主管医生 + JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge()); + if (userInfo==null){ + emr_fault_vo.setDoctorInCharge(emr_fault_vo.getDoctorInCharge()); + }else { + emr_fault_vo.setDoctorInCharge(userInfo.getString("name")); + } + //退回人 + userInfo = mappedMovies.get(emr_fault_vo.getCreater()); + if (userInfo==null){ + emr_fault_vo.setCreater(emr_fault_vo.getCreater()); + }else { + emr_fault_vo.setCreater(userInfo.getString("name")); + } + } + + } + return list; + } + + @Override + public OffsetLimitPage masterTotalList(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List list = emrFaultDetailMapper.masterTotalList(emrFaultVo); + if(list!=null && list.size()>0){ + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); + if (powerUserList != null){ + Map mappedMovies = Maps.uniqueIndex(powerUserList, new Function() { + @Override + public String apply(JSONObject temp) { + return temp.getString("userName"); + }}); + for (Emr_Fault_Vo emr_fault_vo : list) { + JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge()); + if (userInfo==null){ + emr_fault_vo.setDoctorInCharge(emr_fault_vo.getDoctorInCharge()); + }else { + emr_fault_vo.setDoctorInCharge(userInfo.getString("name")); + } + + userInfo = mappedMovies.get(emr_fault_vo.getCreater()); + if (userInfo==null){ + emr_fault_vo.setCreater(emr_fault_vo.getCreater()); + }else { + emr_fault_vo.setCreater(userInfo.getString("name")); + } + } + } + } + return new OffsetLimitPage((Page) list); + } + + @Override + public List faultBackScoreList(Emr_Fault_Vo emrFaultVo) { + List list= emrFaultDetailMapper.faultBackScoreList(emrFaultVo); + if(list!=null && list.size()>0){ + Archive_Master_Following archiveMasterFollowing=new Archive_Master_Following(); + archiveMasterFollowing.setFollowingType("9"); + //根据条件查询跟随流程记录的退回次数排序列表，remark暂存退回次数 + List followList =archiveMasterFollowingMapper.selByCol(archiveMasterFollowing); + if(followList!=null && followList.size()>0){ + //Boolean bol=false; + + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); + if (powerUserList != null){ + Map mappedMovies = Maps.uniqueIndex(powerUserList, new Function() { + @Override + public String apply(JSONObject temp) { + return temp.getString("userName"); + }}); + for (Emr_Fault_Vo emr_fault_vo : list) { + /*JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge()); + if (userInfo==null){ + emr_fault_vo.setDoctorInCharge(emr_fault_vo.getDoctorInCharge()); + }else { + emr_fault_vo.setDoctorInCharge(userInfo.getString("name")); + }*/ + + JSONObject userInfo = mappedMovies.get(emr_fault_vo.getCreater()); + if (userInfo==null){ + emr_fault_vo.setCreater(emr_fault_vo.getCreater()); + }else { + emr_fault_vo.setCreater(userInfo.getString("name")); + } + + //退回次数 + for(int i=0;i list = emrFaultDetailMapper.faultBackScoreList(emrFaultVo); + if(list!=null && list.size()>0){ + Archive_Master_Following archiveMasterFollowing=new Archive_Master_Following(); + archiveMasterFollowing.setFollowingType("9"); + //根据条件查询跟随流程记录的退回次数排序列表，remark暂存退回次数 + List followList =archiveMasterFollowingMapper.selByCol(archiveMasterFollowing); + if(followList!=null && followList.size()>0){ + //Boolean bol=false; + + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); + if (powerUserList != null){ + Map mappedMovies = Maps.uniqueIndex(powerUserList, new Function() { + @Override + public String apply(JSONObject temp) { + return temp.getString("userName"); + }}); + for (Emr_Fault_Vo emr_fault_vo : list) { + /*JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge()); + if (userInfo==null){ + emr_fault_vo.setDoctorInCharge(emr_fault_vo.getDoctorInCharge()); + }else { + emr_fault_vo.setDoctorInCharge(userInfo.getString("name")); + }*/ + + JSONObject userInfo = mappedMovies.get(emr_fault_vo.getCreater()); + if (userInfo==null){ + emr_fault_vo.setCreater(emr_fault_vo.getCreater()); + }else { + emr_fault_vo.setCreater(userInfo.getString("name")); + } + + //退回次数 + for(int i=0;i selByCol(Emr_Fault_Vo emrFaultVo) { + List list=emrFaultDetailMapper.selByCol(emrFaultVo); + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); + if (powerUserList != null){ + Map mappedMovies = Maps.uniqueIndex(powerUserList, new Function() { + @Override + public String apply(JSONObject temp) { + return temp.getString("userName"); + }}); + + for (Emr_Fault_Vo emr_fault_vo : list) { + //主管医生 + JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge()); + + //创建人 + userInfo = mappedMovies.get(emr_fault_vo.getCreater()); + if (userInfo==null){ + emr_fault_vo.setCreater(emr_fault_vo.getCreater()); + }else { + emr_fault_vo.setCreater(userInfo.getString("name")); + } + } + + } + return list; + } + + @Override + public OffsetLimitPage selByCol(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List list = emrFaultDetailMapper.selByCol(emrFaultVo); + + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); + if (powerUserList != null){ + Map mappedMovies = Maps.uniqueIndex(powerUserList, new Function() { + @Override + public String apply(JSONObject temp) { + return temp.getString("userName"); + }}); + + for (Emr_Fault_Vo emr_fault_vo : list) { + + JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge()); + //创建人 + userInfo = mappedMovies.get(emr_fault_vo.getCreater()); + if (userInfo==null){ + emr_fault_vo.setCreater(emr_fault_vo.getCreater()); + }else { + emr_fault_vo.setCreater(userInfo.getString("name")); + } + } + } + return new OffsetLimitPage((Page) list); + } + + public boolean compare(String time1,String time2) throws ParseException{ + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + Date a=sdf.parse(time1); + Date b=sdf.parse(time2); + //a早于b返回true + if(a.before(b)){ + return true; + }else{ + return false; + } + } } diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 9e9f4435..0313db24 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -5,6 +5,7 @@ dataBaseName=DB_PrivilegeManagement_GYFY POWER_PORT=9001 jdbc.url=jdbc\:sqlserver\://${POWER_IP}:1433;databaseName=${dataBaseName} + jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver #hibernate config @@ -16,14 +17,16 @@ hibernate.hbm2ddl.auto=update hibernate.current_session_context_class=thread hibernate.jdbc.batch_size=50 hibernate.enable_lazy_load_no_trans=true -#\u56FE\u7247\u5730\u5740 -pictureUrl=C:\\Users\\Administrator\\Desktop\\test\\uploadImage + +##\u56FE\u7247\u5730\u5740 +pictureUrl=Z:\\test\\uploadImage #\u672C\u5730\u81EA\u52A8\u751F\u6210PDF\u5730\u5740D:\tesst\autoPdf -autoPdfUrl=C:/Users/Administrator/Desktop/test/autoPdf +autoPdfUrl=D:/test/autoPdf #\u672C\u5730\u4E0A\u4F20PDF\u5730\u5740 -pdfUrl=C:\\Users\\Administrator\\Desktop\\test\\loadPdf +pdfUrl=Z:\\test\\loadPdf #PDF\u6587\u4EF6\u4E0D\u5B58\u5728\u6216\u635F\u574F\u5217\u8868\u5730\u5740 -pdfErrorUrl=C:\\Users\\Administrator\\Desktop\\test\\error\\ +pdfErrorUrl=Z:\\test\\error\\ + #\u8D85\u671F\u5929\u6570 expired=7 #\u6B7B\u4EA1\u8D85\u671F\u5929\u6570 @@ -34,6 +37,8 @@ upperLimit=3 #\u7B7E\u6536\u5217\u8868 \u4E0A\u9650\u5355\u4F4D\u53CA\u4E0A\u9650\u6570\u503C[year\month\day],\u90FD\u4E0D\u9650\u5236\u5219\u4E3A\u7A7A sign_dateType=month sign_upperLimit=6 +#\u7F3A\u9677\u5217\u8868 +backFee=30 #\u539F\u56E0 recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863 diff --git a/src/main/resources/mapper/Archive_Master_FollowingMapper.xml b/src/main/resources/mapper/Archive_Master_FollowingMapper.xml index 8b980df7..ab5c886b 100644 --- a/src/main/resources/mapper/Archive_Master_FollowingMapper.xml +++ b/src/main/resources/mapper/Archive_Master_FollowingMapper.xml @@ -136,4 +136,33 @@ and following_type in (1,2,3,4,5,6,7) + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp index 5b17d46e..4f4b22a7 100644 --- a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp @@ -17,196 +17,24 @@ <%@ include file="../../jspf/ztreeCommom.jsp" %> - - -
- - -
-
- -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
- - - - -
-
-
- -
- - - - -
-
-
- - -
- <%--
- - -
--%> - - - -
-
- -
-
-
-
- -
- -
-
-
- - -<%----%> - - -