三级查房规则修改bug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0256.java

@@ -45,7 +45,8 @@ public class FIRP0256 extends QCCatalogue {
             List<OutcomeCure> outcomeCures = new ArrayList<>();//转归情况-治愈
             List<PositiveFinding> positiveFindings = new ArrayList<>();//阳性表现
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (!threeLevelWardDoc.getThreeLevelWardLabel().getTitle().contains("最后一次")) {
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || !threeLevelWardDoc.getThreeLevelWardLabel().getTitle().contains("最后一次")) {
                     continue;
                 }
                 ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0130.java

@@ -24,7 +24,8 @@ public class THR0130 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
                         || !Content.indications.equals(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())) {
                     continue;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0131.java

@@ -24,7 +24,8 @@ public class THR0131 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
                         || !Content.indications.equals(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())) {
                     continue;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0132.java

@@ -24,7 +24,8 @@ public class THR0132 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
                         || !Content.indications.equals(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())) {
                     continue;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0133.java

@@ -24,7 +24,8 @@ public class THR0133 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
                         || !Content.indications.equals(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())) {
                     continue;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0134.java

@@ -24,7 +24,8 @@ public class THR0134 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
                         || !Content.indications.equals(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())) {
                     continue;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0135.java

@@ -1,7 +1,6 @@
 package com.lantone.qc.kernel.catalogue.threelevelward;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
@@ -10,11 +9,7 @@ import com.lantone.qc.pub.model.label.ThreeLevelWardLabel;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @ClassName : THR0135
@@ -29,7 +24,8 @@ public class THR0135 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
                         || !Content.director.equals(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())) {
                     continue;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0136.java

@@ -24,7 +24,8 @@ public class THR0136 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
                         || !Content.director.equals(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())) {
                     continue;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0137.java

@@ -24,7 +24,8 @@ public class THR0137 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
                         || !Content.director.equals(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())) {
                     continue;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0138.java

@@ -24,7 +24,8 @@ public class THR0138 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
                         || !Content.director.equals(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())) {
                     continue;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0139.java

@@ -24,7 +24,8 @@ public class THR0139 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || StringUtil.isBlank(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())
                         || !Content.director.equals(threeLevelWardDoc.getThreeLevelWardLabel().getTitle())) {
                     continue;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0429.java

@@ -21,13 +21,14 @@ import java.util.List;
 public class THR0429 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (ListUtil.isEmpty(inputInfo.getDifficultCaseDiscussDocs())){
+        if (ListUtil.isEmpty(inputInfo.getDifficultCaseDiscussDocs())) {
             return;
         }
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (threeLevelWardDoc.getThreeLevelWardLabel().getSerious() != 2) {
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || threeLevelWardDoc.getThreeLevelWardLabel().getSerious() != 2) {
                     continue;
                 }
                 ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0430.java

@@ -21,13 +21,14 @@ import java.util.List;
 public class THR0430 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (ListUtil.isEmpty(inputInfo.getRescueDocs())){
+        if (ListUtil.isEmpty(inputInfo.getRescueDocs())) {
             return;
         }
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (threeLevelWardDoc.getThreeLevelWardLabel().getSerious() != 3) {
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || threeLevelWardDoc.getThreeLevelWardLabel().getSerious() != 3) {
                     continue;
                 }
                 ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0431.java

@@ -20,13 +20,14 @@ import java.util.List;
 public class THR0431 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (ListUtil.isEmpty(inputInfo.getSeriouslyIllNoticeDocs())){
+        if (ListUtil.isEmpty(inputInfo.getSeriouslyIllNoticeDocs())) {
             return;
         }
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (threeLevelWardDoc.getThreeLevelWardLabel().getSerious() != 1) {
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || threeLevelWardDoc.getThreeLevelWardLabel().getSerious() != 1) {
                     continue;
                 }
                 ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0432.java

@@ -20,13 +20,14 @@ import java.util.List;
 public class THR0432 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (ListUtil.isEmpty(inputInfo.getDifficultCaseDiscussDocs())){
+        if (ListUtil.isEmpty(inputInfo.getDifficultCaseDiscussDocs())) {
             return;
         }
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (threeLevelWardDoc.getThreeLevelWardLabel().getSerious() != 2) {
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || threeLevelWardDoc.getThreeLevelWardLabel().getSerious() != 2) {
                     continue;
                 }
                 ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0433.java

@@ -20,13 +20,14 @@ import java.util.List;
 public class THR0433 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (ListUtil.isEmpty(inputInfo.getRescueDocs())){
+        if (ListUtil.isEmpty(inputInfo.getRescueDocs())) {
             return;
         }
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (threeLevelWardDoc.getThreeLevelWardLabel().getSerious() != 3) {
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
+                        || threeLevelWardDoc.getThreeLevelWardLabel().getSerious() != 3) {
                     continue;
                 }
                 ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();