Browse Source

三级查房ai修改bug

hujing 5 years ago
parent
commit
dac4106ab8
19 changed files with 189 additions and 162 deletions
  1. 11 8
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0256.java
  2. 10 10
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0130.java
  3. 10 9
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0131.java
  4. 13 12
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0132.java
  5. 10 9
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0133.java
  6. 10 9
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0134.java
  7. 10 9
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0135.java
  8. 14 13
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0136.java
  9. 13 12
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0137.java
  10. 10 9
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0138.java
  11. 10 9
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0139.java
  12. 12 10
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0428.java
  13. 12 10
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0429.java
  14. 12 10
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0430.java
  15. 9 7
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0431.java
  16. 9 7
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0432.java
  17. 9 7
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0433.java
  18. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/structure/ai/ThreeLevelWardAI.java
  19. 4 1
      public/src/main/java/com/lantone/qc/pub/model/doc/ThreeLevelWardDoc.java

+ 11 - 8
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0256.java

@@ -45,15 +45,18 @@ public class FIRP0256 extends QCCatalogue {
             List<OutcomeCure> outcomeCures = new ArrayList<>();//转归情况-治愈
             List<OutcomeCure> outcomeCures = new ArrayList<>();//转归情况-治愈
             List<PositiveFinding> positiveFindings = new ArrayList<>();//阳性表现
             List<PositiveFinding> positiveFindings = new ArrayList<>();//阳性表现
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                if (threeLevelWardDoc.getThreeLevelWardLabel() == null
-                        || !threeLevelWardDoc.getThreeLevelWardLabel().getTitle().contains("最后一次")) {
-                    continue;
+                if (threeLevelWardDoc.getThreeLevelWardLabel() == null) {
+                    List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                    for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                        if (!threeLevelWardLabel.getTitle().contains("最后一次")) {
+                            continue;
+                        }
+                        betterFindings = threeLevelWardLabel.getBetterFindings();
+                        outcomeToBetters = threeLevelWardLabel.getOutcomeToBetters();
+                        outcomeCures = threeLevelWardLabel.getOutcomeCures();
+                        positiveFindings = threeLevelWardLabel.getPositiveFindings();
+                    }
                 }
                 }
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                betterFindings = threeLevelWardLabel.getBetterFindings();
-                outcomeToBetters = threeLevelWardLabel.getOutcomeToBetters();
-                outcomeCures = threeLevelWardLabel.getOutcomeCures();
-                positiveFindings = threeLevelWardLabel.getPositiveFindings();
             }
             }
 
 
             //出院小结转归情况
             //出院小结转归情况

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

@@ -24,16 +24,16 @@ public class THR0130 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null
-                        || StringUtil.isBlank(threeLevelWardLabel.getTitle())
-                        || !Content.indications.equals(threeLevelWardLabel.getTitle())) {
-                    continue;
-                }
-
-                if (threeLevelWardLabel.getClinicals().size() == 0 && threeLevelWardLabel.getSigns().size() == 0) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (StringUtil.isBlank(threeLevelWardLabel.getTitle())
+                            || !Content.indications.equals(threeLevelWardLabel.getTitle())) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getClinicals().size() == 0 && threeLevelWardLabel.getSigns().size() == 0) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 10 - 9
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0131.java

@@ -44,15 +44,16 @@ public class THR0131 extends QCCatalogue {
                 }
                 }
             }
             }
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null
-                        || StringUtil.isBlank(threeLevelWardLabel.getTitle())
-                        || !Content.indications.equals(threeLevelWardLabel.getTitle())) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(threeLevelWardLabel.getDiffDiagText())) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (StringUtil.isBlank(threeLevelWardLabel.getTitle())
+                            || !Content.indications.equals(threeLevelWardLabel.getTitle())) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(threeLevelWardLabel.getDiffDiagText())) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 13 - 12
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0132.java

@@ -24,18 +24,19 @@ public class THR0132 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null
-                        || StringUtil.isBlank(threeLevelWardLabel.getTitle())
-                        || !Content.indications.equals(threeLevelWardLabel.getTitle())) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getDiags().size() > 0
-                        && StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText())
-                        && (threeLevelWardLabel.getDiffDiag().size() > 0 || StringUtils.isNotEmpty(threeLevelWardLabel.getDiffDiagText()))
-                        && threeLevelWardLabel.getTreatmentPlans().size() > 0) {
-                    status.set("0");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (StringUtil.isBlank(threeLevelWardLabel.getTitle())
+                            || !Content.indications.equals(threeLevelWardLabel.getTitle())) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getDiags().size() > 0
+                            && StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText())
+                            && (threeLevelWardLabel.getDiffDiag().size() > 0 || StringUtils.isNotEmpty(threeLevelWardLabel.getDiffDiagText()))
+                            && threeLevelWardLabel.getTreatmentPlans().size() > 0) {
+                        status.set("0");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 10 - 9
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0133.java

@@ -24,15 +24,16 @@ public class THR0133 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null
-                        || StringUtil.isBlank(threeLevelWardLabel.getTitle())
-                        || !Content.indications.equals(threeLevelWardLabel.getTitle())) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getTreatmentPlans().size() == 0) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (StringUtil.isBlank(threeLevelWardLabel.getTitle())
+                            || !Content.indications.equals(threeLevelWardLabel.getTitle())) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getTreatmentPlans().size() == 0) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 10 - 9
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0134.java

