Parcourir la source

前置条件修改

rengb il y a 5 ans
Parent
commit
c95f3c4c6f
100 fichiers modifiés avec 229 ajouts et 214 suppressions
  1. 40 25
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/QCCatalogue.java
  2. 6 6
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0001.java
  3. 6 6
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0002.java
  4. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0003.java
  5. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0004.java
  6. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0005.java
  7. 4 4
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0006.java
  8. 4 4
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0007.java
  9. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0008.java
  10. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0009.java
  11. 5 5
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0010.java
  12. 5 5
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0011.java
  13. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0012.java
  14. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0013.java
  15. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0014.java
  16. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0015.java
  17. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0016.java
  18. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0017.java
  19. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0018.java
  20. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0019.java
  21. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0020.java
  22. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0021.java
  23. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0022.java
  24. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0023.java
  25. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0024.java
  26. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0025.java
  27. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0026.java
  28. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0027.java
  29. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0028.java
  30. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0029.java
  31. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0030.java
  32. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0031.java
  33. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0032.java
  34. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0034.java
  35. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0035.java
  36. 4 4
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0036.java
  37. 4 4
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0037.java
  38. 4 4
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0038.java
  39. 4 4
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0039.java
  40. 4 4
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0040.java
  41. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0041.java
  42. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0042.java
  43. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0043.java
  44. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0044.java
  45. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0045.java
  46. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0046.java
  47. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0047.java
  48. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0048.java
  49. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0049.java
  50. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0050.java
  51. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0051.java
  52. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0052.java
  53. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0053.java
  54. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0054.java
  55. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0056.java
  56. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0058.java
  57. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0059.java
  58. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0060.java
  59. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0061.java
  60. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0062.java
  61. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0063.java
  62. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0064.java
  63. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0065.java
  64. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0066.java
  65. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0067.java
  66. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0068.java
  67. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0069.java
  68. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0070.java
  69. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0071.java
  70. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0072.java
  71. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0073.java
  72. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0074.java
  73. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0075.java
  74. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0076.java
  75. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0079.java
  76. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0081.java
  77. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0082.java
  78. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0372.java
  79. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0375.java
  80. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0376.java
  81. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0377.java
  82. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0378.java
  83. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0397.java
  84. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0398.java
  85. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0399.java
  86. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0400.java
  87. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0401.java
  88. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0402.java
  89. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0403.java
  90. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0404.java
  91. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0405.java
  92. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0406.java
  93. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0407.java
  94. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0408.java
  95. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0409.java
  96. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0410.java
  97. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0411.java
  98. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0412.java
  99. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0413.java
  100. 0 0
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0414.java

+ 40 - 25
kernel/src/main/java/com/lantone/qc/kernel/catalogue/QCCatalogue.java

@@ -19,60 +19,75 @@ import java.util.Map;
 @Slf4j
 public class QCCatalogue {
 
-    protected String status = "-1";
-    protected String info = "";
-    private Map<String, String> resultDetail = Maps.newHashMap();
-    private String className = this.getClass().getSimpleName();
-
-    public QCCatalogue() {
-        CatalogueUtil.qcCatalogueMap.put(className, this);
-    }
+    protected ThreadLocal<String> status = new ThreadLocal<String>();
+    protected ThreadLocal<String> info = new ThreadLocal<String>();
 
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
         if (outputInfo.getResult().get(className) != null) {
             return;
         }
-        precondExecute(inputInfo, outputInfo);
+        if (!precondExecute(inputInfo, outputInfo)) {
+            variablePreset("-2", "");
+            return;
+        }
         try {
+            variablePreset("-1", "");
             start(inputInfo, outputInfo);
         } catch (Exception e) {
-            propertiesClear();
+            variablePreset("-1", "");
             log.info(e.getMessage());
         }
         insertOpt(outputInfo);
     }
 
-    protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
-    }
-
     private void insertOpt(OutputInfo outputInfo) {
-        resultDetail.put("info", info);
-        resultDetail.put("status", status);
+        Map<String, String> resultDetail = Maps.newHashMap();
+        resultDetail.put("info", info.get());
+        resultDetail.put("status", status.get());
         outputInfo.getResult().put(className, resultDetail);
-        propertiesClear();
+        status.remove();
+        info.remove();
     }
 
