Browse Source

厦门:映射更新

wangsy 4 years ago
parent
commit
9acd6642fd

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenBeHospitalizedDocTrans.java

@@ -48,7 +48,8 @@ public class XiamenBeHospitalizedDocTrans extends ModelDocTrans {
             "医生签名=记录医生",
             "医生签名=记录医生",
             "医生签名时间=记录时间",
             "医生签名时间=记录时间",
             "疼痛评估=疼痛",
             "疼痛评估=疼痛",
-            "代诉=主诉"
+            "代诉=主诉",
+            "病历|体格检查=体格检查"
     );
     );
 
 
 }
 }

+ 9 - 5
trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenFirstCourseRecordDocTrans.java

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.pub.util.FastJsonUtils;
+import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
@@ -34,15 +35,17 @@ public class XiamenFirstCourseRecordDocTrans extends ModelDocTrans {
             if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
                 structureMap = (Map) FastJsonUtils.getJsonToMap(content);
                 structureMap = (Map) FastJsonUtils.getJsonToMap(content);
                 structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "2");
                 structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "2");
-                List<String> keys = Lists.newArrayList("需求评估", "预期目标", "诊疗计划", "治疗监测计划");
-                String treatPlanJoin = structureMapJoin(structureMap, keys);
-                firstCourseRecordDoc.getTreatPlanLabel().setAiText(treatPlanJoin);
+
             }
             }
             if (MapUtils.isNotEmpty(structureMap)) {
             if (MapUtils.isNotEmpty(structureMap)) {
                 firstCourseRecordDoc = ModelDocGenerate.firstCourseRecordDocGen(structureMap);
                 firstCourseRecordDoc = ModelDocGenerate.firstCourseRecordDocGen(structureMap);
                 firstCourseRecordDoc.setText(CommonAnalysisUtil.html2String(content));
                 firstCourseRecordDoc.setText(CommonAnalysisUtil.html2String(content));
                 firstCourseRecordDoc.setPageData((Map) structureMap);
                 firstCourseRecordDoc.setPageData((Map) structureMap);
-
+                List<String> keys = Lists.newArrayList("需求评估", "预期目标", "诊疗计划", "治疗监测计划");
+                String treatPlanJoin = structureMapJoin(structureMap, keys);
+                if (StringUtil.isNotBlank(treatPlanJoin)) {
+                    firstCourseRecordDoc.getTreatPlanLabel().setAiText(treatPlanJoin);
+                }
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             log.error(e.getMessage(), e);
@@ -54,7 +57,8 @@ public class XiamenFirstCourseRecordDocTrans extends ModelDocTrans {
             "时间=病历日期",
             "时间=病历日期",
             "病历特点=病例特点",
             "病历特点=病例特点",
             "入院查体=查体",
             "入院查体=查体",
-            "辅助检查=辅检"
+            "辅助检查=辅检",
+            "诊疗计划(方案)=诊疗计划"
     );
     );
 
 
 }
 }

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenThreeLevelWardDocTrans.java

@@ -261,7 +261,8 @@ public class XiamenThreeLevelWardDocTrans extends ModelDocTrans {
 
 
     private List<String> keyContrasts = Lists.newArrayList(
     private List<String> keyContrasts = Lists.newArrayList(
             "病历日期=查房日期",
             "病历日期=查房日期",
-            "病历标题=查房标题",
+            "wardTitle=查房标题",
+            "wholeData=病情记录",
             "科主任=三级医师",
             "科主任=三级医师",
             "记录日期=记录时间"
             "记录日期=记录时间"
     );
     );