@@ -24,15 +24,16 @@ public class THR0134 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null
-                        || StringUtil.isBlank(threeLevelWardLabel.getTitle())
-                        || !Content.indications.equals(threeLevelWardLabel.getTitle())) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getDiags().size() == 0) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (StringUtil.isBlank(threeLevelWardLabel.getTitle())
+                            || !Content.indications.equals(threeLevelWardLabel.getTitle())) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getDiags().size() == 0) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 10 - 9
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0135.java

@@ -24,15 +24,16 @@ public class THR0135 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null
-                        || StringUtil.isBlank(threeLevelWardLabel.getTitle())
-                        || !Content.director.equals(threeLevelWardLabel.getTitle())) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getClinicals().size() == 0 && threeLevelWardLabel.getSigns().size() == 0) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (StringUtil.isBlank(threeLevelWardLabel.getTitle())
+                            || !Content.director.equals(threeLevelWardLabel.getTitle())) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getClinicals().size() == 0 && threeLevelWardLabel.getSigns().size() == 0) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 14 - 13
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0136.java

@@ -34,7 +34,7 @@ public class THR0136 extends QCCatalogue {
                 return;
                 return;
             }
             }
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
-            Map<String,Map<String, String>> doctorRecord = extractWardRecord(
+            Map<String, Map<String, String>> doctorRecord = extractWardRecord(
                     threeLevelWardDocs,
                     threeLevelWardDocs,
                     admisTime,
                     admisTime,
                     72 * 60);
                     72 * 60);
@@ -44,18 +44,19 @@ public class THR0136 extends QCCatalogue {
                 }
                 }
             }
             }
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null
-                        || StringUtil.isBlank(threeLevelWardLabel.getTitle())
-                        || !Content.director.equals(threeLevelWardLabel.getTitle())) {
-                    continue;
-                }
-                if (threeLevelWardDoc.getText().contains("鉴别诊断")) {
-                    return;
-                }
-                if (threeLevelWardLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(threeLevelWardLabel.getDiffDiagText())) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (StringUtil.isBlank(threeLevelWardLabel.getTitle())
+                            || !Content.director.equals(threeLevelWardLabel.getTitle())) {
+                        continue;
+                    }
+                    if (threeLevelWardDoc.getText().contains("鉴别诊断")) {
+                        return;
+                    }
+                    if (threeLevelWardLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(threeLevelWardLabel.getDiffDiagText())) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 13 - 12
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0137.java

@@ -24,18 +24,19 @@ public class THR0137 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null
-                        || StringUtil.isBlank(threeLevelWardLabel.getTitle())
-                        || !Content.director.equals(threeLevelWardLabel.getTitle())) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getDiags().size() > 0
-                        && StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText())
-                        && (threeLevelWardLabel.getDiffDiag().size() > 0 || StringUtils.isNotEmpty(threeLevelWardLabel.getDiffDiagText()))
-                        && threeLevelWardLabel.getTreatmentPlans().size() > 0) {
-                    status.set("0");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (StringUtil.isBlank(threeLevelWardLabel.getTitle())
+                            || !Content.director.equals(threeLevelWardLabel.getTitle())) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getDiags().size() > 0
+                            && StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText())
+                            && (threeLevelWardLabel.getDiffDiag().size() > 0 || StringUtils.isNotEmpty(threeLevelWardLabel.getDiffDiagText()))
+                            && threeLevelWardLabel.getTreatmentPlans().size() > 0) {
+                        status.set("0");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 10 - 9
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0138.java

@@ -24,15 +24,16 @@ public class THR0138 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null
-                        || StringUtil.isBlank(threeLevelWardLabel.getTitle())
-                        || !Content.director.equals(threeLevelWardLabel.getTitle())) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getTreatmentPlans().size() == 0) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (StringUtil.isBlank(threeLevelWardLabel.getTitle())
+                            || !Content.director.equals(threeLevelWardLabel.getTitle())) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getTreatmentPlans().size() == 0) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 10 - 9
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0139.java

@@ -24,15 +24,16 @@ public class THR0139 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null
-                        || StringUtil.isBlank(threeLevelWardLabel.getTitle())
-                        || !Content.director.equals(threeLevelWardLabel.getTitle())) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getDiags().size() == 0) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (StringUtil.isBlank(threeLevelWardLabel.getTitle())
+                            || !Content.director.equals(threeLevelWardLabel.getTitle())) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getDiags().size() == 0) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 12 - 10
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0428.java