-    private void propertiesClear() {
-        status = "-1";
-        info = "";
+    private void variablePreset(String arg0, String arg1) {
+        status.set(arg0);
+        info.set(arg1);
     }
 
-    //前置条件运行
-    private void precondExecute(InputInfo inputInfo, OutputInfo outputInfo) {
+    //前置条件运行 true通过,false不通过
+    private boolean precondExecute(InputInfo inputInfo, OutputInfo outputInfo) {
         Map<String, String> catalogueMap = inputInfo.getInputCatalogueMap().get(className);
         if (catalogueMap == null) {
-            return;
+            return true;
         }
         String precond = catalogueMap.get("precond");
         if (StringUtil.isBlank(precond)) {
-            return;
+            return true;
         }
-        for (String i : precond.split(",")) {
-            QCCatalogue qCCatalogue = CatalogueUtil.qcCatalogueMap.get(i);
+        boolean flag = true;
+        String[] codes = precond.split(",");
+        for (String code : codes) {
+            QCCatalogue qCCatalogue = CatalogueUtil.qcCatalogueMap.get(code);
             if (qCCatalogue != null) {
                 qCCatalogue.execute(inputInfo, outputInfo);
             }
         }
+        for (String code : codes) {
+            if (!outputInfo.getResult().get(code).get("status").equals("0")) {
+                flag = false;
+                break;
+            }
+        }
+        return flag;
+    }
+
+    private String className = this.getClass().getSimpleName();
+
+    public QCCatalogue() {
+        CatalogueUtil.qcCatalogueMap.put(className, this);
+    }
+
+    protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
     }
 
 }

+ 6 - 6
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0001.java

@@ -20,23 +20,23 @@ import java.util.List;
 public class BEH0001 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
-        status = "0";
+        status.set("0");
         List<Clinical> clinicals = inputInfo.getBeHospitalizedDoc().getChiefLabel().getClinicals();
         if(clinicals.size()>0){
             for (Clinical clinical:clinicals) {
                 String clinicalName = clinical.getName();
                 List<PD> timestamp = clinical.getTimestamp();
                 if(timestamp == null){
-                    if(StringUtils.isEmpty(info)){
-                        info = clinicalName;
+                    if(StringUtils.isEmpty(info.get())){
+                        info.set(clinicalName);
                     }else {
-                        info = info+","+clinicalName;
+                        info.set(info.get() + "," + clinicalName);
                     }
                 }
             }
         }
-        if(StringUtils.isNotEmpty(info)){
-            status = "-1";
+        if(StringUtils.isNotEmpty(info.get())){
+            status.set("-1");
         }
     }
 }

+ 6 - 6
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0002.java

@@ -37,7 +37,7 @@ public class BEH0002 extends QCCatalogue {
                 String hospitalDiagName = diag.getHospitalDiagName();
                 if(hospitalDiagName.contains("术后")||hospitalDiagName.contains("癌")||
                         hospitalDiagName.contains("瘤") || hospitalDiagName.contains("复诊")){
-                    status = "0";
+                    status.set("0");
                     break;
                 }
             }
@@ -54,16 +54,16 @@ public class BEH0002 extends QCCatalogue {
                 for (Clinical clinical:clinicals) {
                     String clinicalName = clinical.getName();
                     if(symptoms != null && !symptoms.contains(clinicalName)){
-                        if(StringUtils.isEmpty(info)){
-                            info = clinicalName;
+                        if(StringUtils.isEmpty(info.get())){
+                            info.set(clinicalName);
                         }else {
-                            info = info +"," +clinicalName;
+                            info.set(info.get() + "," + clinicalName);
                         }
                     }
                 }
             }
-            if(StringUtils.isEmpty(info)){
-                status = "0";
+            if(StringUtils.isEmpty(info.get())){
+                status.set("0");
             }
         }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0003.java

@@ -25,7 +25,7 @@ public class BEH0003 extends QCCatalogue {
         String chief_text = inputInfo.getBeHospitalizedDoc().getChiefLabel().getText();
         if(CatalogueUtil.removeSpecialChar(chief_text).length()<=20)
         {
-            status = "0";
+            status.set("0");
         }
     }
 }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0004.java

@@ -23,12 +23,12 @@ import java.util.stream.Stream;
 public class BEH0004 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Collection<String> values = structureMap.values();
         for (String value:values) {
             if(CatalogueUtil.isEmpty(value)){
-                status = "-1";
+                status.set("-1");
                 break;
             }
         }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0005.java

@@ -54,7 +54,7 @@ public class BEH0005 extends QCCatalogue {
                 }
             }
             if(min == time_index.get(0)){
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 4 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0006.java

@@ -27,7 +27,7 @@ public class BEH0006 extends QCCatalogue {
         ChiefLabel chiefLabel = inputInfo.getBeHospitalizedDoc().getChiefLabel();
         String chief_text = chiefLabel.getText();
         if(chief_text.contains("检查") || chief_text.contains("术后")){
-            status = "0";
+            status.set("0");
         }else {
             List<Clinical> clinicals = chiefLabel.getClinicals();
             if(clinicals.size()>0){
@@ -39,18 +39,18 @@ public class BEH0006 extends QCCatalogue {
                                 if(pd.getName().contains("天") || pd.getName().contains("周")|| pd.getName().contains("月")
                                         || pd.getName().contains("时") || pd.getName().contains("半年") || pd.getName().contains("秒")
                                         || pd.getName().contains("日")){
-                                    status = "0";
+                                    status.set("0");
                                     break;
                                 }
                             }
                         }
-                        if(status == "0"){
+                        if(status.get().equals("0")){
                             break;
                         }
                     }
                 }
             }else {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 4 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0007.java

@@ -37,17 +37,17 @@ public class BEH0007 extends QCCatalogue {
                     String value = pd.getValue();
                     String unit = pd.getUnit();
                     if(StringUtils.isEmpty(unit) && value.contains("数")){
-                        status = "-1";
+                        status.set("-1");
                         break;
                     }else {
-                        status = "0";
+                        status.set("0");
                     }
                 }
             }else {
-                status = "0";
+                status.set("0");
             }
         }else {
-            status = "0";
+            status.set("0");
         }
 
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0008.java

@@ -27,7 +27,7 @@ public class BEH0008 extends QCCatalogue {
         ChiefLabel chiefLabel = inputInfo.getBeHospitalizedDoc().getChiefLabel();
         List<Clinical> clinicals = chiefLabel.getClinicals();
         if(clinicals.size()<=3){
-            status = "0";
+            status.set("0");
         }
 
     }

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0009.java

@@ -31,7 +31,7 @@ public class BEH0009 extends QCCatalogue {
                 String hospitalDiagName = diag.getHospitalDiagName();
                 if(hospitalDiagName.contains("术后")||hospitalDiagName.contains("癌")||
                 hospitalDiagName.contains("瘤") || hospitalDiagName.contains("复诊")){
-                    status = "0";
+                    status.set("0");
                     break;
                 }
             }
