From e11ad13b828fd94832156ec3f9b420f2c57e795c Mon Sep 17 00:00:00 2001 From: ALW <850658129@qq.com> Date: Wed, 31 Aug 2022 10:56:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A6=96=E6=AC=A1=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E9=80=80=E5=9B=9E=E6=9C=AA=E6=8F=90=E4=BA=A4=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/emr/controller/FontController.java | 14 +++++++++----- src/main/java/com/emr/dao/OverdueRemindMapper.java | 2 ++ .../java/com/emr/service/OverdueRemindService.java | 1 + .../emr/service/ipml/OverdueRemindServiceImpl.java | 5 +++++ src/main/java/com/emr/vo/OverdueRemindVO.java | 2 ++ src/main/resources/mapper/Archive_MasterMapper.xml | 2 +- src/main/resources/mapper/overdueRemindMapper.xml | 3 +++ 7 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index b831370e..9999f506 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/src/main/java/com/emr/controller/FontController.java @@ -59,6 +59,7 @@ public class FontController { @Autowired private OverdueRemindService overdueRemindService; + /***************************提供第三方按多个分段id和记账号查询病历pdf***********************************/ /** * 提供第三方按多个分段id和记账号查询病历pdf @@ -445,16 +446,19 @@ public class FontController { if (deptId.equals("病案室")){ StringBuffer sb = new StringBuffer(); String deptId1 = user.getDeptIdQuality(); - String deptIdQuality = deptId.replaceAll("\\b", "'"); + String deptIdQuality = deptId1.replaceAll("\\b", "'"); List overdueRemindVOS = overdueRemindService.selectoverdueNumAndQualityControl(deptIdQuality); - for (int b=0;overdueRemindVOS.size()>0;b++){ + for (int b=0;overdueRemindVOS.size()>b;b++){ String overdueNum = overdueRemindVOS.get(b).getOverdueNum(); String name = overdueRemindVOS.get(b).getName(); - sb.append(overdueNum+"有"+name+"份"); + sb.append(name+"有:"+overdueNum+"份,"); } String string = sb.toString(); - // System.out.println("overdueNum++++"+overdueNum); - content = "尊敬的质控老师!您质控的科室'" + string + "'应归档的病案未归档"; + if (!string.equals("")){ + content = "尊敬的质控老师!您质控的科室'" + string + "'应归档的病案未归档"; + }else { + content = "尊敬的质控老师!您质控的科室'" + "没有" + "'应归档的病案未归档"; + } Map map = new HashMap<>(); map.put("title", "未归档的病案通知"); map.put("content", content); diff --git a/src/main/java/com/emr/dao/OverdueRemindMapper.java b/src/main/java/com/emr/dao/OverdueRemindMapper.java index 54c54e80..5a67d156 100644 --- a/src/main/java/com/emr/dao/OverdueRemindMapper.java +++ b/src/main/java/com/emr/dao/OverdueRemindMapper.java @@ -11,6 +11,8 @@ public interface OverdueRemindMapper { String selectDoctorId(OverdueRemindVO overdueRemindVO); //查询主管医医生有多少条超期记录 String selectoverdueNumAndDoctorId(OverdueRemindVO overdueRemindVO); + + List selectoverdueDate(@Param("deptIdQuality")String deptIdQuality); //查询主管医医生有多少条超期记录 List selectoverdueNumAndQualityControl(@Param("deptIdQuality")String deptIdQuality); // 保存操作日志 diff --git a/src/main/java/com/emr/service/OverdueRemindService.java b/src/main/java/com/emr/service/OverdueRemindService.java index 48008a29..7b866e00 100644 --- a/src/main/java/com/emr/service/OverdueRemindService.java +++ b/src/main/java/com/emr/service/OverdueRemindService.java @@ -19,4 +19,5 @@ public interface OverdueRemindService { int selectOverdueStatcByDoctorId(OverdueRemindVO overdueRemindVO); //修改日志超期提醒状态 int updatetOverdueStatcByDoctorId(OverdueRemindVO overdueRemindVO); + List selectoverdueDate(@Param("deptIdQuality")String deptIdQuality); } diff --git a/src/main/java/com/emr/service/ipml/OverdueRemindServiceImpl.java b/src/main/java/com/emr/service/ipml/OverdueRemindServiceImpl.java index 47a1f20c..11ad819d 100644 --- a/src/main/java/com/emr/service/ipml/OverdueRemindServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/OverdueRemindServiceImpl.java @@ -44,4 +44,9 @@ public class OverdueRemindServiceImpl implements OverdueRemindService { public int updatetOverdueStatcByDoctorId(OverdueRemindVO overdueRemindVO) { return overdueRemindMapper.updatetOverdueStatcByDoctorId(overdueRemindVO); } + + @Override + public List selectoverdueDate(String deptIdQuality) { + return overdueRemindMapper.selectoverdueDate(deptIdQuality); + } } diff --git a/src/main/java/com/emr/vo/OverdueRemindVO.java b/src/main/java/com/emr/vo/OverdueRemindVO.java index e29f1304..ef2ae55b 100644 --- a/src/main/java/com/emr/vo/OverdueRemindVO.java +++ b/src/main/java/com/emr/vo/OverdueRemindVO.java @@ -6,6 +6,8 @@ import java.util.Date; @Data public class OverdueRemindVO { + + private String code; private String name; /** 用户Id */ private Integer userId; diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 84b8ecb0..1a3afdce 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -687,7 +687,7 @@ ,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,ISNULL(d.name,m.dept_admission_to) dept_admission_to ,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned, m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.is_scanning, - m.bed_number,ISNULL(s.numb, 0) numb,ISNULL(amf.num, 9) checkFlag + m.bed_number,ISNULL(s.numb, 0) numb,ISNULL(amf.num, 5) checkFlag ,ISNULL(sDoctor.numb, 0) faultDoctorNum,ISNULL(sNurse.numb, 0) faultNurseNum,ISNULL(printTable.num, 0) printNum from archive_master m LEFT JOIN(SELECT amfa.id ,amfa.master_id, amfa.following_type num FROM Archive_Master_Following amfa left join diff --git a/src/main/resources/mapper/overdueRemindMapper.xml b/src/main/resources/mapper/overdueRemindMapper.xml index 3fd7755a..a71efd72 100644 --- a/src/main/resources/mapper/overdueRemindMapper.xml +++ b/src/main/resources/mapper/overdueRemindMapper.xml @@ -128,6 +128,9 @@ WHERE ))>=3 group by e.name +