Selaa lähdekoodia

返回提示信息修改

zhoutg 5 vuotta sitten
vanhempi
commit
457edbe076

+ 6 - 0
src/main/java/com/diagbot/dto/MsgDTO.java

@@ -23,6 +23,12 @@ public class MsgDTO {
     private String isReject;
     //模块名称
     private String modelName;
+    //模块id
+    private String modelId;
+    //模块ID
+    private Long casesId;
+    //模块分数
+    private BigDecimal casesScore;
     // 条目ID
     private Long casesEntryId;
 }

+ 5 - 0
src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -320,6 +320,11 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             }
         }
         if (flag) {
+            // 会诊记录特殊处理,有会诊申请单,没有会诊结果单,复制一份到会诊结果单
+            if ("会诊记录".equals(key) && ListUtil.isNotEmpty(listMap.get("会诊申请单"))
+                    && ListUtil.isEmpty(listMap.get("会诊结果单"))) {
+                listMap.put("会诊结果单", listMap.get("会诊申请单"));
+            }
             content.put("content", listMap);
             medrecVo.setContent(content);
             medrecVoList.add(medrecVo);

+ 3 - 3
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -62,9 +62,9 @@
     </select>
 
     <select id="getMsg" resultType="com.diagbot.dto.MsgDTO">
-        SELECT b.`name` model_name,c.score,c.msg,c.cases_entry_id,c.is_reject,c.id id
-        FROM `qc_cases_entry` a, qc_mode b, med_qcresult_detail c
-        where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N'
+        SELECT b.`name` model_name,c.score,c.msg,c.cases_entry_id,c.is_reject,c.id id, a.cases_id cases_id, d.score cases_score,b.id model_id
+        FROM `qc_cases_entry` a, qc_mode b, med_qcresult_detail c, qc_cases_hospital d
+        where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N' and d.is_deleted = 'N'
         and a.id = c.cases_entry_id
         and a.mode_id = b.id
         and c.hospital_id = #{hospitalId}