@@ -46,12 +46,12 @@ public class BEH0009 extends QCCatalogue {
             int index_ban = chiefLabelText.indexOf("伴");
             if(indexMap.size()>0){
                 if(index_ban == -1){
-                    status = "0";
+                    status.set("0");
                 }else {
                     for (Map.Entry<String,Integer> s:indexMap.entrySet()) {
                         Integer value = s.getValue();
                         if(value<index_ban){
-                            status = "0";
+                            status.set("0");
                             break;
                         }
                     }

+ 5 - 5
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0010.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Component
 public class BEH0010 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         ChiefLabel chiefLabel = inputInfo.getBeHospitalizedDoc().getChiefLabel();
         List<Diag> diags = chiefLabel.getDiags();
         if(diags.size()>0){
@@ -36,12 +36,12 @@ public class BEH0010 extends QCCatalogue {
             }
         }
         if(diags.size()>0){
-            status = "-1";
+            status.set("-1");
             for (Diag diag:diags) {
-                if(StringUtils.isEmpty(info)){
-                    info = diag.getName();
+                if(StringUtils.isEmpty(info.get())){
+                    info.set(diag.getName());
                 }else {
-                    info = info+","+diag.getName();
+                    info.set(info.get() + "," + diag.getName());
                 }
             }
         }

+ 5 - 5
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0011.java

@@ -38,18 +38,18 @@ public class BEH0011 extends QCCatalogue {
                     if(map != null || map.size() >0){
                         String chronic = (String) map.get("chronic");//1是慢病
                         if("1".equals(chronic) && !initDiags.contains(diag.getName())){
-                            if(StringUtils.isEmpty(info)){
-                                info = diag.getName();
+                            if(StringUtils.isEmpty(info.get())){
+                                info.set(diag.getName());
                             }else {
-                                info = info+","+diag.getName();
+                                info.set(info.get() + "," + diag.getName());
                             }
                         }
                     }
                 }
             }
         }
-        if(StringUtils.isEmpty(info)){
-            status = "0";
+        if(StringUtils.isEmpty(info.get())){
+            status.set("0");
         }
 
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0012.java

@@ -37,10 +37,10 @@ public class BEH0012 extends QCCatalogue {
                 }
             }
             if(diags_out.size()>0){
-                info = diags_out.toString().replace("[","").replace("]","");
+                info.set(diags_out.toString().replace("[","").replace("]",""));
             }
         }else {
-            status = "0";
+            status.set("0");
         }
 
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0013.java

@@ -21,7 +21,7 @@ import java.util.List;
 @Component
 public class BEH0013 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         List<Clinical> clinicalNegative = new ArrayList<>();
         List<Clinical> clinicals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getClinicals();
         if(clinicals.size()>0){
@@ -32,7 +32,7 @@ public class BEH0013 extends QCCatalogue {
             }
         }
         if(clinicalNegative.size() == 0){
-            status = "-1";
+            status.set("-1");
         }
     }
 }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0014.java

@@ -27,9 +27,9 @@ public class BEH0014 extends QCCatalogue {
             String clinicalName = clinical.getName();
             Cause cause = clinical.getCause();
             if(cause == null){
-                info = clinicalName;
+                info.set(clinicalName);
             }else {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0015.java

@@ -27,7 +27,7 @@ public class BEH0015 extends QCCatalogue {
             Clinical clinical = clinicals.get(0);
             BodyPart bodyPart = clinical.getBodyPart();
             if(bodyPart == null){
-                info = clinical.getName();
+                info.set(clinical.getName());
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0016.java

@@ -30,7 +30,7 @@ public class BEH0016 extends QCCatalogue {
             Clinical clinical = clinicals.get(0);
             Property property = clinical.getProperty();
             if(property == null){
-                info = clinical.getName();
+                info.set(clinical.getName());
             }
         }
 

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0017.java

@@ -25,12 +25,12 @@ public class BEH0017 extends QCCatalogue {
             Clinical clinical = clinicals.get(0);
             List<PD> timestamp = clinical.getTimestamp();
             if(timestamp == null){
-                info = clinical.getName();
+                info.set(clinical.getName());
             }else {
-                status = "0";
+                status.set("0");
             }
         }else {
-            status = "0";
+            status.set("0");
         }
     }
 }

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0018.java

@@ -34,18 +34,18 @@ public class BEH0018 extends QCCatalogue {
                             if(pd.getName().contains("天") || pd.getName().contains("周")|| pd.getName().contains("月")
                             || pd.getName().contains("时") || pd.getName().contains("半年") || pd.getName().contains("秒")
                             || pd.getName().contains("日")){
-                                status = "0";
+                                status.set("0");
                                 break;
                             }
                         }
                     }
-                    if(status == "0"){
+                    if(status.get().equals("0")){
                         break;
                     }
                 }
             }
         }else {
-            status = "0";
+            status.set("0");
         }
     }
 }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0019.java

