医嘱信息对接添加

public/src/main/java/com/lantone/qc/pub/model/keys/ModelStandardKeys.java

@@ -214,7 +214,7 @@ public class ModelStandardKeys {
             "主持人",
             "参加讨论者",
             "讨论内容",
-            "结 论"
+            "结论"
     );
 
     //医嘱信息的标准key

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

@@ -2,9 +2,7 @@ package com.lantone.qc.trans.changx;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.DoctorAdviceDoc;
-import com.lantone.qc.pub.model.keys.ModelStandardKeys;
 import com.lantone.qc.pub.model.vo.MedrecVo;
-import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.Preproc;
@@ -24,18 +22,55 @@ public class ChangxDoctorAdviceDocTrans extends ModelDocTrans {
         List<DoctorAdviceDoc> retList = Lists.newArrayList();
         List<String> contents = (List) medrecVo.getContent().get("content");
         contents.forEach(content -> {
-            Map<String, String> structureMap =
-                    Preproc.extract_doc_pub(
-                            false,
-                            ListUtil.isEmpty(medrecVo.getLabel()) ? ModelStandardKeys.doctorAdvice : medrecVo.getLabel(),
-                            content
-                    );
-
-            DoctorAdviceDoc doctorAdviceDoc = ModelDocGenerate.doctorAdviceDocGen(structureMap);
-            doctorAdviceDoc.setText(content);
-            retList.add(doctorAdviceDoc);
+            retList.add(getDoctorAdviceDoc(content));
         });
         return retList;
     }
 
+    private DoctorAdviceDoc getDoctorAdviceDoc(String content) {
+        Map<String, String> pageData = Preproc.extract_doc_pub(true, pageDataTitles, content);
+        pageData.put("病程记录内容",
+                pageData.get("病程记录内容")
+                        .replace(pageData.get("病程记录时间"), "")
+                        .replace(pageData.get("病程记录名称"), "")
+        );
+
+        List<String> targetTitles = Lists.newArrayList();
+        sourceTitles.forEach(sourceTitle -> {
+            String targetTitle = "";
+            for (int index = 0; index < sourceTitle.length(); index++) {
+                if (index == sourceTitle.length() - 1) {
+                    targetTitle += sourceTitle.substring(index, index + 1);
+                } else {
+                    targetTitle += sourceTitle.substring(index, index + 1) + "[\\s\\p{Zs}]*";
+                }
+            }
+            targetTitles.add(targetTitle);
+        });
+
+        Map<String, String> sourceMap = Preproc.extract_doc_pub(true, targetTitles, content);
+        sourceMap.put("记录时间", sourceMap.get("病程记录时间"));
+
+        DoctorAdviceDoc doctorAdviceDoc = ModelDocGenerate.doctorAdviceDocGen(sourceMap);
+        doctorAdviceDoc.setText(content);
+        doctorAdviceDoc.setPageData((Map) pageData);
+
+        return doctorAdviceDoc;
+    }
+
+    private List<String> pageDataTitles = Lists.newArrayList(
+            "病程记录时间",
+            "病程记录名称",
+            "病程记录内容",
+            "记录医师"
+    );
+
+    private List<String> sourceTitles = Lists.newArrayList(
+            "病程记录时间",
+            "病程记录名称",
+            "病程记录内容",
+            "记录时间",
+            "记录医师"
+    );
+
 }