From 0e8a3b6241cd2e4bd16a2520fe9b19b4533b9aca Mon Sep 17 00:00:00 2001 From: linjj <850658129@qq.com> Date: Wed, 28 Jun 2023 08:54:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BA=B8=E8=B4=A8=E7=97=85?= =?UTF-8?q?=E4=BE=8B=E9=A1=B5=E9=9D=A2,=E7=97=85=E6=A1=88=E5=8F=AC?= =?UTF-8?q?=E5=9B=9E=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emr/controller/signListController.java | 12 - .../com/emr/dao/Emr_Fault_DetailMapper.java | 2 + .../ipml/Archive_MasterServiceImpl.java | 44 ++- .../ipml/Emr_Fault_DetailServiceImpl.java | 2 +- .../service/ipml/Sign_ListServiceImpl.java | 49 ++- src/main/resources/config/config.properties | 1 + .../resources/mapper/Archive_MasterMapper.xml | 68 +--- .../mapper/Emr_Fault_DetailMapper.xml | 295 ++++++++++++------ src/main/resources/mapper/Sign_ListMapper.xml | 138 ++++---- .../medicalHandlerDir/medicalHandlerList.jsp | 1 - .../medicalRecallDir/medicalRecallList.jsp | 14 +- 11 files changed, 381 insertions(+), 245 deletions(-) diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java index 3fbb641f..a593bcea 100644 --- a/src/main/java/com/emr/controller/signListController.java +++ b/src/main/java/com/emr/controller/signListController.java @@ -103,20 +103,8 @@ public class signListController { @ResponseBody @RequestMapping(value = "/signList") public OffsetLimitPage signList(HttpServletRequest request, HttpServletResponse response, Sign_List_Vo signListVo, Integer offset, Integer limit) throws UnsupportedEncodingException { - System.out.println("signListVo:::" + signListVo.getOperateName1()); response.setCharacterEncoding("utf-8"); request.setCharacterEncoding("utf-8"); - //判断所有都为空则签收日期按当前日期 - /*if(StringUtils.isBlank(signListVo.getInpNo())&&StringUtils.isBlank(signListVo.getVisitId())&&signListVo.getC1()==null){ - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - //签收日期没进行选择的话则默认显示的是当前日期的数据 - if (StringUtils.isBlank(signListVo.getStartSignDate())) { - signListVo.setStartSignDate(sdf.format(new Date())); - } - if (StringUtils.isBlank(signListVo.getEndSignDate())) { - signListVo.setEndSignDate(sdf.format(new Date())); - } - }*/ OffsetLimitPage result = signListService.selectSignList(signListVo, offset, limit); return result; } 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 3884383d..8f096ec8 100644 --- a/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java +++ b/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java @@ -84,6 +84,8 @@ public interface Emr_Fault_DetailMapper { */ List selectByCol(Emr_Fault_Vo record); + + /** * 根据id查询记录 * @param id 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 22267a68..ceb3d35f 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -453,6 +453,28 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { PageHelper.offsetPage(offset, limit); } List list = archiveMasterMapper.selectByUnfileNew(archiveMasterVo); + //转换科室 + Emr_Dictionary dic = new Emr_Dictionary(); + dic.setEffective(1); + dic.setTypecode("dept_code"); + //科室列表 + List dicList = emrDictionaryService.dicByTypeCode(dic); + for (Archive_Master_Vo archiveMaster:list) + //转换科室 + for (int k = 0; k < dicList.size(); k++) { + String deptName = archiveMaster.getDeptName(); + String dept2 = archiveMaster.getDeptAdmissionTo(); + if (deptName.equals(dicList.get(k).getCode())) { + //出院科室 + deptName = deptName.replace(deptName, dicList.get(k).getName()); + archiveMaster.setDeptName(deptName); + } + if(dept2 != null && dept2.equals(dicList.get(k).getCode())) { + //入院科室dept_admission_to + dept2 = dept2.replace(dept2, dicList.get(k).getName()); + archiveMaster.setDeptAdmissionTo(dept2); + } + } //设置医生、护士名称和打印标识 setNameAndPrintFlag(archiveMasterVo, list); return list; @@ -463,6 +485,27 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { public OffsetLimitPage selectStorageByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = archiveMasterMapper.selectStorageByCol(archiveMasterVo); + Emr_Dictionary dic = new Emr_Dictionary(); + dic.setEffective(1); + dic.setTypecode("dept_code"); + List dicList = emrDictionaryService.dicByTypeCode(dic); + //转换科室 + for (Archive_Master_Vo archiveMaster:list){ + for (int k = 0; k < dicList.size(); k++) { + String deptName = archiveMaster.getDeptName(); + String dept2 = archiveMaster.getDeptAdmissionTo(); + if (deptName.equals(dicList.get(k).getCode())) { + //出院科室 + deptName = deptName.replace(deptName, dicList.get(k).getName()); + archiveMaster.setDeptName(deptName); + } + if(dept2 != null && dept2.equals(dicList.get(k).getCode())) { + //入院科室dept_admission_to + dept2 = dept2.replace(dept2, dicList.get(k).getName()); + archiveMaster.setDeptAdmissionTo(dept2); + } + } + } return new OffsetLimitPage((Page) list); } @@ -641,7 +684,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { String s=String.valueOf(inum2); archiveMasterVo.setOverdueDaysTwo(s); } - List list = archiveMasterMapper.selectOverdue(archiveMasterVo); if(list!=null && list.size()>0) { //查询用户集合 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 d4a21fea..470d7d57 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 @@ -91,7 +91,6 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { list.get(i).setDeptAdmissionTo(dept2); } } - String assortId = list.get(i).getAssortId(); if(assortId!="" && assortId!=null) { String[] assorArr = assortId.split(","); @@ -101,6 +100,7 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { if (Arrays.asList(assorArr).contains(id)) { assortId = assortId.replace(id, typeLis.get(j).getTypeName()); list.get(i).setAssortId(assortId); + break; } } } diff --git a/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java b/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java index bd894a59..ffab3bf3 100644 --- a/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java @@ -25,8 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; @Service public class Sign_ListServiceImpl implements Sign_ListService { @@ -43,8 +43,17 @@ public class Sign_ListServiceImpl implements Sign_ListService { @Override public OffsetLimitPage selectSignList(Sign_List_Vo signListVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); - List list =signListMapper.selectSignList(signListVo); - if(list!=null && list.size()>0){ + List list = signListMapper.selectSignList(signListVo); + if (list != null && list.size() > 0) { +// //根据id去重 +// list = list.stream().collect(Collectors.collectingAndThen( +// Collectors.toCollection(() -> new TreeSet<>( +// Comparator.comparing(Sign_List_Vo::getMasterID))), ArrayList::new)); + //获取科室列表 + Emr_Dictionary dic = new Emr_Dictionary(); + dic.setEffective(1); + dic.setTypecode("dept_code"); + List dicList = emrDictionaryService.dicByTypeCode(dic); //查询用户集合 JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = null; @@ -62,19 +71,30 @@ public class Sign_ListServiceImpl implements Sign_ListService { String name = powerUserDto.getName(); if (StringUtils.isNotBlank(singer) && powerUserDto.getUserName().equals(singer)) { sign_list_vo.setC1(name); + break; } - + } + } + //转换科室 + for (int k = 0; k < dicList.size(); k++) { + String deptName = sign_list_vo.getDeptName(); + if (deptName.equals(dicList.get(k).getCode())) { + //出院科室 + deptName = deptName.replace(deptName, dicList.get(k).getName()); + sign_list_vo.setDeptName(deptName); + break; } } } } + return new OffsetLimitPage((Page) list); } @Override public List selectSignList(Sign_List_Vo signListVo) { - List list =signListMapper.selectSignList(signListVo); - if(list!=null && list.size()>0){ + List list = signListMapper.selectSignList(signListVo); + if (list != null && list.size() > 0) { //查询用户集合 JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = null; @@ -102,7 +122,7 @@ public class Sign_ListServiceImpl implements Sign_ListService { } @Override - public List selectSignListWith(Sign_List signList) { + public List selectSignListWith(Sign_List signList) { return signListMapper.selectSignListWith(signList); } @@ -133,8 +153,8 @@ public class Sign_ListServiceImpl implements Sign_ListService { @Override public List selSignByColm(Sign_List_Vo signListVo) { - List list=signListMapper.selSignByColm(signListVo); - if(list!=null && list.size()>0){ + List list = signListMapper.selSignByColm(signListVo); + if (list != null && list.size() > 0) { //查询用户集合 JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = null; @@ -163,16 +183,15 @@ public class Sign_ListServiceImpl implements Sign_ListService { @Override public OffsetLimitPage selSignByColm(SignList signList, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); - List list= selSignByColm1(signList); + List list = selSignByColm1(signList); return new OffsetLimitPage((Page) list); } - @Override public List selSignByColm1(SignList signList) { - List list=signListMapper.selSignByColm1(signList); - if(list!=null && list.size()>0){ + List list = signListMapper.selSignByColm1(signList); + if (list != null && list.size() > 0) { //查询用户集合 JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = null; @@ -199,6 +218,8 @@ public class Sign_ListServiceImpl implements Sign_ListService { } return list; } + + } diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 99e1329d..c29aad63 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -16,3 +16,4 @@ sqlServerPassword=xjgs+docus911 oracleUrl = 10.6.0.150:1521/jhemr oracleUserName = jswzh oraclePassWord = jswzh123 + diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 4f3a53e4..223c0971 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -836,12 +836,12 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + delete from emr_fault_detail diff --git a/src/main/resources/mapper/Sign_ListMapper.xml b/src/main/resources/mapper/Sign_ListMapper.xml index 7899c934..06a28c3e 100644 --- a/src/main/resources/mapper/Sign_ListMapper.xml +++ b/src/main/resources/mapper/Sign_ListMapper.xml @@ -66,71 +66,91 @@ diff --git a/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp b/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp index 149275e8..e11cd405 100644 --- a/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp @@ -2727,7 +2727,6 @@ }); } - initTable2(); //点击扫描全选分段列表，查询来源为嘉时扫描系统 /*$("#pdfBtn3").click(function () { diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp index 3bf009e4..7742332f 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp @@ -559,13 +559,13 @@ align: 'left', valign: 'middle' }, - { - title: '打印ID', - field: 'vprintinfoId', - align: 'left', - valign: 'middle', - visible: false - }, + // { + // title: '打印ID', + // field: 'vprintinfoId', + // align: 'left', + // valign: 'middle', + // visible: false + // }, { title: '入院日期', field: 'admissionDateTime',