@@ -34,9 +34,9 @@ public class BEH0019 extends QCCatalogue {
             Clinical clinical = clinicals.get(0);
             Degree degree = clinical.getDegree();
             if(degree == null){
-                info = clinical.getName();
+                info.set(clinical.getName());
             }else {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0020.java

@@ -26,9 +26,9 @@ public class BEH0020 extends QCCatalogue {
             Clinical clinical = clinicals.get(0);
             Modification modification = clinical.getModification();
             if(modification == null || !modification.getName().contains("缓")){
-                info = clinical.getName();
+                info.set(clinical.getName());
             }else {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0021.java

@@ -26,9 +26,9 @@ public class BEH0021 extends QCCatalogue {
             Clinical clinical = clinicals.get(0);
             Modification modification = clinical.getModification();
             if(modification == null || (!modification.getName().contains("严重") && !modification.getName().contains("加剧"))){
-                info = clinical.getName();
+                info.set(clinical.getName());
             }else {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0022.java

@@ -20,10 +20,10 @@ import java.util.List;
 @Component
 public class BEH0022 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         List<GeneralDesc> generals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getGenerals();
         if(generals.size() == 0 || generals == null){
-            status = "-1";
+            status.set("-1");
         }
 
     }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0023.java

@@ -21,12 +21,12 @@ import java.util.List;
 @Component
 public class BEH0023 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         List<Lis> lises = inputInfo.getBeHospitalizedDoc().getPresentLabel().getLises();
         List<Pacs> pacses = inputInfo.getBeHospitalizedDoc().getPresentLabel().getPacses();
         List<Treat> treats = inputInfo.getBeHospitalizedDoc().getPresentLabel().getTreats();
         if(lises == null && pacses.size() == 0 && treats.size() == 0){
-            status = "-1";
+            status.set("-1");
         }
     }
 }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0024.java

@@ -23,7 +23,7 @@ public class BEH0024 extends QCCatalogue {
         List<Wound> wounds = inputInfo.getBeHospitalizedDoc().getPastLabel().getWounds();
         if (ListUtil.isNotEmpty(wounds)) {
             if (wounds.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i)).count() > 0) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0025.java

@@ -23,7 +23,7 @@ public class BEH0025 extends QCCatalogue {
         List<Operation> operations = inputInfo.getBeHospitalizedDoc().getPastLabel().getOperations();
         if (ListUtil.isNotEmpty(operations)) {
             if (operations.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i)).count() > 0) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0026.java

@@ -29,7 +29,7 @@ public class BEH0026 extends QCCatalogue {
                             && StringUtil.isNotBlank(i.getAllergyFood().getName())
             ).count();
             if (count > 0) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0027.java

@@ -29,7 +29,7 @@ public class BEH0027 extends QCCatalogue {
                             && StringUtil.isNotBlank(i.getAllergyMedicine().getName())
             ).count();
             if (count > 0) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0028.java

@@ -23,7 +23,7 @@ public class BEH0028 extends QCCatalogue {
         List<BloodTransfusion> bloodTransfusions = inputInfo.getBeHospitalizedDoc().getPastLabel().getBloodTransfusions();
         if (ListUtil.isNotEmpty(bloodTransfusions)) {
             if (bloodTransfusions.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i)).count() > 0) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0029.java

@@ -23,7 +23,7 @@ public class BEH0029 extends QCCatalogue {
         List<Vaccinate> vaccinates = inputInfo.getBeHospitalizedDoc().getPastLabel().getVaccinates();
         if (ListUtil.isNotEmpty(vaccinates)) {
             if (vaccinates.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i)).count() > 0) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0030.java

@@ -24,7 +24,7 @@ public class BEH0030 extends QCCatalogue {
                         "1"
                 )
         )) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0031.java

@@ -24,7 +24,7 @@ public class BEH0031 extends QCCatalogue {
                         "1"
                 )
         )) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0032.java

@@ -23,7 +23,7 @@ public class BEH0032 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
         List<Diag> diags = pastLabel.getDiags();
         if (ListUtil.isEmpty(diags)) {
@@ -34,9 +34,9 @@ public class BEH0032 extends QCCatalogue {
                 pastLabel.getText()
         );
         if (ListUtil.isNotEmpty(wtDiagNames)) {
-            status = "-1";
+            status.set("-1");
             for (String wtDiagName : wtDiagNames) {
-                info += wtDiagName + " ";
+                info.set(info.get() + wtDiagName + " ");
             }
         }
     }

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0034.java

@@ -23,7 +23,7 @@ public class BEH0034 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
         List<Operation> operations = pastLabel.getOperations();
         if (ListUtil.isEmpty(operations)) {
@@ -40,9 +40,9 @@ public class BEH0034 extends QCCatalogue {
                 pastLabel.getText()
         );
         if (ListUtil.isNotEmpty(wtOperationNames)) {
-            status = "-1";
+            status.set("-1");
             for (String wtOperationName : wtOperationNames) {
-                info += wtOperationName + " ";
+                info.set(info.get() + wtOperationName + " ");
             }
         }
     }

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0035.java

@@ -23,7 +23,7 @@ public class BEH0035 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
         List<Allergy> allergies = pastLabel.getAllergies();
         if (ListUtil.isEmpty(allergies)) {
@@ -38,9 +38,9 @@ public class BEH0035 extends QCCatalogue {
                 pastLabel.getText()
         );
         if (ListUtil.isNotEmpty(wtAmNames)) {
-            status = "-1";
+            status.set("-1");
             for (String wtAmName : wtAmNames) {
-                info += wtAmName + " ";
+                info.set(info.get() + wtAmName + " ");
             }
         }
     }

+ 4 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0036.java

@@ -20,7 +20,7 @@ public class BEH0036 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         List<Operation> operations = inputInfo.getBeHospitalizedDoc().getPastLabel().getOperations();
         if (ListUtil.isEmpty(operations)) {
             return;
@@ -33,11 +33,11 @@ public class BEH0036 extends QCCatalogue {
                     && (operation.getPd() == null || StringUtil.isBlank(operation.getPd().getName()))
                     && (operation.getOperationResult() == null || StringUtil.isBlank(operation.getOperationResult().getName()))
                     && (operation.getDiag() == null || StringUtil.isBlank(operation.getDiag().getName()))) {
-                info += operation.getName() + " ";
+                info.set(info.get() + operation.getName() + " ");
             }
         }
-        if (StringUtil.isNotBlank(info)) {
-            status = "-1";
+        if (StringUtil.isNotBlank(info.get())) {
+            status.set("-1");
         }
     }
 

+ 4 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0037.java

@@ -20,7 +20,7 @@ public class BEH0037 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         List<Wound> wounds = inputInfo.getBeHospitalizedDoc().getPastLabel().getWounds();
         if (ListUtil.isEmpty(wounds)) {
             return;
@@ -35,11 +35,11 @@ public class BEH0037 extends QCCatalogue {
                     && (wound.getDegree() == null || StringUtil.isBlank(wound.getDegree().getName()))
                     && (wound.getTreat() == null || StringUtil.isBlank(wound.getTreat().getName()))
                     && (wound.getOperation() == null || StringUtil.isBlank(wound.getOperation().getName()))) {
-                info += wound.getName() + " ";
+                info.set(info.get() + wound.getName() + " ");
             }
         }
-        if (StringUtil.isNotBlank(info)) {
-            status = "-1";
+        if (StringUtil.isNotBlank(info.get())) {
+            status.set("-1");
         }
     }
 

+ 4 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0038.java

