Merge branch 'debug' of http://192.168.2.236:10080/louhr/qc into debug

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

@@ -3,6 +3,7 @@ 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.doc.BeHospitalizedDoc;
 import com.lantone.qc.pub.model.entity.General;
 import com.lantone.qc.pub.model.entity.GeneralDesc;
 import com.lantone.qc.pub.util.ListUtil;
@@ -20,6 +21,11 @@ import java.util.List;
 @Component
 public class BEH0445 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
+        if (beHospitalizedDoc == null) {
+            status.set("0");
+            return;
+        }
         List<GeneralDesc> generals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getGenerals();
         if (ListUtil.isNotEmpty(generals)) {
             for (GeneralDesc general : generals) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0173.java

@@ -36,6 +36,11 @@ public class FIRP0173 extends QCCatalogue {
             }
             //现病史所有诊断
             List<Diag> presentDiags = inputInfo.getBeHospitalizedDoc().getPresentLabel().getDiags();
+            for (Diag diag : presentDiags) {
+                if(diag.getHospitalDiagName().equals(outpatientEmergencyDiag)){
+                    status.set("0");
+                }
+            }
             List<Diag> presentPossibleDiag = presentDiags.stream().filter(diag -> diag.getPossible() != null).collect(Collectors.toList());
             if (presentPossibleDiag.size() > 0) {
                 if (presentPossibleDiag.get(0).getHospitalDiagName().equals(outpatientEmergencyDiag)) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0147.java

@@ -36,7 +36,7 @@ public class LEA0147 extends QCCatalogue {
             return;
         }
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
-        if (deathRecordDoc == null || deathRecordDoc.getText() == null) {
+        if (deathRecordDoc == null) {
             DiagLabel leaveDiagLabel = leaveHospitalDoc.getLeaveDiagLabel();
             if (leaveDiagLabel != null) {
                 List<Diag> diags = leaveDiagLabel.getDiags();

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0507.java

@@ -17,7 +17,7 @@ public class LEA0507 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
-        if (deathRecordDoc == null || deathRecordDoc.getText() == null) {
+        if (deathRecordDoc == null) {
             if (inputInfo.getLeaveHospitalDoc() == null) {
                 status.set("-1");
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0094.java

@@ -19,7 +19,9 @@ import java.util.Map;
 public class THR0094 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-
+        if (inputInfo.getThreeLevelWardDocs().size() == 0) {
+            return;
+        }
         String sign = inputInfo.getFirstCourseRecordDoc().getStructureMap().get("记录医师");
         sign = (null==sign)?"":sign.trim();
 

kernel/src/main/resources/application.yml

@@ -25,10 +25,10 @@ spring:
         max-idle: 8
 
 CRF:
-  url: http://192.168.2.234:3456/api/mr_info_ex/entity_predict
+  url: http://192.168.3.150:3456/api/mr_info_ex/entity_predict
 
 Similarity:
-  url: http://192.168.2.234:3456/api/mr_info_ex/similarity
+  url: http://192.168.3.150:3456/api/mr_info_ex/similarity
 
 
 logging:          # 日志

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

@@ -28,11 +28,12 @@ public class TaiZhouDutyShiftSystemDocTrans extends ModelDocTrans {
     }
 
     private DutyShiftSystemDoc getDutyShiftSystemDoc(String content) {
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         DutyShiftSystemDoc dutyShiftSystemDoc = new DutyShiftSystemDoc();
         dutyShiftSystemDoc.setStructureMap(structureMap);
-
+        dutyShiftSystemDoc.setPageData((Map)sourceMap);
         return dutyShiftSystemDoc;
     }
 

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

@@ -7,6 +7,8 @@ import com.lantone.qc.pub.model.vo.QueryVo;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.trans.DocTrans;
 
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -48,7 +50,7 @@ public class TaizhouDocTrans extends DocTrans {
                     break;
                 case "病危通知书":
                     TaiZhouCriticallyIllNoticeDocTrans criticallyIllNoticeDocTrans = new TaiZhouCriticallyIllNoticeDocTrans();
-                    inputInfo.setCriticallyIllNoticeDocs(criticallyIllNoticeDocTrans.extract(i)); 
+                    inputInfo.setCriticallyIllNoticeDocs(criticallyIllNoticeDocTrans.extract(i));
                     break;
                 case "死亡病例讨论记录":
                     TaiZhouDeathCaseDiscussDocTrans deathCaseDiscussDocTrans = new TaiZhouDeathCaseDiscussDocTrans();
@@ -76,7 +78,7 @@ public class TaizhouDocTrans extends DocTrans {
                     break;
                 case "病案首页":
                     TaiZhouFirstPageRecordDocTrans firstPageRecordDocTrans = new TaiZhouFirstPageRecordDocTrans();
-                    if(inputInfo.getFirstPageRecordDoc() == null){
+                    if (inputInfo.getFirstPageRecordDoc() == null) {
                         inputInfo.setFirstPageRecordDoc(firstPageRecordDocTrans.extract(i));
                     }
                     break;
@@ -141,7 +143,7 @@ public class TaizhouDocTrans extends DocTrans {
         if (inputInfo.getFirstCourseRecordDoc() != null) {
             inputInfo.getPageData().put("首次病程录", Lists.newArrayList(inputInfo.getFirstCourseRecordDoc().getPageData()));
         }
-        if (inputInfo.getLeaveHospitalDoc() != null) {
+        if (inputInfo.getDeathRecordDoc() == null && inputInfo.getLeaveHospitalDoc() != null) {
             inputInfo.getPageData().put("出院小结", Lists.newArrayList(inputInfo.getLeaveHospitalDoc().getPageData()));
         }
         //        if (inputInfo.getNursingSystemDoc() != null) {
@@ -163,9 +165,9 @@ public class TaizhouDocTrans extends DocTrans {
         if (ListUtil.isNotEmpty(inputInfo.getCriticallyIllNoticeDocs())) {
             inputInfo.getPageData().put("病危通知书", inputInfo.getCriticallyIllNoticeDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
         }
-                if (ListUtil.isNotEmpty(inputInfo.getDifficultCaseDiscussDocs())) {
-                    inputInfo.getPageData().put("疑难病例讨论记录", inputInfo.getDifficultCaseDiscussDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
-                }
+        if (ListUtil.isNotEmpty(inputInfo.getDifficultCaseDiscussDocs())) {
+            inputInfo.getPageData().put("疑难病例讨论记录", inputInfo.getDifficultCaseDiscussDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+        }
         //        if (ListUtil.isNotEmpty(inputInfo.getDoctorAdviceDocs())) {
         //            inputInfo.getPageData().put("医嘱信息", inputInfo.getDoctorAdviceDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
         //        }
@@ -182,79 +184,85 @@ public class TaizhouDocTrans extends DocTrans {
             inputInfo.getPageData().put("阶段小结", inputInfo.getStagesSummaryDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
         }
         if (ListUtil.isNotEmpty(inputInfo.getThreeLevelWardDocs())) {
-            inputInfo.getPageData().put("查房记录", inputInfo.getThreeLevelWardDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+            inputInfo.getPageData().put("查房记录", inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
         }
         if (ListUtil.isNotEmpty(inputInfo.getPathologyShipDocs())) {
             inputInfo.getPageData().put("病理检验送检单", inputInfo.getPathologyShipDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
         }
 
         if (ListUtil.isNotEmpty(inputInfo.getConsultationDocs())) {
-            inputInfo.getPageData().put(
-                    "会诊记录",
-                    inputInfo.getConsultationDocs()
-                            .stream()
-                            .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationRecordDoc() != null)
-                            .map(consultationDoc -> consultationDoc.getConsultationRecordDoc().getPageData())
-                            .collect(Collectors.toList())
-            );
-            inputInfo.getPageData().put(
-                    "会诊申请单",
-                    inputInfo.getConsultationDocs()
-                            .stream()
-                            .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationApplicationDoc() != null)
-                            .map(consultationDoc -> consultationDoc.getConsultationApplicationDoc().getPageData())
-                            .collect(Collectors.toList())
-            );
-            inputInfo.getPageData().put(
-                    "会诊结果单",
-                    inputInfo.getConsultationDocs()
-                            .stream()
-                            .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationResultsDoc() != null)
-                            .map(consultationDoc -> consultationDoc.getConsultationResultsDoc().getPageData())
-                            .collect(Collectors.toList())
-            );
+            List<Map<String, Object>> crePageDataList = inputInfo.getConsultationDocs()
+                    .stream()
+                    .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationRecordDoc() != null)
+                    .map(consultationDoc -> consultationDoc.getConsultationRecordDoc().getPageData())
+                    .collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(crePageDataList)) {
+                inputInfo.getPageData().put("会诊记录", crePageDataList);
+            }
+
+            List<Map<String, Object>> caPageDataList = inputInfo.getConsultationDocs()
+                    .stream()
+                    .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationApplicationDoc() != null)
+                    .map(consultationDoc -> consultationDoc.getConsultationApplicationDoc().getPageData())
+                    .collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(caPageDataList)) {
+                inputInfo.getPageData().put("会诊申请单", caPageDataList);
+            }
+
+            List<Map<String, Object>> crsPageDataList = inputInfo.getConsultationDocs()
+                    .stream()
+                    .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationResultsDoc() != null)
+                    .map(consultationDoc -> consultationDoc.getConsultationResultsDoc().getPageData())
+                    .collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(crsPageDataList)) {
+                inputInfo.getPageData().put("会诊结果单", crsPageDataList);
+            }
         }
         if (ListUtil.isNotEmpty(inputInfo.getOperationDocs())) {
-            inputInfo.getPageData().put(
-                    "术后首次病程及谈话记录",
-                    inputInfo.getOperationDocs()
-                            .stream()
-                            .filter(operationDoc -> operationDoc != null && operationDoc.getOperationDiscussionDoc() != null)
-                            .map(operationDoc -> operationDoc.getOperationDiscussionDoc().getPageData())
-                            .collect(Collectors.toList())
-            );
-            inputInfo.getPageData().put(
-                    "手术记录",
-                    inputInfo.getOperationDocs()
-                            .stream()
-                            .filter(operationDoc -> operationDoc != null && operationDoc.getOperationRecordDoc() != null)
-                            .map(operationDoc -> operationDoc.getOperationRecordDoc().getPageData())
-                            .collect(Collectors.toList())
-            );
-            inputInfo.getPageData().put(
-                    "术前讨论、术前小结",
-                    inputInfo.getOperationDocs()
-                            .stream()
-                            .filter(operationDoc -> operationDoc != null && operationDoc.getPreoperativeDiscussionDoc() != null)
-                            .map(operationDoc -> operationDoc.getPreoperativeDiscussionDoc().getPageData())
-                            .collect(Collectors.toList())
-            );
-            inputInfo.getPageData().put(
-                    "手术知情同意书",
-                    inputInfo.getOperationDocs()
-                            .stream()
-                            .filter(operationDoc -> operationDoc != null && operationDoc.getOperationInformedConsentDoc() != null)
-                            .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())
-            );
+            List<Map<String, Object>> odPageDataList = inputInfo.getOperationDocs()
+                    .stream()
+                    .filter(operationDoc -> operationDoc != null && operationDoc.getOperationDiscussionDoc() != null)
+                    .map(operationDoc -> operationDoc.getOperationDiscussionDoc().getPageData())
+                    .collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(odPageDataList)) {
+                inputInfo.getPageData().put("术后首次病程及谈话记录", odPageDataList);
+            }
+
+            List<Map<String, Object>> orPageDataList = inputInfo.getOperationDocs()
+                    .stream()
+                    .filter(operationDoc -> operationDoc != null && operationDoc.getOperationRecordDoc() != null)
+                    .map(operationDoc -> operationDoc.getOperationRecordDoc().getPageData())
+                    .collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(orPageDataList)) {
+                inputInfo.getPageData().put("手术记录", orPageDataList);
+            }
+
+            List<Map<String, Object>> pdPageDataList = inputInfo.getOperationDocs()
+                    .stream()
+                    .filter(operationDoc -> operationDoc != null && operationDoc.getPreoperativeDiscussionDoc() != null)
+                    .map(operationDoc -> operationDoc.getPreoperativeDiscussionDoc().getPageData())
+                    .collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(pdPageDataList)) {
+                inputInfo.getPageData().put("术前讨论、术前小结", pdPageDataList);
+            }
+
+            List<Map<String, Object>> oicPageDataList = inputInfo.getOperationDocs()
+                    .stream()
+                    .filter(operationDoc -> operationDoc != null && operationDoc.getOperationInformedConsentDoc() != null)
+                    .map(operationDoc -> operationDoc.getOperationInformedConsentDoc().getPageData())
+                    .collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(oicPageDataList)) {
+                inputInfo.getPageData().put("手术知情同意书", oicPageDataList);
+            }
+
+            List<Map<String, Object>> oscPageDataList = inputInfo.getOperationDocs()
+                    .stream()
+                    .filter(operationDoc -> operationDoc != null && operationDoc.getOperationSafetyChecklistDoc() != null)
+                    .map(operationDoc -> operationDoc.getOperationSafetyChecklistDoc().getPageData())
+                    .collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(oscPageDataList)) {
+                inputInfo.getPageData().put("手术安全核查表", oscPageDataList);
+            }
         }
     }
 }