长兴模板更新

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

@@ -21,7 +21,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));
             }
@@ -109,14 +109,14 @@ public class ChangxDocTrans extends DocTrans {
                 ChangxThreeLevelWardDocTrans threeLevelWardDocTrans = new ChangxThreeLevelWardDocTrans();
                 inputInfo.setThreeLevelWardDocs(threeLevelWardDocTrans.extract(i));
             }
-//            if (i.getTitle().equals("知情同意书")) {
-//                ChangxInformedConsentDocTrans informedConsentDocTrans = new ChangxInformedConsentDocTrans();
-//                inputInfo.setInformedConsentDoc(informedConsentDocTrans.extract(i));
-//            }
-//            if (i.getTitle().equals("谈话告知书")) {
-//                ChangxNoticeOfConversationDocTrans noticeOfConversationDocTrans = new ChangxNoticeOfConversationDocTrans();
-//                inputInfo.setNoticeOfConversationDoc(noticeOfConversationDocTrans.extract(i));
-//            }
+            //            if (i.getTitle().equals("知情同意书")) {
+            //                ChangxInformedConsentDocTrans informedConsentDocTrans = new ChangxInformedConsentDocTrans();
+            //                inputInfo.setInformedConsentDoc(informedConsentDocTrans.extract(i));
+            //            }
+            //            if (i.getTitle().equals("谈话告知书")) {
+            //                ChangxNoticeOfConversationDocTrans noticeOfConversationDocTrans = new ChangxNoticeOfConversationDocTrans();
+            //                inputInfo.setNoticeOfConversationDoc(noticeOfConversationDocTrans.extract(i));
+            //            }
         }
         pageDataHandle(inputInfo);
         return inputInfo;
@@ -173,7 +173,7 @@ public class ChangxDocTrans 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.getConsultationDocs())) {
@@ -227,14 +227,14 @@ public class ChangxDocTrans extends DocTrans {
                             .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.getOperationInformedConsentDoc() != null)
+            //                            .map(operationDoc -> operationDoc.getOperationInformedConsentDoc().getPageData())
+            //                            .collect(Collectors.toList())
+            //            );
             inputInfo.getPageData().put(
                     "手术安全核查表",
                     inputInfo.getOperationDocs()
@@ -244,6 +244,28 @@ public class ChangxDocTrans extends DocTrans {
                             .collect(Collectors.toList())
             );
         }
+        if (inputInfo.getTransferRecordDocs() != null) {
+            if (ListUtil.isNotEmpty(inputInfo.getTransferRecordDocs().getTransferIntoDocs())) {
+                inputInfo.getPageData().put(
+                        "转入记录",
+                        inputInfo.getTransferRecordDocs().getTransferIntoDocs()
+                                .stream()
+                                .filter(i -> i != null)
+                                .map(i -> i.getPageData())
+                                .collect(Collectors.toList())
+                );
+            }
+            if (ListUtil.isNotEmpty(inputInfo.getTransferRecordDocs().getTransferOutDocs())) {
+                inputInfo.getPageData().put(
+                        "转出记录",
+                        inputInfo.getTransferRecordDocs().getTransferOutDocs()
+                                .stream()
+                                .filter(i -> i != null)
+                                .map(i -> i.getPageData())
+                                .collect(Collectors.toList())
+                );
+            }
+        }
     }
 
 }

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

@@ -8,6 +8,7 @@ import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.changx.util.CxXmlUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
+import com.lantone.qc.trans.comsis.ModuleMappingUtil;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.comsis.Preproc;
 
@@ -34,6 +35,7 @@ public class ChangxFirstCourseRecordDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(cutWordMap, keyContrasts);
         FirstCourseRecordDoc firstCourseRecordDoc = ModelDocGenerate.firstCourseRecordDocGen(structureMap);
         firstCourseRecordDoc.setText(text);
+        xmlNodeValueMap.put("mode_id", ModuleMappingUtil.getXmlDataTypeModuleId(xmlNodeValueMap));
         firstCourseRecordDoc.setPageData((Map) xmlNodeValueMap);
         return firstCourseRecordDoc;
     }
@@ -72,32 +74,7 @@ public class ChangxFirstCourseRecordDocTrans extends ModelDocTrans {
 
     private List<String> keyContrasts = Lists.newArrayList(
             "记录日期=记录时间",
-            "姓名++++患者姓名=",
-            "性别=",
-            "年龄=",
-            "职业=",
-            "主诉=",
-            "入院日期=",
-            "现病史=",
-            "既往史=",
-            "体格检查=",
-            "辅助检查++++检查=",
-            "初步诊断=",
-            "体温=",
-            "脉搏++++第一次脉搏=",
-            "呼吸++++第一次呼吸=",
-            "血压++++第一次血压=",
-            "专科检查=",
-            "辅助检查=",
-            "鉴别诊断=",
-            "需求评估=",
-            "预期目标=",
-            "诊疗计划=",
-            "治疗监测计划=",
-            "签名++++=记录医师",
-            "签名时间=",
-            "诊断依据=",
-            "病例特点="
+            "签名++++=记录医师"
     );
 
 }