hujing пре 5 година
родитељ
комит
94abed16e6
18 измењених фајлова са 85 додато и 116 уклоњено
  1. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0059.java
  2. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0060.java
  3. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0061.java
  4. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0062.java
  5. 12 5
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0063.java
  6. 2 6
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0064.java
  7. 2 6
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0065.java
  8. 2 6
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0066.java
  9. 2 6
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0067.java
  10. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0068.java
  11. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0069.java
  12. 1 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0070.java
  13. 33 37
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0071.java
  14. 2 6
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0072.java
  15. 8 10
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0073.java
  16. 7 10
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0074.java
  17. 1 5
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0075.java
  18. 4 8
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0082.java

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

@@ -17,7 +17,7 @@ public class BEH0059 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
-            if (CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getMenstrualLabel().getText()
+            if (!CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getMenstrualLabel().getText()
                     .replace("月经史:null",""))) {
                 status = "0";
             }

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

@@ -25,9 +25,9 @@ public class BEH0060 extends QCCatalogue {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
             List<Menses> mensesList = menstrualLabel.getMensesList();
             for (Menses menses : mensesList) {
-                if (menses.getMenarcheAge() == null || StringUtil.isBlank(menses.getMenarcheAge().getName())) {
+                if (menses.getMenarcheAge() != null && StringUtil.isNotBlank(menses.getMenarcheAge().getName())) {
                     status = "0";
-                    break;
+                    return;
                 }
             }
         }

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

@@ -24,9 +24,9 @@ public class BEH0061 extends QCCatalogue {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
             List<Menses> mensesList = menstrualLabel.getMensesList();
             for (Menses menses : mensesList) {
-                if (menses.getMenstrualCycle() == null || StringUtil.isBlank(menses.getMenstrualCycle().getName())) {
+                if (menses.getMenstrualCycle() != null && StringUtil.isNotBlank(menses.getMenstrualCycle().getName())) {
                     status = "0";
-                    break;
+                    return;
                 }
             }
         }

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

@@ -24,9 +24,9 @@ public class BEH0062 extends QCCatalogue {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
             List<Menses> mensesList = menstrualLabel.getMensesList();
             for (Menses menses : mensesList) {
-                if (menses.getMensesDuration() == null || StringUtil.isBlank(menses.getMensesDuration().getName())) {
+                if (menses.getMensesDuration() != null && StringUtil.isNotBlank(menses.getMensesDuration().getName())) {
                     status = "0";
-                    break;
+                    return;
                 }
             }
         }

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

@@ -23,13 +23,20 @@ public class BEH0063 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
             List<Menses> mensesList = menstrualLabel.getMensesList();
+            boolean isFindLastMenstrual = false, isFindMenopauseTime = false, isFindMenopauseAge = false;
             for (Menses menses : mensesList) {
-                if (menses.getLastMenstrual() == null || StringUtil.isBlank(menses.getLastMenstrual().getName()) //末次月经时间
-                        || menses.getMenopauseTime() == null || StringUtil.isBlank(menses.getMenopauseTime().getName()) //闭经日期
-                        || menses.getMenopauseAge() == null || StringUtil.isBlank(menses.getMenopauseAge().getName()) //绝经年龄
-                ) {
+                if (menses.getLastMenstrual() != null && StringUtil.isNotBlank(menses.getLastMenstrual().getName())) { //末次月经时间
+                    isFindLastMenstrual = true;
+                }
+                if (menses.getMenopauseTime() != null && StringUtil.isNotBlank(menses.getMenopauseTime().getName())) { //闭经日期
+                    isFindMenopauseTime = true;
+                }
+                if (menses.getMenopauseAge() != null && StringUtil.isNotBlank(menses.getMenopauseAge().getName())) { //绝经年龄
+                    isFindMenopauseAge = true;
+                }
+                if (isFindLastMenstrual && isFindMenopauseTime && isFindMenopauseAge) {
                     status = "0";
-                    break;
+                    return;
                 }
             }
         }

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

@@ -24,7 +24,6 @@ public class BEH0064 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
             List<Menses> mensesList = menstrualLabel.getMensesList();
-            boolean mensesFlag = false;
             for (Menses menses : mensesList) {
                 if (menses.getClinicals() == null) {
                     continue;
@@ -32,14 +31,11 @@ public class BEH0064 extends QCCatalogue {
                 List<Clinical> clinicals = menses.getClinicals();
                 for (Clinical clinical : clinicals) {
                     if (clinical.getName().contains("经量")) {
-                        mensesFlag = true;
-                        break;
+                        status = "0";
+                        return;
                     }
                 }
             }
-            if (!mensesFlag) {
-                status = "0";
-            }
         }
     }
 }

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

@@ -23,7 +23,6 @@ public class BEH0065 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
             List<Menses> mensesList = menstrualLabel.getMensesList();
-            boolean mensesFlag = false;
             for (Menses menses : mensesList) {
                 if (menses.getClinicals() == null) {
                     continue;
@@ -31,14 +30,11 @@ public class BEH0065 extends QCCatalogue {
                 List<Clinical> clinicals = menses.getClinicals();
                 for (Clinical clinical : clinicals) {
                     if (clinical.getName().contains("颜色")) {
-                        mensesFlag = true;
-                        break;
+                        status = "0";
+                        return;
                     }
                 }
             }
-            if (!mensesFlag) {
-                status = "0";
-            }
         }
     }
 }

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

@@ -23,7 +23,6 @@ public class BEH0066 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
             List<Menses> mensesList = menstrualLabel.getMensesList();
-            boolean mensesFlag = false;
             for (Menses menses : mensesList) {
                 if (menses.getClinicals() == null) {
                     continue;
@@ -31,14 +30,11 @@ public class BEH0066 extends QCCatalogue {
                 List<Clinical> clinicals = menses.getClinicals();
                 for (Clinical clinical : clinicals) {
                     if (clinical.getName().contains("血块")) {
-                        mensesFlag = true;
-                        break;
+                        status = "0";
+                        return;
                     }
                 }
             }
-            if (!mensesFlag) {
-                status = "0";
-            }
         }
     }
 }

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

