Merge remote-tracking branch 'origin/dev-1.2' into dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0441.java

@@ -32,10 +32,12 @@ public class BEH0441 extends QCCatalogue {
             status.set("0");
             return;
         }
+        List<String> words = Lists.newArrayList("胃纳", "食纳", "食欲", "未纳", "纳眠", "饮食", "纳眠"
+                ,"禁食","未食","鼻饲","食","吃","饮");
+        /*
         String presentText = presentLabel.getText();
         if (StringUtil.isNotBlank(presentText)) {
-            List<String> words = Lists.newArrayList("胃纳", "食纳", "食欲", "未纳", "纳眠", "饮食", "纳眠"
-                    ,"禁食","未食","鼻饲","食","吃","饮");
+
             for (String word : words) {
                 if (presentText.contains(word)) {
                     status.set("0");
@@ -43,6 +45,7 @@ public class BEH0441 extends QCCatalogue {
                 }
             }
         }
+         */
         List<GeneralDesc> generals = presentLabel.getGenerals();
         List<General> gens = presentLabel.getGens();
 
@@ -53,19 +56,22 @@ public class BEH0441 extends QCCatalogue {
 
         if (ListUtil.isNotEmpty(generals)) {
             for (GeneralDesc general : generals) {
-                if (general.getName().contains("纳") || general.getName().contains("饮食")
-                        || general.getName().contains("进食") || general.getName().contains("食欲")) {
-                    status.set("0");
-                    break;
+                for (String word : words) {
+                    if (general.getName().contains(word)) {
+                        status.set("0");
+                        return;
+                    }
                 }
             }
         }
 
         if (ListUtil.isNotEmpty(gens)) {
             for (General general : gens) {
-                if (general.getName().contains("纳") || general.getName().contains("饮食") || general.getName().contains("进食")) {
-                    status.set("0");
-                    break;
+                for (String word : words) {
+                    if (general.getName().contains(word)) {
+                        status.set("0");
+                        return;
+                    }
                 }
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0444.java

@@ -32,6 +32,7 @@ public class BEH0444 extends QCCatalogue {
         PresentLabel presentLabel = beHospitalizedDoc.getPresentLabel();
         if (presentLabel != null) {
             List<String> words = Lists.newArrayList("神志", "神清", "神不清", "意识清", "意识不清", "昏迷","精神","意识");
+            /*
             String presentLabelText = presentLabel.getText();
             if (StringUtil.isNotBlank(presentLabelText)) {
                 for (String word : words) {
@@ -41,6 +42,8 @@ public class BEH0444 extends QCCatalogue {
                     }
                 }
             }
+
+             */
             List<GeneralDesc> generals = presentLabel.getGenerals();
             List<General> gens = presentLabel.getGens();
             if (ListUtil.isEmpty(generals) && ListUtil.isEmpty(gens)) {
@@ -49,18 +52,22 @@ public class BEH0444 extends QCCatalogue {
             }
             if (ListUtil.isNotEmpty(generals)) {
                 for (GeneralDesc general : generals) {
-                    if (general.getName().contains("精神") || general.getName().contains("神志")) {
-                        status.set("0");
-                        break;
+                    for (String word : words) {
+                        if (general.getName().contains(word)){
+                            status.set("0");
+                            return;
+                        }
                     }
                 }
             }
 
             if (ListUtil.isNotEmpty(gens)) {
                 for (General general : gens) {
-                    if (general.getName().contains("精神") || general.getName().contains("神志")) {
-                        status.set("0");
-                        break;
+                    for (String word : words) {
+                        if (general.getName().contains(word)){
+                            status.set("0");
+                            return;
+                        }
                     }
                 }
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0299.java

@@ -28,7 +28,7 @@ public class CLI0299 extends QCCatalogue {
             st:
             for (DoctorAdviceDoc doc:doctorAdviceDocs) {
                 Map<String, String> structureMap = doc.getStructureMap();
-                if(structureMap.get("医嘱项目名称").contains("输血") && structureMap.get("医嘱处方类型").contains("治疗")){
+                if(structureMap.get("医嘱项目名称").contains("输血")){
                     if(ListUtil.isEmpty(clinicalBloodDocs)){
                         status.set("-1");
                         break st;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0307.java

@@ -22,24 +22,27 @@ public class CLI0307 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
         List<ClinicalBloodDoc> clinicalBloodDocs = inputInfo.getClinicalBloodDocs();
-        if(ListUtil.isEmpty(clinicalBloodDocs)){
+        if (ListUtil.isEmpty(clinicalBloodDocs)) {
             status.set("0");
             return;
         }
-        if(clinicalBloodDocs != null && clinicalBloodDocs.size()>0){
-            for (ClinicalBloodDoc cliB:clinicalBloodDocs) {
+        if (clinicalBloodDocs != null && clinicalBloodDocs.size() > 0) {
+            int matchSum = 0;
+            for (ClinicalBloodDoc cliB : clinicalBloodDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
                 //台州
-                if(StringUtils.isNotEmpty(cliBStructureMap.get("输血计划"))){
-                    status.set("0");
-                    break;
+                if (StringUtils.isNotEmpty(cliBStructureMap.get("输血计划"))) {
+                    matchSum++;
+                    continue;
                 }
 
-                if(StringUtils.isNotEmpty(cliBStructureMap.get("输注种类、血型、数量"))){
-                    status.set("0");
-                    break;
+                if (StringUtils.isNotEmpty(cliBStructureMap.get("输注种类、血型、数量"))) {
+                    matchSum++;
                 }
             }
+            if (matchSum == clinicalBloodDocs.size()) {
+                status.set("0");
+            }
         }
 
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0308.java

@@ -35,16 +35,16 @@ public class CLI0308 extends QCCatalogue {
                     status.set("0");
                     break;
                 }
+
                 String infusion_process = cliBStructureMap.get("输注过程");
-                if (StringUtils.isEmpty(infusion_process)) {
-                    status.set("0");
-                    continue;
-                }
-                if (infusion_process.matches(regex) || infusion_process.contains("无") || infusion_process.contains("未见")) {
-                    status.set("0");
-                } else {
-                    status.set("-1");
+                if (StringUtils.isNotEmpty(infusion_process)) {
+                    if (infusion_process.matches(regex) || infusion_process.contains("无") || infusion_process.contains("未见")) {
+                        status.set("0");
+                    } else {
+                        status.set("-1");
+                    }
                 }
+
             }
         } else {
             status.set("0");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0569.java

@@ -52,7 +52,7 @@ public class CLI0569 extends QCCatalogue {
                 }
             }
             if (matchSum != clinicalBloodDocs.size()) {
-                status.set("0");
+                status.set("-1");
             }
         }
 

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouClinicalBloodDocTrans.java

@@ -44,6 +44,7 @@ public class TaiZhouClinicalBloodDocTrans extends ModelDocTrans {
             "开始时间=输注开始",
             "医生=记录医师",
             "结束时间=输注结束",
+            "病历日期=记录时间",
             "内容=输注后效果评价"
     );