@@ -27,16 +27,18 @@ public class THR0428 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null || threeLevelWardLabel.getSerious() != 1) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getDiags().size() == 0
-                        || StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText()) && threeLevelWardLabel.getDiagBasisText().length() < 30
-                        || threeLevelWardLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(threeLevelWardLabel.getDiffDiagText())
-                        || threeLevelWardLabel.getTreatmentPlans().size() == 0) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (threeLevelWardLabel.getSerious() != 1) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getDiags().size() == 0
+                            || StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText()) && threeLevelWardLabel.getDiagBasisText().length() < 30
+                            || threeLevelWardLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(threeLevelWardLabel.getDiffDiagText())
+                            || threeLevelWardLabel.getTreatmentPlans().size() == 0) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 12 - 10
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0429.java

@@ -27,16 +27,18 @@ public class THR0429 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null || threeLevelWardLabel.getSerious() != 2) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getDiags().size() == 0
-                        || StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText()) && threeLevelWardLabel.getDiagBasisText().length() < 30
-                        || threeLevelWardLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(threeLevelWardLabel.getDiffDiagText())
-                        || threeLevelWardLabel.getTreatmentPlans().size() == 0) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (threeLevelWardLabel.getSerious() != 2) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getDiags().size() == 0
+                            || StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText()) && threeLevelWardLabel.getDiagBasisText().length() < 30
+                            || threeLevelWardLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(threeLevelWardLabel.getDiffDiagText())
+                            || threeLevelWardLabel.getTreatmentPlans().size() == 0) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 12 - 10
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0430.java

@@ -27,16 +27,18 @@ public class THR0430 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null || threeLevelWardLabel.getSerious() != 3) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getDiags().size() == 0
-                        || StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText()) && threeLevelWardLabel.getDiagBasisText().length() < 30
-                        || threeLevelWardLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(threeLevelWardLabel.getDiffDiagText())
-                        || threeLevelWardLabel.getTreatmentPlans().size() == 0) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (threeLevelWardLabel.getSerious() != 3) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getDiags().size() == 0
+                            || StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText()) && threeLevelWardLabel.getDiagBasisText().length() < 30
+                            || threeLevelWardLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(threeLevelWardLabel.getDiffDiagText())
+                            || threeLevelWardLabel.getTreatmentPlans().size() == 0) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 9 - 7
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0431.java

@@ -26,13 +26,15 @@ public class THR0431 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null || threeLevelWardLabel.getSerious() != 1) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getTreatmentPlans().size() == 0) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (threeLevelWardLabel.getSerious() != 1) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getTreatmentPlans().size() == 0) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 9 - 7
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0432.java

@@ -26,13 +26,15 @@ public class THR0432 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null || threeLevelWardLabel.getSerious() != 2) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getTreatmentPlans().size() == 0) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (threeLevelWardLabel.getSerious() != 2) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getTreatmentPlans().size() == 0) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 9 - 7
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0433.java

@@ -26,13 +26,15 @@ public class THR0433 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-                ThreeLevelWardLabel threeLevelWardLabel = threeLevelWardDoc.getThreeLevelWardLabel();
-                if (threeLevelWardLabel == null || threeLevelWardLabel.getSerious() != 3) {
-                    continue;
-                }
-                if (threeLevelWardLabel.getTreatmentPlans().size() == 0) {
-                    status.set("-1");
-                    return;
+                List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
+                for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
+                    if (threeLevelWardLabel.getSerious() != 3) {
+                        continue;
+                    }
+                    if (threeLevelWardLabel.getTreatmentPlans().size() == 0) {
+                        status.set("-1");
+                        return;
+                    }
                 }
                 }
             }
             }
         }
         }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/structure/ai/ThreeLevelWardAI.java

@@ -142,7 +142,7 @@ public class ThreeLevelWardAI extends ModelAI {
         for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
         for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
             String text = threeLevelWardDoc.getText();
             String text = threeLevelWardDoc.getText();
             if (StringUtil.isNotBlank(text) && StringUtil.isNotBlank(originalText) && text.equals(originalText)) {
             if (StringUtil.isNotBlank(text) && StringUtil.isNotBlank(originalText) && text.equals(originalText)) {
-                threeLevelWardDoc.setThreeLevelWardLabel(threeLevelWardLabel);
+                threeLevelWardDoc.getThreeLevelWardLabel().add(threeLevelWardLabel);
                 break;
                 break;
             }
             }
         }
         }

+ 4 - 1
public/src/main/java/com/lantone/qc/pub/model/doc/ThreeLevelWardDoc.java

@@ -4,6 +4,9 @@ import com.lantone.qc.pub.model.label.ThreeLevelWardLabel;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
 /**
  * @ClassName : ThreeLevelWardDoc
  * @ClassName : ThreeLevelWardDoc
  * @Description : 查房记录文档
  * @Description : 查房记录文档
@@ -13,5 +16,5 @@ import lombok.Setter;
 @Getter
 @Getter
 @Setter
 @Setter
 public class ThreeLevelWardDoc extends ModelDoc {
 public class ThreeLevelWardDoc extends ModelDoc {
-    private ThreeLevelWardLabel threeLevelWardLabel;
+    private List<ThreeLevelWardLabel> threeLevelWardLabel = new ArrayList<>();
 }
 }