@@ -20,7 +20,7 @@ public class BEH0038 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         List<BloodTransfusion> bloodTransfusions = inputInfo.getBeHospitalizedDoc().getPastLabel().getBloodTransfusions();
         if (ListUtil.isEmpty(bloodTransfusions)) {
             return;
@@ -32,11 +32,11 @@ public class BEH0038 extends QCCatalogue {
             if ((bloodTransfusion.getNegative() == null || StringUtil.isBlank(bloodTransfusion.getNegative().getName()))
                     && (bloodTransfusion.getPd() == null || StringUtil.isBlank(bloodTransfusion.getPd().getName()))
                     && (bloodTransfusion.getQuantity() == null || StringUtil.isBlank(bloodTransfusion.getQuantity().getName()))) {
-                info += bloodTransfusion.getName() + " ";
+                info.set(info.get() + bloodTransfusion.getName() + " ");
             }
         }
-        if (StringUtil.isNotBlank(info)) {
-            status = "-1";
+        if (StringUtil.isNotBlank(info.get())) {
+            status.set("-1");
         }
     }
 

+ 4 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0039.java

@@ -20,7 +20,7 @@ public class BEH0039 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         List<Allergy> allergies = inputInfo.getBeHospitalizedDoc().getPastLabel().getAllergies();
         if (ListUtil.isEmpty(allergies)) {
             return;
@@ -36,11 +36,11 @@ public class BEH0039 extends QCCatalogue {
                     && (allergy.getAllergyFood().getPd() == null || StringUtil.isBlank(allergy.getAllergyFood().getPd().getName()))
                     && (allergy.getAllergyFood().getDegree() == null || StringUtil.isBlank(allergy.getAllergyFood().getDegree().getName()))
                     && (allergy.getAllergyFood().getAllergyDesc() == null || StringUtil.isBlank(allergy.getAllergyFood().getAllergyDesc().getName()))) {
-                info += allergy.getAllergyFood().getName() + " ";
+                info.set(info.get() + allergy.getAllergyFood().getName() + " ");
             }
         }
-        if (StringUtil.isNotBlank(info)) {
-            status = "-1";
+        if (StringUtil.isNotBlank(info.get())) {
+            status.set("-1");
         }
     }
 

+ 4 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0040.java

@@ -20,7 +20,7 @@ public class BEH0040 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         List<Allergy> allergies = inputInfo.getBeHospitalizedDoc().getPastLabel().getAllergies();
         if (ListUtil.isEmpty(allergies)) {
             return;
@@ -36,11 +36,11 @@ public class BEH0040 extends QCCatalogue {
                     && (allergy.getAllergyMedicine().getPd() == null || StringUtil.isBlank(allergy.getAllergyMedicine().getPd().getName()))
                     && (allergy.getAllergyMedicine().getDegree() == null || StringUtil.isBlank(allergy.getAllergyMedicine().getDegree().getName()))
                     && (allergy.getAllergyMedicine().getAllergyDesc() == null || StringUtil.isBlank(allergy.getAllergyMedicine().getAllergyDesc().getName()))) {
-                info += allergy.getAllergyMedicine().getName() + " ";
+                info.set(info.get() + allergy.getAllergyMedicine().getName() + " ");
             }
         }
-        if (StringUtil.isNotBlank(info)) {
-            status = "-1";
+        if (StringUtil.isNotBlank(info.get())) {
+            status.set("-1");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0041.java

@@ -17,7 +17,7 @@ public class BEH0041 extends QCCatalogue {
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (StringUtil.isNotBlank(inputInfo.getBeHospitalizedDoc().getPersonalLabel().getText())) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0042.java

@@ -40,7 +40,7 @@ public class BEH0042 extends QCCatalogue {
                 return flag;
             }).count();
             if (count > 0) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0043.java

@@ -40,7 +40,7 @@ public class BEH0043 extends QCCatalogue {
                 return flag;
             }).count();
             if (count > 0) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0044.java

@@ -19,7 +19,7 @@ public class BEH0044 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         EpidemicArea epidemicArea = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getEpidemicArea();
         if (epidemicArea != null && StringUtil.isNotBlank(epidemicArea.getName())) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0045.java

@@ -19,7 +19,7 @@ public class BEH0045 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         MaritalHistory maritalHistory = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getMaritalHistory();
         if (maritalHistory != null && StringUtil.isNotBlank(maritalHistory.getName())) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0046.java

@@ -19,7 +19,7 @@ public class BEH0046 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         Smoking smoking = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getSmoking();
         if (smoking != null && StringUtil.isNotBlank(smoking.getName())) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0047.java

@@ -19,7 +19,7 @@ public class BEH0047 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         Drinking drinking = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getDrinking();
         if (drinking != null && StringUtil.isNotBlank(drinking.getName())) {
-            status = "0";
+            status.set("0");
         }
     }
 }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0048.java

@@ -19,7 +19,7 @@ public class BEH0048 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         Contact contact = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getContact();
         if (contact != null && StringUtil.isNotBlank(contact.getName())) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0049.java

