From 49dcd2bdd1055a4f128d1a275e2bd08871593b12 Mon Sep 17 00:00:00 2001 From: linjj <850658129@qq.com> Date: Wed, 13 Sep 2023 16:16:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=B8=E8=B4=A8=E7=97=85=E5=8E=86=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E5=92=8C=E7=97=85=E6=A1=88=E5=AE=A4=E7=BB=88=E5=AE=A1?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/controller/faultController.java | 18 +-- .../emr/controller/signListController.java | 6 - .../java/com/emr/dao/Sign_ListMapper.java | 2 + .../ipml/Archive_MasterServiceImpl.java | 2 - .../service/ipml/Sign_ListServiceImpl.java | 48 ++++-- .../resources/mapper/Archive_MasterMapper.xml | 152 ------------------ .../mapper/Emr_Fault_DetailMapper.xml | 3 - src/main/resources/mapper/Sign_ListMapper.xml | 20 ++- 8 files changed, 50 insertions(+), 201 deletions(-) diff --git a/src/main/java/com/emr/controller/faultController.java b/src/main/java/com/emr/controller/faultController.java index e3cc6e8e..7ab17c0a 100644 --- a/src/main/java/com/emr/controller/faultController.java +++ b/src/main/java/com/emr/controller/faultController.java @@ -521,23 +521,7 @@ public class faultController { return result; } - /*@ResponseBody - @RequestMapping(value = "/exportExcel2") - public void exportExcel2(HttpServletResponse response, Emr_Fault_Vo emrFaultVo) throws Exception { - response.setContentType("application/vnd.ms-excel;charset=UTF-8"); - String[] header = {"病历清单id","住院号","住院次数","姓名","出院科室","出院日期","归档状态","评分","退回次数","退回时间","退回人"}; - String[] fileNames = {"archiveDetailId","inpNo","visitId","name","deptName","dischargeDateTime","archivestate","score","backNum","createTime","creater"}; - //文件名 - String fileName = "病案退回次数及评分信息" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; - //构造excel的数据 - List list = emrFaultDetailService.faultBackScoreList(emrFaultVo); - ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames); - *//* System.out.println("开始执行导出......."); - long start = System.currentTimeMillis();*//* - String result=utils.exportExcelToFilePath(response,utils.listConvert(list)); - *//* long end = System.currentTimeMillis(); - System.out.println("耗时：" + (end - start) / 1000 + "秒");*//* - }*/ + @ResponseBody @RequestMapping(value = "/faultListByTj") diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java index a593bcea..a956a88c 100644 --- a/src/main/java/com/emr/controller/signListController.java +++ b/src/main/java/com/emr/controller/signListController.java @@ -87,13 +87,7 @@ public class signListController { @Autowired(required = false) private Archive_Master_FollowingService archive_master_followingService; - @Autowired - private ArchiveOtherExtService archiveOtherExtService; - @Autowired - private FinishedDateTimeService finishedDateTimeService; - @Autowired - private AfCollectTaskService afCollectTaskService; @RequestMapping(value = "/signLists") public String faults(Model model) { diff --git a/src/main/java/com/emr/dao/Sign_ListMapper.java b/src/main/java/com/emr/dao/Sign_ListMapper.java index ed8229a2..a372a71e 100644 --- a/src/main/java/com/emr/dao/Sign_ListMapper.java +++ b/src/main/java/com/emr/dao/Sign_ListMapper.java @@ -12,6 +12,8 @@ public interface Sign_ListMapper { */ List selectSignList(Sign_List_Vo signListVo); + //签收次数 + List getSignNum(@Param(value = "ids")String ids); /** * 查询列表 * @return 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 48b6f3ca..a04c8e35 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -180,8 +180,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Override public List selectByLastByColumn(Archive_Master_Vo archiveMasterVo,Integer offset, Integer limit) { -// //判断并设置查询是否打印权限 -// setIdByPrintNum(archiveMasterVo); //根据条件查询记录 if(null != offset && null != limit) { PageHelper.offsetPage(offset, limit); 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 8eb85bb1..73060222 100644 --- a/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java @@ -15,6 +15,8 @@ import com.emr.service.Archive_MasterService; import com.emr.service.Emr_DictionaryService; import com.emr.service.PowerUserService; import com.emr.service.Sign_ListService; +import com.emr.util.ListUtils; +import com.emr.util.Setters; import com.emr.vo.Power_User_Dto; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; @@ -45,15 +47,25 @@ public class Sign_ListServiceImpl implements Sign_ListService { PageHelper.offsetPage(offset, limit); 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); + //转换科室 + Map codeMap = ListUtils.toMap(dicList, Emr_Dictionary::getCode); + Setters.instance().list(list).cycleSetProperties(p -> { + String deptCode = p.getDeptName(); + String deptAdmissionCode = p.getDeptAdmissionTo(); + if(StringUtils.isNotBlank(deptCode) && codeMap.containsKey(deptCode)){ + String deptName = codeMap.get(deptCode).getName(); + p.setDeptName(deptName); + } + if(StringUtils.isNotBlank(deptAdmissionCode) && codeMap.containsKey(deptAdmissionCode)){ + String deptAdmissionTo = codeMap.get(deptAdmissionCode).getName(); + p.setDeptAdmissionTo(deptAdmissionTo); + } + }); //查询用户集合 JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = null; @@ -75,21 +87,23 @@ public class Sign_ListServiceImpl implements Sign_ListService { } } } - //转换科室 - for (int k = 0; k < dicList.size(); k++) { - if (StringUtils.isNotBlank(sign_list_vo.getDeptName())){ - 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; - } - } - } } + //查询签收次数 + //masterIds集合 + List masterIds = ListUtils.distinctSelect(list, Sign_List_Vo::getMasterID); + //转成逗号拼接 + String ids = String.join(",", masterIds); + List signNum = signListMapper.getSignNum(ids); + //遍历签收次数 + Map signNumMap = ListUtils.toMap(signNum, Sign_List_Vo::getMasterID); + Setters.instance().list(list).cycleSetProperties(p -> { + String masterID = p.getMasterID(); + if (signNumMap.containsKey(masterID)){ + String num = signNumMap.get(masterID).getNum(); + p.setNum(num); + } + }); } - return new OffsetLimitPage((Page) list); } diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 3fad0137..67b84d04 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -381,158 +381,6 @@ ORDER BY discharge_date_time desc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT m.id, - CONVERT ( VARCHAR ( 10 ), m.discharge_date_time, 120 ) discharge_date_time, + m.discharge_date_time, s.pid, s.createdtime, s.otherInfo, @@ -92,11 +92,10 @@ m.inp_no, m.visit_id, m.name, - CONVERT ( VARCHAR ( 10 ), m.admission_date_time, 120 ) admissionDateTime, + m.admission_date_time, m.dept_name, m.isscaned, - m.dept_admission_to, - ( SELECT COUNT ( 1 ) FROM archive_other WHERE archive_other.masterID= s.masterID AND archive_other.sysFlag = 1 ) AS num + m.dept_admission_to FROM archive_other s INNER JOIN archive_master m ON s.masterID= m.id @@ -222,6 +221,19 @@ order by createdtime desc + insert into archive_other