@@ -23,7 +23,6 @@ public class BEH0067 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
             List<Menses> mensesList = menstrualLabel.getMensesList();
-            boolean mensesFlag = false;
             for (Menses menses : mensesList) {
                 if (menses.getClinicals() == null) {
                     continue;
@@ -31,14 +30,11 @@ public class BEH0067 extends QCCatalogue {
                 List<Clinical> clinicals = menses.getClinicals();
                 for (Clinical clinical : clinicals) {
                     if (clinical.getName().contains("痛经")) {
-                        mensesFlag = true;
-                        break;
+                        status = "0";
+                        return;
                     }
                 }
             }
-            if (!mensesFlag) {
-                status = "0";
-            }
         }
     }
 }

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

@@ -23,7 +23,7 @@ public class BEH0068 extends QCCatalogue {
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
-            if (menstrualLabel.getLeukorrheas().size() == 0) {
+            if (menstrualLabel.getLeukorrheas().size() > 0) {
                 status = "0";
             }
         }

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

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

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

@@ -33,11 +33,10 @@ public class BEH0070 extends QCCatalogue {
                 }
                 if (family.getDiagInfectious() != null && StringUtil.isNotBlank(family.getDiagInfectious().getName())) {
                     isFindDiagInfectious = true;
-                    break;
                 }
                 if (isFindGeneticDiseaseKeyword && isFindDiagInfectious) {
                     status = "0";
-                    break;
+                    return;
                 }
             }
         }

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

@@ -1,38 +1,34 @@
-package com.lantone.qc.kernel.catalogue.behospitalized;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.model.entity.Family;
-import com.lantone.qc.pub.model.label.FamilyLabel;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @ClassName : BEH0071
- * @Description : 父母、兄弟、姐妹及子女的健康状况未描述
- * @Author : 胡敬
- * @Date: 2020-03-11 15:09
- */
-@Component
-public class BEH0071 extends QCCatalogue {
-    @Override
-    protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null) {
-            FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
-            List<Family> families = familyLabel.getFamilies();
-            boolean isFind = false;
-            for (Family family:families) {
-                if (family.getHealthCondition() != null && StringUtil.isNotBlank(family.getHealthCondition().getName())){
-                    isFind = true;
-                    break;
-                }
-            }
-            if (!isFind){
-                status = "0";
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.behospitalized;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.entity.Family;
+import com.lantone.qc.pub.model.label.FamilyLabel;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @ClassName : BEH0071
+ * @Description : 父母、兄弟、姐妹及子女的健康状况未描述
+ * @Author : 胡敬
+ * @Date: 2020-03-11 15:09
+ */
+@Component
+public class BEH0071 extends QCCatalogue {
+    @Override
+    protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null) {
+            FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
+            List<Family> families = familyLabel.getFamilies();
+            for (Family family:families) {
+                if (family.getHealthCondition() != null && StringUtil.isNotBlank(family.getHealthCondition().getName())){
+                    status = "0";
+                    return;
+                }
+            }
+        }
+    }
 }

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