@@ -21,7 +21,7 @@ public class BEH0049 extends QCCatalogue {
         if (specialHobby == null
                 || StringUtil.isBlank(specialHobby.getName())
                 || (specialHobby.getNegative() != null && StringUtil.isNotBlank(specialHobby.getNegative().getName()))) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0050.java

@@ -23,7 +23,7 @@ public class BEH0050 extends QCCatalogue {
                 || (smoking.getNegative() != null && StringUtil.isNotBlank(smoking.getNegative().getName()))
                 || (smoking.getPd() != null && StringUtil.isNotBlank(smoking.getPd().getName()))
                 || (smoking.getUsage() != null && StringUtil.isNotBlank(smoking.getUsage().getName()))) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0051.java

@@ -23,7 +23,7 @@ public class BEH0051 extends QCCatalogue {
                 || (drinking.getNegative() != null && StringUtil.isNotBlank(drinking.getNegative().getName()))
                 || (drinking.getPd() != null && StringUtil.isNotBlank(drinking.getPd().getName()))
                 || (drinking.getUsage() != null && StringUtil.isNotBlank(drinking.getUsage().getName()))) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0052.java

@@ -17,7 +17,7 @@ public class BEH0052 extends QCCatalogue {
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (StringUtil.isNotBlank(inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText())) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0053.java

@@ -19,7 +19,7 @@ public class BEH0053 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         Marryiage marryiage = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getMarryiage();
         if (marryiage != null && StringUtil.isNotBlank(marryiage.getName())) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0054.java

@@ -19,7 +19,7 @@ public class BEH0054 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         Consanguineous consanguineous = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getConsanguineous();
         if (consanguineous != null && StringUtil.isNotBlank(consanguineous.getName())) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0056.java

@@ -19,7 +19,7 @@ public class BEH0056 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         ConjugalRelation conjugalRelation = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getConjugalRelation();
         if (conjugalRelation != null && StringUtil.isNotBlank(conjugalRelation.getName())) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0058.java

@@ -43,7 +43,7 @@ public class BEH0058 extends QCCatalogue {
                 )
                 .count();
         if (count > 0) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0059.java

@@ -20,11 +20,11 @@ public class BEH0059 extends QCCatalogue {
             if (inputInfo.getBeHospitalizedDoc().getStructureMap() == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
-                status = "0"; //如果性别是男,就不报错
+                status.set("0"); //如果性别是男,就不报错
             } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null
                     && !CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getMenstrualLabel().getText()
                     .replace("月经史:null", ""))) {
-                status = "0"; //如果性别是女,不为空就不报错
+                status.set("0"); //如果性别是女,不为空就不报错
             }
         }
     }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0060.java

