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

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

@@ -27,7 +27,10 @@ public class FIRP0200 extends QCCatalogue {
             }
             newbornWeightStr = newbornWeightStr.replace("-","");
             if (!CatalogueUtil.isEmpty(newbornWeightStr)) {
-                int newbornWeight = Integer.parseInt(newbornWeightStr);
+                double newbornWeight = Double.parseDouble(newbornWeightStr);
+                if (newbornWeight / 1000 >= 1){
+                    newbornWeight = newbornWeight / 1000;
+                }
                 if (newbornWeight <= 1 || newbornWeight >= 10) {
                     status.set("-1");
                 }

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

@@ -23,6 +23,15 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
     public BeHospitalizedDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
         Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
+        String sex = "男";
+        for (String key : sourceMap.keySet()) {
+            if (key.indexOf("性别") > -1) {
+                if (sourceMap.get(key).indexOf("男") > -1 || sourceMap.get(key).indexOf("女") > -1) {
+                    sex = StringUtil.removeBlank(sourceMap.get(key));
+                }
+            }
+        }
+        sourceMap.put(sex, "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         String specialCheck = structureMap.get("专科检查");
         if (StringUtil.isNotBlank(specialCheck)) {

trans/src/main/java/com/lantone/qc/trans/changx/ChangxDocTrans.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;
 
 /**
@@ -21,7 +23,7 @@ public class ChangxDocTrans extends DocTrans {
     protected InputInfo extract(QueryVo queryVo) {
         InputInfo inputInfo = new InputInfo();
         for (MedrecVo i : queryVo.getMedrec()) {
-            if (i.getTitle().equals("会诊单")) {
+            if (i.getTitle().equals("会诊")) {
                 ChangxConsultationDocTrans consultationDocTrans = new ChangxConsultationDocTrans();
                 inputInfo.setConsultationDocs(consultationDocTrans.extract(i));
             }
@@ -187,72 +189,81 @@ public class ChangxDocTrans extends DocTrans {
         }
 
         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>> crPd = inputInfo.getConsultationDocs()
+                    .stream()
+                    .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationRecordDoc() != null)
+                    .map(consultationDoc -> consultationDoc.getConsultationRecordDoc().getPageData())
+                    .collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(crPd)) {
+                inputInfo.getPageData().put("会诊记录", crPd);
+            }
+
+            List<Map<String, Object>> caPd = inputInfo.getConsultationDocs()
+                    .stream()
+                    .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationApplicationDoc() != null)
+                    .map(consultationDoc -> consultationDoc.getConsultationApplicationDoc().getPageData())
+                    .collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(caPd)) {
+                inputInfo.getPageData().put("会诊申请单", caPd);
+            }
+
+            List<Map<String, Object>> ctPd = inputInfo.getConsultationDocs()
+                    .stream()
+                    .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationResultsDoc() != null)
+                    .map(consultationDoc -> consultationDoc.getConsultationResultsDoc().getPageData())
+                    .collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(ctPd)) {
+                inputInfo.getPageData().put("会诊结果单", ctPd);
+            }
         }
         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())
+//                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "手术日期", "yyyy/MM/dd"))
+                    .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())
+//                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "开始时间", "yyyy/MM/dd HH:mm"))
+                    .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())
+//                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "讨论时间", "yyyy年MM月dd日 HH时mm分"))
+                    .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())
+                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "谈话日期", "yyyy/MM/dd HH:mm"))
+                    .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);
+            }*/
         }
         if (inputInfo.getTransferRecordDocs() != null) {
             if (ListUtil.isNotEmpty(inputInfo.getTransferRecordDocs().getTransferIntoDocs())) {

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

@@ -321,7 +321,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             "讨论时间++++记录日期=记录时间",
             "参加人员姓名=参加人员",
             "病情摘要++++简要病情=简要病情",
-            "术前诊断++++初步诊断=",
+            "术前诊断++++初步诊断=术前诊断",
             "手术指征与禁忌征++++手术指征=手术指征",
             "拟行治疗指征及禁忌症=",
             "拟施麻醉方式=麻醉方式",

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

@@ -62,7 +62,8 @@ public class ChangxRescueDocTrans extends ModelDocTrans {
             "抢救时间及措施++++抢救措施=",
             "参加抢救者的姓名及专业技术职称++++参加现场抢救的医师及护理人员=参与人员",
             "签名++++=记录医师",
-            "签名时间=抢救时间"
+            "签名时间=抢救时间",
+            "参与人员=参加人员及职称"
     );
 
 }