优化电子病历建议查询

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/emr/EmrControlDaoV2.java

@@ -280,12 +280,16 @@ public interface EmrControlDaoV2 {
     JSONObject objects(String patNo, Integer times);
 
 
-    @Select("select id, " +
-            "       pat_no, " +
-            "       times, " +
+    @Select("select a.id, " +
+            "       a.pat_no, " +
+            "       b.del_flag, " +
+            "       a.times, " +
             "       approver, " +
-            "       review_time, " +
-            "       name, " +
+            "       approver_name = (select rtrim(name) " +
+            "                        from a_employee_mi " +
+            "                        where code = approver), " +
+            "       a.review_time, " +
+            "       a.name, " +
             "       scoring_criteria, " +
             "       remark, " +
             "       remediation_status, " +
@@ -296,12 +300,19 @@ public interface EmrControlDaoV2 {
             "       history, " +
             "       doctor, " +
             "       final_control, " +
-            "       pat_name = (select rtrim(name) from a_patient_mi where a.pat_no = inpatient_no), " +
-            "       emr_name = (select emr_name from emr_patient_data where emr_id = emr_patient_data.id) " +
-            "from emr_audit_detail a " +
-            "where history = 0 " +
+            "       pat_name      = (select rtrim(name) " +
+            "                        from a_patient_mi " +
+            "                        where a.pat_no = inpatient_no), " +
+            "       emr_name      = (select emr_name " +
+            "                        from emr_patient_data " +
+            "                        where emr_id = emr_patient_data.id) " +
+            "from emr_audit_detail a, " +
+            "     emr_patient_data b " +
+            "where a.emr_id = b.id " +
+            "  and history = 0 " +
+            "  and b.del_flag = 0 " +
             "  and doctor = #{doctor} " +
-            "  and remediation_status is null")
+            "  and remediation_status is null;")
     List<EmrAuditDetail> getUnprocessedRecommendationsByDoctor(String doctor);
 
 }

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/JianYanJianChaShenQingService.java

@@ -405,11 +405,9 @@ public class JianYanJianChaShenQingService {
         StringBuilder cuoWuXinXi = new StringBuilder();
 
         for (YshYjReq item : param.getList()) {
-
             if (item.getQuantity() == null) {
                 item.setQuantity(BigDecimal.ONE);
             }
-
             if (StringUtil.notBlank(item.getJzFlag()) && "0".equals(item.getJzFlag())) {
                 item.setJzFlag(null);
             }
@@ -454,10 +452,12 @@ public class JianYanJianChaShenQingService {
             xm.add(item.getOrderCode().trim());
             content.add(String.format("%s：<span style='color:#409eff'>【%s】</span><br>" +
                             "患者姓名：<span style='color:#409eff'>【%s】</span><br>" +
-                            "床位：<span style='color:#409eff'>【%s】</span>", "2".equals(param.getReqType()) ? "检查名" : "检验名",
+                            "床位：<span style='color:#409eff'>【%s】</span>",
+                    "2".equals(param.getReqType()) ? "检查名" : "检验名",
                     item.getOrderName(), huanZheXinXi.getName(), huanZheXinXi.getBedNo()));
             index++;
         }
+
         // 先判断是不是停用了
         String tingYong = publicServer.xiangMuXianZhi(xm, true);
         if (StringUtil.notBlank(tingYong)) {
@@ -472,26 +472,44 @@ public class JianYanJianChaShenQingService {
             item.setReqNo(publicServer.getReqPageNo());
         }
 
-        String userCode = TokenUtil.getTokenUserId();
-        getThis().insertData(param, huanZheXinXi, userCode);
-        try {
-            publicServer.faSongXiaoXi(huanZheXinXi, content, "2".equals(param.getReqType()) ? "新增检查" : "新增检验", TokenUtil.getTokenUserId());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        getThis().insertData(param, huanZheXinXi, content);
+
         log.info("数据：{}", JSON.toJSONString(param.getList()));
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void insertData(TianJiaJianChaJianYan param, XinZhenYiZhu huanZheXinXi, String userCode) {
+    public void insertData(TianJiaJianChaJianYan param, XinZhenYiZhu patInfo, List<String> content) {
+        String userCode = TokenUtil.getTokenUserId();
+
         Date reqDate = new Date();
-        dao.chaRuShenQing(param.getList(), param.getInpatientNo(), param.getName(), param.getAge() + "岁", param.getAdmissTimes(),
-                param.getBedNo(), userCode, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), param.getReqType(),
-                "3".equals(param.getReqType()) ? "jc_zd_item" : "jy_zd_item", reqDate);
 
-        dao.chaRuShenQingYiZhu(param.getList(), param.getInpatientNo(), param.getAdmissTimes(), userCode, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(),
-                PublicServer.getInfantFlag(param.getInpatientNo()), reqDate);
+        dao.chaRuShenQing(param.getList(),
+                param.getInpatientNo(),
+                param.getName(),
+                param.getAge() + "岁",
+                param.getAdmissTimes(),
+                param.getBedNo(),
+                userCode,
+                patInfo.getDeptCode(),
+                patInfo.getDeptCode(),
+                param.getReqType(),
+                "3".equals(param.getReqType()) ? "jc_zd_item" : "jy_zd_item",
+                reqDate);
+
+        dao.chaRuShenQingYiZhu(param.getList(),
+                param.getInpatientNo(),
+                param.getAdmissTimes(),
+                userCode,
+                patInfo.getDeptCode(),
+                patInfo.getDeptCode(),
+                PublicServer.getInfantFlag(param.getInpatientNo()),
+                reqDate);
+        try {
+            publicServer.faSongXiaoXi(patInfo, content, "2".equals(param.getReqType()) ? "新增检查" : "新增检验", TokenUtil.getTokenUserId());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }