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

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

@@ -65,11 +65,11 @@ public class BEH0002 extends QCCatalogue {
             String firstHDiag = diags.get(0).getHospitalDiagName();
             String mainDiag = StringUtil.isBlank(firstHDiag) ? firstDiag : firstHDiag;
             List<String> symptoms = null;
-            Map<String, String> hostpital_standDiag = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_MAP);
-            if (!hostpital_standDiag.containsKey(mainDiag)) {
-                status.set("0");
-                return;
-            }
+//            Map<String, String> hostpital_standDiag = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_MAP);
+//            if (!hostpital_standDiag.containsKey(mainDiag)) {
+//                status.set("0");
+//                return;
+//            }
             Map<String, Map<String, Object>> diagMap = redisUtil.getJsonStringValue(KernelConstants.CONCEPT_DIAG_PROPERTY_MAP);
             Map<String, Object> map = (Map<String, Object>) diagMap.get(mainDiag);
             if (map != null && map.size() > 0) {

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

@@ -25,8 +25,8 @@ public class BEH0440 extends QCCatalogue {
         }
         Map<String, String> bhMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(bhMap != null){
-            if(bhMap.containsKey("户口地址")){
-                if(!CatalogueUtil.isEmpty(bhMap.get("户口地址"))){
+            if(bhMap.containsKey("联系地址")){
+                if(!CatalogueUtil.isEmpty(bhMap.get("联系地址"))){
                     status.set("0");
                 }
             }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxDocTrans.java

@@ -245,14 +245,14 @@ public class ChangxDocTrans extends DocTrans {
             //                            .map(operationDoc -> operationDoc.getOperationInformedConsentDoc().getPageData())
             //                            .collect(Collectors.toList())
             //            );
-            inputInfo.getPageData().put(
-                    "手术安全核查表",
-                    inputInfo.getOperationDocs()
-                            .stream()
-                            .filter(operationDoc -> operationDoc != null && operationDoc.getOperationSafetyChecklistDoc() != null)
-                            .map(operationDoc -> operationDoc.getOperationSafetyChecklistDoc().getPageData())
-                            .collect(Collectors.toList())
-            );
+//            inputInfo.getPageData().put(
+//                    "手术安全核查表",
+//                    inputInfo.getOperationDocs()
+//                            .stream()
+//                            .filter(operationDoc -> operationDoc != null && operationDoc.getOperationSafetyChecklistDoc() != null)
+//                            .map(operationDoc -> operationDoc.getOperationSafetyChecklistDoc().getPageData())
+//                            .collect(Collectors.toList())
+//            );
         }
         if (inputInfo.getTransferRecordDocs() != null) {
             if (ListUtil.isNotEmpty(inputInfo.getTransferRecordDocs().getTransferIntoDocs())) {