@@ -24,7 +24,6 @@ public class BEH0072 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null) {
             FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
             List<Family> families = familyLabel.getFamilies();
-            boolean isFind = false;
             for (Family family : families) {
                 if (family.getDead() != null) {
                     Dead dead = family.getDead();
@@ -32,14 +31,11 @@ public class BEH0072 extends QCCatalogue {
                             //或者(死亡原因为空并且情况不详为空)
                             && (dead.getDeadReason() != null && StringUtil.isNotBlank(dead.getDeadReason().getName())
                      || (dead.getUnknow() != null && StringUtil.isNotBlank(dead.getUnknow().getName())))) {
-                        isFind = true;
-                        break;
+                        status = "0";
+                        return;
                     }
                 }
             }
-            if (!isFind){
-                status = "0";
-            }
         }
     }
 }

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

@@ -25,19 +25,17 @@ public class BEH0073 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null) {
             FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
             List<Family> families = familyLabel.getFamilies();
-            boolean findDiag = false;
             for (Family family : families) {
-                if (family.getDiags() != null && family.getDiags().size() > 0) {
-                    for (Diag diag : family.getDiags()) {
-                        if (diag.getName().contains("肝炎") || diag.getName().contains("结核")) {
-                            findDiag = true;
-                            break;
-                        }
+                if (family.getDiags() == null || family.getDiags().size() == 0) {
+                    continue;
+                }
+                for (Diag diag : family.getDiags()) {
+                    if (diag.getName().contains("肝炎") || diag.getName().contains("结核")) {
+                        status = "0";
+                        return;
                     }
                 }
-            }
-            if (!findDiag) {
-                status = "0";
+
             }
         }
     }

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

@@ -23,20 +23,17 @@ public class BEH0074 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null) {
             FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
             List<Family> families = familyLabel.getFamilies();
-            boolean findDiag = false;
             for (Family family : families) {
-                if (family.getDiags() != null && family.getDiags().size() > 0) {
-                    for (Diag diag : family.getDiags()) {
-                        if (diag.getName().contains("癌") || diag.getName().contains("肿瘤")) {
-                            findDiag = true;
-                            break;
-                        }
+                if (family.getDiags() == null || family.getDiags().size() == 0) {
+                    continue;
+                }
+                for (Diag diag : family.getDiags()) {
+                    if (diag.getName().contains("癌") || diag.getName().contains("肿瘤")) {
+                        status = "0";
+                        return;
                     }
                 }
             }
-            if (!findDiag) {
-                status = "0";
-            }
         }
     }
 }

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

@@ -24,16 +24,12 @@ public class BEH0075 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null) {
             FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
             List<Family> families = familyLabel.getFamilies();
-            boolean findSimilarDiag = false;
             for (Family family : families) {
                 if (family.getSimilarDiag() != null && StringUtil.isNotBlank(family.getSimilarDiag().getName())) {
-                    findSimilarDiag = true;
+                    status = "0";
                     break;
                 }
             }
-            if (!findSimilarDiag){
-                status = "0";
-            }
         }
     }
 }

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

@@ -19,19 +19,15 @@ public class BEH0082 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getPacsLabel() != null) {
-            boolean isFindOuterCourtyard = false;
-            for (Pacs pacs:inputInfo.getBeHospitalizedDoc().getPacsLabel().getPacses()) {
-                if (pacs.getOuterCourtyard() != null){
+            for (Pacs pacs : inputInfo.getBeHospitalizedDoc().getPacsLabel().getPacses()) {
+                if (pacs.getOuterCourtyard() != null) {
                     OuterCourtyard outerCourtyard = pacs.getOuterCourtyard();
-                    if (outerCourtyard.getPd().size() > 0 && StringUtil.isNotBlank(outerCourtyard.getPacsValue().getName())){
-                        isFindOuterCourtyard = true;
+                    if (outerCourtyard.getPd().size() > 0 && StringUtil.isNotBlank(outerCourtyard.getPacsValue().getName())) {
+                        status = "0";
                         break;
                     }
                 }
             }
-            if (!isFindOuterCourtyard){
-                status = "0";
-            }
         }
     }
 }