病历管理

mrman-service/src/main/java/com/diagbot/dto/BABLDetailDTO.java

@@ -28,13 +28,17 @@ public class BABLDetailDTO {
     private String brbarh;
 
     /**
-     * 门急诊诊断名称
+     * 门急诊主要诊断名称
      */
-    private String mjzzdmc;
+    private String mjzzyzdmc;
     /**
      * 门急诊主要诊断列表
      */
     private List<BrRecdiagnose> mjzzyzdList;
+    /**
+     * 门急诊其他诊断名称
+     */
+    private String mjzqtzdmc;
     /**
      * 门急诊其他诊断列表
      */

mrman-service/src/main/java/com/diagbot/enums/ZDLXEnum.java

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:诊断类型
+ * @Author:zhaops
+ * @time: 2020/1/20 13:47
+ */
+public enum ZDLXEnum implements KeyedNamed {
+    MJZZYZD(1, "门急诊主要诊断"),
+    MJZQTZD(2, "门急诊其他诊断"),
+    ZYZYZD(3, "住院主要诊断"),
+    ZYQTZD(4, "住院其他诊断");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    ZDLXEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ZDLXEnum getEnum(int key) {
+        for (ZDLXEnum item : ZDLXEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        ZDLXEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

mrman-service/src/main/java/com/diagbot/facade/ArRechomeFacade.java

@@ -9,12 +9,12 @@ import com.diagbot.entity.BrRecdiagnose;
 import com.diagbot.entity.MrMrcontent;
 import com.diagbot.enums.ZCZDPBEnum;
 import com.diagbot.enums.ZDLBDMEnum;
+import com.diagbot.enums.ZDLXEnum;
 import com.diagbot.service.BrRecdiagnoseService;
 import com.diagbot.service.MrMrcontentService;
 import com.diagbot.service.impl.ArRechomeServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
 import com.diagbot.vo.BABLDetailVO;
 import com.diagbot.vo.BABLVO;
 import com.google.common.collect.Lists;
@@ -65,10 +65,10 @@ public class ArRechomeFacade extends ArRechomeServiceImpl {
         //获取诊断列表
         Map<String, List<BrRecdiagnose>> diagMap = brRecdiagnoseFacade.getListByParam(bablvo.getBasyid());
         if (diagMap != null) {
-            bablDetailDTO.setMjzzyzdList(diagMap.get("mjzzyzdList"));
-            bablDetailDTO.setMjzqtzdList(diagMap.get("mjzqtzdList"));
-            bablDetailDTO.setZyzyzdList(diagMap.get("zyzyzdList"));
-            bablDetailDTO.setZyqtzdList(diagMap.get("zyqtzdList"));
+            bablDetailDTO.setMjzzyzdList(diagMap.get(ZDLXEnum.MJZZYZD.getName()));
+            bablDetailDTO.setMjzqtzdList(diagMap.get(ZDLXEnum.MJZQTZD.getName()));
+            bablDetailDTO.setZyzyzdList(diagMap.get(ZDLXEnum.ZYZYZD.getName()));
+            bablDetailDTO.setZyqtzdList(diagMap.get(ZDLXEnum.ZYQTZD.getName()));
         }
         //获取病历记录
         List<BLJLDetailDTO> bljlDetailDTOList = mrMedicalrecordsFacade.getBLJLList(bablvo);

mrman-service/src/main/java/com/diagbot/facade/BrRecdiagnoseFacade.java

@@ -2,6 +2,9 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.entity.BrRecdiagnose;
+import com.diagbot.enums.ZCZDPBEnum;
+import com.diagbot.enums.ZDLBDMEnum;
+import com.diagbot.enums.ZDLXEnum;
 import com.diagbot.service.impl.BrRecdiagnoseServiceImpl;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
@@ -38,26 +41,26 @@ public class BrRecdiagnoseFacade extends BrRecdiagnoseServiceImpl {
         }
         Map<String, List<BrRecdiagnose>> map = EntityUtil.makeEntityListMap(brRecdiagnoses, "zdlbdm");
         for (Map.Entry<String, List<BrRecdiagnose>> entry : map.entrySet()) {
-            if (entry.getKey().equals("1")) {
+            if (entry.getKey().equals(String.valueOf(ZDLBDMEnum.MJZ.getKey()))) {
                 if (ListUtil.isNotEmpty(entry.getValue())) {
                     List<BrRecdiagnose> subBrRecdiagnoses = entry.getValue().stream().filter(i -> i.getZczdpb() != null).collect(Collectors.toList());
-                    Map<String, List<BrRecdiagnose>> subMap = EntityUtil.makeEntityListMap(subBrRecdiagnoses, "zczdpb");
-                    if (subMap.containsKey(1)) {
-                        retMap.put("mjzzyzdList", subMap.get(1));
+                    Map<Integer, List<BrRecdiagnose>> subMap = EntityUtil.makeEntityListMap(subBrRecdiagnoses, "zczdpb");
+                    if (subMap.containsKey(ZCZDPBEnum.ZY.getKey())) {
+                        retMap.put(ZDLXEnum.MJZZYZD.getName(), subMap.get(ZCZDPBEnum.ZY.getKey()));
                     }
-                    if (subMap.containsKey(2)) {
-                        retMap.put("mjzqtzdList", subMap.get(2));
+                    if (subMap.containsKey(ZCZDPBEnum.QT.getKey())) {
+                        retMap.put(ZDLXEnum.MJZQTZD.getName(), subMap.get(ZCZDPBEnum.QT.getKey()));
                     }
                 }
-            } else if (entry.getKey().equals("2")) {
+            } else if (entry.getKey().equals(String.valueOf(ZDLBDMEnum.ZY.getKey()))) {
                 if (ListUtil.isNotEmpty(entry.getValue())) {
                     List<BrRecdiagnose> subBrRecdiagnoses = entry.getValue().stream().filter(i -> i.getZczdpb() != null).collect(Collectors.toList());
-                    Map<String, List<BrRecdiagnose>> subMap = EntityUtil.makeEntityListMap(subBrRecdiagnoses, "zczdpb");
-                    if (subMap.containsKey(1)) {
-                        retMap.put("zyzyzdList", subMap.get(1));
+                    Map<Integer, List<BrRecdiagnose>> subMap = EntityUtil.makeEntityListMap(subBrRecdiagnoses, "zczdpb");
+                    if (subMap.containsKey(ZCZDPBEnum.ZY.getKey())) {
+                        retMap.put(ZDLXEnum.ZYZYZD.getName(), subMap.get(ZCZDPBEnum.ZY.getKey()));
                     }
-                    if (subMap.containsKey(2)) {
-                        retMap.put("zyqtzdList", subMap.get(2));
+                    if (subMap.containsKey(ZCZDPBEnum.QT.getKey())) {
+                        retMap.put(ZDLXEnum.ZYQTZD.getName(), subMap.get(ZCZDPBEnum.QT.getKey()));
                     }
                 }
             }

mrman-service/src/main/resources/mapper/ArRechomeMapper.xml

@@ -55,7 +55,8 @@
 	  t1.BRBAXB,
 	  t1.BRBAXX,
 	  t1.BRBARH,
-	  t2.MJZZDMC,
+	  t2.MJZZYZDMC,
+      t2.MJZQTZDMC,
 	  t2.ZYZYZDMC,
 	  t2.ZYQTZDMC
     FROM
@@ -63,7 +64,8 @@
 	(
 	SELECT
 		tt.BASYID,
-		listAgg ( tt.MJZZDMC, ',' ) within GROUP ( ORDER BY tt.MJZZDMC ) AS MJZZDMC,
+		listAgg ( tt.MJZZYZDMC, ',' ) within GROUP ( ORDER BY tt.MJZZYZDMC ) AS MJZZYZDMC,
+        listAgg ( tt.MJZQTZDMC, ',' ) within GROUP ( ORDER BY tt.MJZQTZDMC ) AS MJZQTZDMC,
 		listAgg ( tt.ZYZYZDMC, ',' ) within GROUP ( ORDER BY tt.ZYZYZDMC ) AS ZYZYZDMC,
 		listAgg ( tt.ZYQTZDMC, ',' ) within GROUP ( ORDER BY tt.ZYQTZDMC ) AS ZYQTZDMC
 	FROM
@@ -74,9 +76,16 @@
 			ZCZDPB,
 		CASE
 
-				WHEN ZDLBDM = '1' THEN
+				WHEN ZDLBDM = '1'
+                AND ZCZDPB = '1' THEN
 				t.ZDJBMC
-			END AS MJZZDMC,
+			END AS MJZZYZDMC,
+        CASE
+
+                WHEN ZDLBDM = '1'
+                AND ZCZDPB = '2'THEN
+                t.ZDJBMC
+            END AS MJZQTZDMC,
 		CASE
 
 				WHEN ZDLBDM = '2'