Browse Source

修改bug

zhoutg 5 năm trước cách đây
mục cha
commit
d9d788102e

+ 21 - 5
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0178.java

@@ -92,20 +92,36 @@ public class FIRP0178 extends QCCatalogue {
 
     private List<String> getFirstPageDiag(List<Map<String, String>> dischargeDiag) {
         List<String> firstpageDiag = new ArrayList<>();
-        for (int i = 1; i < dischargeDiag.size(); i++) {
+        for (int i = 0; i < dischargeDiag.size(); i++) {
+            if ("门诊诊断".equals(dischargeDiag.get(i).get("诊断类别"))) {
+                continue;
+            }
             String diagnoseName = dischargeDiag.get(i).get(Content.diagnoseName);
-            if (StringUtil.isBlank(diagnoseName)) {
+            if (StringUtil.isBlank(diagnoseName) || "-".equals(diagnoseName)) { // 诊断名称为空不算
                 continue;
             }
-            firstpageDiag.add(diagnoseName);
+            // 去重
+            if (!firstpageDiag.contains(diagnoseName)) {
+                firstpageDiag.add(diagnoseName);
+            }
         }
-        return firstpageDiag;
+        // 不复制第一个
+        List<String> res = new ArrayList<>();
+        if (ListUtil.isNotEmpty(firstpageDiag) && firstpageDiag.size() > 1) {
+            for (int i = 1; i < firstpageDiag.size(); i++) {
+                res.add(firstpageDiag.get(i));
+            }
+        }
+        return res;
     }
 
     private List<String> putDiagToList(List<Diag> diagList) {
         List<String> diags = new ArrayList<>();
         for (Diag diag : diagList) {
-            diags.add(diag.getHospitalDiagName());
+            // 去重
+            if (!diags.contains(diag.getHospitalDiagName())) {
+                diags.add(diag.getHospitalDiagName());
+            }
         }
         return diags;
     }