@@ -25,13 +25,13 @@ public class BEH0060 extends QCCatalogue {
             if (inputInfo.getBeHospitalizedDoc().getStructureMap() == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
-                status = "0"; //如果性别是男,就不报错
+                status.set("0"); //如果性别是男,就不报错
             } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 List<Menses> mensesList = menstrualLabel.getMensesList();
                 for (Menses menses : mensesList) {
                     if (menses.getMenarcheAge() != null && StringUtil.isNotBlank(menses.getMenarcheAge().getName())) {
-                        status = "0";
+                        status.set("0");
                         return;
                     }
                 }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0061.java

@@ -24,13 +24,13 @@ public class BEH0061 extends QCCatalogue {
             if (inputInfo.getBeHospitalizedDoc().getStructureMap() == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
-                status = "0"; //如果性别是男,就不报错
+                status.set("0"); //如果性别是男,就不报错
             } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 List<Menses> mensesList = menstrualLabel.getMensesList();
                 for (Menses menses : mensesList) {
                     if (menses.getMenstrualCycle() != null && StringUtil.isNotBlank(menses.getMenstrualCycle().getName())) {
-                        status = "0";
+                        status.set("0");
                         return;
                     }
                 }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0062.java

@@ -24,13 +24,13 @@ public class BEH0062 extends QCCatalogue {
             if (inputInfo.getBeHospitalizedDoc().getStructureMap() == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
-                status = "0"; //如果性别是男,就不报错
+                status.set("0"); //如果性别是男,就不报错
             } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 List<Menses> mensesList = menstrualLabel.getMensesList();
                 for (Menses menses : mensesList) {
                     if (menses.getMensesDuration() != null && StringUtil.isNotBlank(menses.getMensesDuration().getName())) {
-                        status = "0";
+                        status.set("0");
                         return;
                     }
                 }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0063.java

@@ -24,7 +24,7 @@ public class BEH0063 extends QCCatalogue {
             if (inputInfo.getBeHospitalizedDoc().getStructureMap() == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
-                status = "0"; //如果性别是男,就不报错
+                status.set("0"); //如果性别是男,就不报错
             } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 List<Menses> mensesList = menstrualLabel.getMensesList();
@@ -40,7 +40,7 @@ public class BEH0063 extends QCCatalogue {
                         isFindMenopauseAge = true;
                     }
                     if (isFindLastMenstrual && isFindMenopauseTime && isFindMenopauseAge) {
-                        status = "0";
+                        status.set("0");
                         return;
                     }
                 }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0064.java

@@ -25,7 +25,7 @@ public class BEH0064 extends QCCatalogue {
             if (inputInfo.getBeHospitalizedDoc().getStructureMap() == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
-                status = "0"; //如果性别是男,就不报错
+                status.set("0"); //如果性别是男,就不报错
             } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 List<Menses> mensesList = menstrualLabel.getMensesList();
@@ -36,7 +36,7 @@ public class BEH0064 extends QCCatalogue {
                     List<Clinical> clinicals = menses.getClinicals();
                     for (Clinical clinical : clinicals) {
                         if (clinical.getName().contains("经量")) {
-                            status = "0";
+                            status.set("0");
                             return;
                         }
                     }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0065.java

@@ -24,7 +24,7 @@ public class BEH0065 extends QCCatalogue {
             if (inputInfo.getBeHospitalizedDoc().getStructureMap() == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
-                status = "0"; //如果性别是男,就不报错
+                status.set("0"); //如果性别是男,就不报错
             } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 List<Menses> mensesList = menstrualLabel.getMensesList();
@@ -35,7 +35,7 @@ public class BEH0065 extends QCCatalogue {
                     List<Clinical> clinicals = menses.getClinicals();
                     for (Clinical clinical : clinicals) {
                         if (clinical.getName().contains("颜色")) {
-                            status = "0";
+                            status.set("0");
                             return;
                         }
                     }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0066.java

@@ -24,7 +24,7 @@ public class BEH0066 extends QCCatalogue {
             if (inputInfo.getBeHospitalizedDoc().getStructureMap() == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
-                status = "0"; //如果性别是男,就不报错
+                status.set("0"); //如果性别是男,就不报错
             } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 List<Menses> mensesList = menstrualLabel.getMensesList();
@@ -35,7 +35,7 @@ public class BEH0066 extends QCCatalogue {
                     List<Clinical> clinicals = menses.getClinicals();
                     for (Clinical clinical : clinicals) {
                         if (clinical.getName().contains("血块")) {
-                            status = "0";
+                            status.set("0");
                             return;
                         }
                     }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0067.java

@@ -24,7 +24,7 @@ public class BEH0067 extends QCCatalogue {
             if (inputInfo.getBeHospitalizedDoc().getStructureMap() == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
-                status = "0"; //如果性别是男,就不报错
+                status.set("0"); //如果性别是男,就不报错
             } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 List<Menses> mensesList = menstrualLabel.getMensesList();
@@ -35,7 +35,7 @@ public class BEH0067 extends QCCatalogue {
                     List<Clinical> clinicals = menses.getClinicals();
                     for (Clinical clinical : clinicals) {
                         if (clinical.getName().contains("痛经")) {
-                            status = "0";
+                            status.set("0");
                             return;
                         }
                     }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0068.java

@@ -26,11 +26,11 @@ public class BEH0068 extends QCCatalogue {
             if (inputInfo.getBeHospitalizedDoc().getStructureMap() == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
-                status = "0"; //如果性别是男,就不报错
+                status.set("0"); //如果性别是男,就不报错
             } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 if (menstrualLabel.getLeukorrheas().size() > 0) {
-                    status = "0";
+                    status.set("0");
                 }
             }
         }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0069.java

@@ -18,7 +18,7 @@ public class BEH0069 extends QCCatalogue {
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null) {
             if (!CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getFamilyLabel().getText())) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0070.java

@@ -35,7 +35,7 @@ public class BEH0070 extends QCCatalogue {
                     isFindDiagInfectious = true;
                 }
                 if (isFindGeneticDiseaseKeyword && isFindDiagInfectious) {
-                    status = "0";
+                    status.set("0");
                     return;
                 }
             }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0071.java

@@ -25,7 +25,7 @@ public class BEH0071 extends QCCatalogue {
             List<Family> families = familyLabel.getFamilies();
             for (Family family:families) {
                 if (family.getHealthCondition() != null && StringUtil.isNotBlank(family.getHealthCondition().getName())){
-                    status = "0";
+                    status.set("0");
                     return;
                 }
             }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0072.java

@@ -32,13 +32,13 @@ public class BEH0072 extends QCCatalogue {
                     Dead dead = family.getDead();
                     if ((dead.getDeadReason() != null && StringUtil.isNotBlank(dead.getDeadReason().getName())
                             || (dead.getUnknow() != null && StringUtil.isNotBlank(dead.getUnknow().getName())))) {
-                        status = "0";
+                        status.set("0");
                         return;
                     }
                 }
             }
             if (deadObjectNum == families.size()){
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0073.java

@@ -32,7 +32,7 @@ public class BEH0073 extends QCCatalogue {
                 for (Diag diag : family.getDiags()) {
                     if (diag.getName().contains("肝炎") || diag.getName().contains("结核")
                             || diag.getHospitalDiagName().contains("肝炎") || diag.getHospitalDiagName().contains("结核")) {
-                        status = "0";
+                        status.set("0");
                         return;
                     }
                 }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0074.java

@@ -30,7 +30,7 @@ public class BEH0074 extends QCCatalogue {
                 for (Diag diag : family.getDiags()) {
                     if (diag.getName().contains("癌") || diag.getName().contains("肿瘤")
                             || diag.getHospitalDiagName().contains("癌") || diag.getHospitalDiagName().contains("肿瘤")) {
-                        status = "0";
+                        status.set("0");
                         return;
                     }
                 }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0075.java

@@ -26,7 +26,7 @@ public class BEH0075 extends QCCatalogue {
             List<Family> families = familyLabel.getFamilies();
             for (Family family : families) {
                 if (family.getSimilarDiag() != null && StringUtil.isNotBlank(family.getSimilarDiag().getName())) {
-                    status = "0";
+                    status.set("0");
                     break;
                 }
             }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0076.java

@@ -18,7 +18,7 @@ public class BEH0076 extends QCCatalogue {
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getVitalLabel() != null) {
             if (!CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getVitalLabel().getText())) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0079.java

@@ -18,7 +18,7 @@ public class BEH0079 extends QCCatalogue {
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getVitalLabelSpecial() != null) {
             if (!CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getVitalLabelSpecial().getText())) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0081.java

@@ -18,7 +18,7 @@ public class BEH0081 extends QCCatalogue {
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getPacsLabel() != null) {
             if (!CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getPacsLabel().getText())) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0082.java

@@ -20,7 +20,7 @@ public class BEH0082 extends QCCatalogue {
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getPacsLabel() != null) {
             if (inputInfo.getBeHospitalizedDoc().getPacsLabel().getPacses() == null) {
-                status = "0";
+                status.set("0");
                 return;
             }
             int outerCourtyardObjNum = 0;
@@ -30,13 +30,13 @@ public class BEH0082 extends QCCatalogue {
                 } else {
                     OuterCourtyard outerCourtyard = pacs.getOuterCourtyard();
                     if (outerCourtyard.getPd().size() > 0 && StringUtil.isNotBlank(outerCourtyard.getPacsValue().getName())) {
-                        status = "0";
+                        status.set("0");
                         break;
                     }
                 }
             }
             if (outerCourtyardObjNum == inputInfo.getBeHospitalizedDoc().getPacsLabel().getPacses().size()) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0372.java

@@ -31,7 +31,7 @@ public class BEH0372 extends QCCatalogue {
         }
 
         if (chcekMaritalStatus(basicInfoStatus, maritalStatus)) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0375.java

@@ -42,7 +42,7 @@ public class BEH0375 extends QCCatalogue {
                 )
                 .count();
         if (count > 0) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0376.java

@@ -44,7 +44,7 @@ public class BEH0376 extends QCCatalogue {
                 )
                 .count();
         if (count > 0) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0377.java

@@ -22,7 +22,7 @@ public class BEH0377 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         List<Family> familyList = Lists.newArrayList();
         List<Family> familiesFl = inputInfo.getBeHospitalizedDoc().getFamilyLabel().getFamilies();
         List<Family> familiesMl = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily();
@@ -45,7 +45,7 @@ public class BEH0377 extends QCCatalogue {
                 .collect(Collectors.toList());
 
         if (familyList.size() > 0) {
-            status = "-1";
+            status.set("-1");
             long count = familyList
                     .stream()
                     .filter(
@@ -53,7 +53,7 @@ public class BEH0377 extends QCCatalogue {
                     )
                     .count();
             if (count > 0) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0378.java

@@ -22,7 +22,7 @@ public class BEH0378 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         List<Family> familyList = Lists.newArrayList();
         List<Family> familiesFl = inputInfo.getBeHospitalizedDoc().getFamilyLabel().getFamilies();
         List<Family> familiesMl = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily();
@@ -45,7 +45,7 @@ public class BEH0378 extends QCCatalogue {
                 .collect(Collectors.toList());
 
         if (familyList.size() > 0) {
-            status = "-1";
+            status.set("-1");
             long count = familyList
                     .stream()
                     .filter(
@@ -53,7 +53,7 @@ public class BEH0378 extends QCCatalogue {
                     )
                     .count();
             if (count > 0) {
-                status = "0";
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0397.java

@@ -44,7 +44,7 @@ public class BEH0397 extends QCCatalogue {
                 )
                 .count();
         if (count > 0) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0398.java

@@ -44,7 +44,7 @@ public class BEH0398 extends QCCatalogue {
                 )
                 .count();
         if (count > 0) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0399.java

@@ -22,7 +22,7 @@ public class BEH0399 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         List<Family> familyList = Lists.newArrayList();
         List<Family> familiesFl = inputInfo.getBeHospitalizedDoc().getFamilyLabel().getFamilies();
         List<Family> familiesMl = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily();
@@ -51,7 +51,7 @@ public class BEH0399 extends QCCatalogue {
                     )
                     .count();
             if (count > 0) {
-                status = "-1";
+                status.set("-1");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0400.java

@@ -19,7 +19,7 @@ public class BEH0400 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
         if (pastLabel != null || StringUtil.isNotBlank(pastLabel.getText())) {
-            status = "0";
+            status.set("0");
         }
     }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0401.java

@@ -20,12 +20,12 @@ import java.util.Map;
 public class BEH0401 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
             String name = structureMap.get("姓名");
             if(CatalogueUtil.isEmpty(name)){
-                status = "-1";
+                status.set("-1");
             }
         }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0402.java

@@ -19,12 +19,12 @@ import java.util.Map;
 public class BEH0402 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
             String name = structureMap.get("姓别");
             if(CatalogueUtil.isEmpty(name)){
-                status = "-1";
+                status.set("-1");
             }
         }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0403.java

@@ -19,12 +19,12 @@ import java.util.Map;
 public class BEH0403 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
             String name = structureMap.get("年龄");
             if(CatalogueUtil.isEmpty(name)){
-                status = "-1";
+                status.set("-1");
             }
         }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0404.java

@@ -19,12 +19,12 @@ import java.util.Map;
 public class BEH0404 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
             String name = structureMap.get("民族");
             if(CatalogueUtil.isEmpty(name)){
-                status = "-1";
+                status.set("-1");
             }
         }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0405.java

@@ -19,12 +19,12 @@ import java.util.Map;
 public class BEH0405 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
             String name = structureMap.get("职业");
             if(CatalogueUtil.isEmpty(name)){
-                status = "-1";
+                status.set("-1");
             }
         }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0406.java

@@ -19,12 +19,12 @@ import java.util.Map;
 public class BEH0406 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
             String name = structureMap.get("出生地");
             if(CatalogueUtil.isEmpty(name)){
-                status = "-1";
+                status.set("-1");
             }
         }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0407.java

@@ -19,12 +19,12 @@ import java.util.Map;
 public class BEH0407 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
             String name = structureMap.get("婚姻");
             if(CatalogueUtil.isEmpty(name)){
-                status = "-1";
+                status.set("-1");
             }
         }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0408.java

@@ -19,12 +19,12 @@ import java.util.Map;
 public class BEH0408 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
             String name = structureMap.get("联系地址");
             if(CatalogueUtil.isEmpty(name)){
-                status = "-1";
+                status.set("-1");
             }
         }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0409.java

@@ -19,12 +19,12 @@ import java.util.Map;
 public class BEH0409 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
             String name = structureMap.get("病史陈述者");
             if(CatalogueUtil.isEmpty(name)){
-                status = "-1";
+                status.set("-1");
             }
         }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0410.java

@@ -19,12 +19,12 @@ import java.util.Map;
 public class BEH0410 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
             String name = structureMap.get("入院日期");
             if(CatalogueUtil.isEmpty(name)){
-                status = "-1";
+                status.set("-1");
             }
         }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0411.java

@@ -19,12 +19,12 @@ import java.util.Map;
 public class BEH0411 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
             String name = structureMap.get("记录日期");
             if(CatalogueUtil.isEmpty(name)){
-                status = "-1";
+                status.set("-1");
             }
         }
 

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0412.java

@@ -19,7 +19,7 @@ import java.util.Map;
 @Component
 public class BEH0412 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
         if(structureMap != null && firstStructMap != null){
@@ -27,7 +27,7 @@ public class BEH0412 extends QCCatalogue {
             String contactAddress_first = firstStructMap.get(Content.name);
             if(!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)){
                 if(!contactAddress_first.equals(contactAddress_bh)){
-                    status = "-1";
+                    status.set("-1");
                 }
             }
         }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0413.java

@@ -19,7 +19,7 @@ import java.util.Map;
 @Component
 public class BEH0413 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
+        status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
         if(structureMap != null && firstStructMap != null){
@@ -27,7 +27,7 @@ public class BEH0413 extends QCCatalogue {
             String contactAddress_first = firstStructMap.get(Content.gender);
             if(!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)){
                 if(!contactAddress_first.equals(contactAddress_bh)){
-                    status = "-1";
+                    status.set("-1");
                 }
             }
         }

+ 0 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0414.java


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff