会诊记录

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

@@ -25,6 +25,12 @@ import java.util.Set;
  */
 public class TaiZhouConsultationDocTrans extends ModelDocTrans {
 
+    /**
+     * 会诊记录包含3个模块：会诊记录；会诊结果单；会诊申请单
+     *
+     * @param medrecVo
+     * @return
+     */
     @Override
     public List<ConsultationDoc> extract(MedrecVo medrecVo) {
         List<ConsultationDoc> retList = Lists.newArrayList();
@@ -78,11 +84,13 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationRecordDoc getConsultationRecordDoc(String content) {
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), consultationRecord_keyContrasts);
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content); // xml原始数据给华卓
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationRecord_keyContrasts);
 
         ConsultationRecordDoc consultationRecordDoc = new ConsultationRecordDoc();
         consultationRecordDoc.setStructureMap(structureMap);
-
+        consultationRecordDoc.setText(content);
+        consultationRecordDoc.setPageData((Map)sourceMap);
         return consultationRecordDoc;
     }
 
@@ -90,12 +98,12 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
             "体检=",
             "审核人=",
             "会诊意见=",
-            "事件日期=",
-            "医生=",
+            "事件日期=记录时间",
+            "医生=记录医师",
             "查房医师=",
             "简要病情=",
             "事件基本信息=",
-            "会诊执行情况=",
+            "会诊执行情况=会诊情况",
             "职务=",
             "年龄=",
             "临床科室1=",
@@ -142,11 +150,13 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationResultsDoc getConsultationResultsDoc(String content) {
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), consultationResults_keyContrasts);
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content); // xml原始数据给华卓
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationResults_keyContrasts);
 
         ConsultationResultsDoc consultationResultsDoc = new ConsultationResultsDoc();
         consultationResultsDoc.setStructureMap(structureMap);
-
+        consultationResultsDoc.setText(content);
+        consultationResultsDoc.setPageData((Map)sourceMap);
         return consultationResultsDoc;
     }
 
@@ -168,8 +178,8 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
             "审核日期=",
             "性别=",
             "会诊查体=",
-            "本人姓名=",
-            "病历号=",
+            "本人姓名=姓名",
+            "病历号=病案号",
             "会诊科室=",
             "病历日期=",
             "记录及建议=",
@@ -208,10 +218,13 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationApplicationDoc getConsultationApplicationDoc(String content) {
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), consultationApplication_keyContrasts);
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content); // xml原始数据给华卓
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationApplication_keyContrasts);
 
         ConsultationApplicationDoc consultationApplicationDoc = new ConsultationApplicationDoc();
         consultationApplicationDoc.setStructureMap(structureMap);
+        consultationApplicationDoc.setText(content);
+        consultationApplicationDoc.setPageData((Map)sourceMap);
 
         return consultationApplicationDoc;
     }