rengb 4 роки тому
батько
коміт
846cc1f0f7
19 змінених файлів з 93 додано та 113 видалено
  1. 15 14
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuBeHospitalizedDocTrans.java
  2. 2 1
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuClinicBloodEffectDocTrans.java
  3. 2 1
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuClinicalBloodDocTrans.java
  4. 7 2
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuConsultationDocTrans.java
  5. 2 1
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuCrisisValueReportDocTrans.java
  6. 2 1
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuCriticallyIllNoticeDocTrans.java
  7. 2 1
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuDeathCaseDiscussDocTrans.java
  8. 2 1
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuDeathRecordDocTrans.java
  9. 2 1
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuDifficultCaseDiscussDocTrans.java
  10. 7 5
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuFirstCourseRecordDocTrans.java
  11. 2 1
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuLeaveHospitalDocTrans.java
  12. 0 51
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuMedicalWritingDocTrans.java
  13. 33 28
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuOperationDocTrans.java
  14. 2 1
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuPathologyShipDocTrans.java
  15. 2 1
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuRescueDocTrans.java
  16. 2 1
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuSeriouslyIllNoticeDocTrans.java
  17. 2 1
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuStagesSummaryDocTrans.java
  18. 2 0
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuThreeLevelWardDocTrans.java
  19. 5 1
      trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuTransferRecordDocTrans.java

+ 15 - 14
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuBeHospitalizedDocTrans.java

@@ -2,6 +2,7 @@ package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
 import com.lantone.qc.pub.model.label.ChiefLabel;
 import com.lantone.qc.pub.model.label.DiagLabel;
@@ -18,7 +19,6 @@ import com.lantone.qc.pub.model.vo.MedrecVo;
 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.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import org.apache.commons.lang3.StringUtils;
 
@@ -47,18 +47,19 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
             //新生儿科姓名+姓名问题解决
-            if(structureMap.containsKey("姓名")){
-                String value =structureMap.get("姓名").split(" ")[0];
-                structureMap.put("姓名",value);
+            if (structureMap.containsKey("姓名")) {
+                String value = structureMap.get("姓名").split(" ")[0];
+                structureMap.put("姓名", value);
             }
             //产科孕产次
-            if(structureMap.containsKey("入院记录")){
-                String value =structureMap.get("入院记录").split(" ")[0];
-                structureMap.put("孕产次",value);
+            if (structureMap.containsKey("入院记录")) {
+                String value = structureMap.get("入院记录").split(" ")[0];
+                structureMap.put("孕产次", value);
             }
             OrdinaryAssistant.removeBlank(structureMap);
         }
@@ -186,7 +187,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
         //        structureMap.remove("既往史");
 
         PersonalLabel personalLabel = new PersonalLabel();
-//        personalLabel.setCrfLabel(false);
+        //        personalLabel.setCrfLabel(false);
         personalLabel.setText(structureMap.get("个人史"));
         beHospitalizedDoc.setPersonalLabel(personalLabel);
         if (StringUtil.isBlank(structureMap.get("个人史"))) {
@@ -195,7 +196,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
         //        structureMap.remove("个人史");
 
         MaritalLabel maritalLabel = new MaritalLabel();
-//        maritalLabel.setCrfLabel(false);
+        //        maritalLabel.setCrfLabel(false);
         maritalLabel.setText("婚育史: " + structureMap.get("婚育史"));
         beHospitalizedDoc.setMaritalLabel(maritalLabel);
         if (StringUtil.isBlank(structureMap.get("婚育史"))) {
@@ -204,7 +205,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
         //        structureMap.remove("婚育史");
 
         MenstrualLabel menstrualLabel = new MenstrualLabel();
-//        menstrualLabel.setCrfLabel(false);
+        //        menstrualLabel.setCrfLabel(false);
         menstrualLabel.setText("月经史:" + structureMap.get("月经史"));
         beHospitalizedDoc.setMenstrualLabel(menstrualLabel);
         if (StringUtil.isBlank(structureMap.get("月经史"))) {
@@ -213,7 +214,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
         //        structureMap.remove("月经史");
 
         FamilyLabel familyLabel = new FamilyLabel();
-//        familyLabel.setCrfLabel(false);
+        //        familyLabel.setCrfLabel(false);
         familyLabel.setText(structureMap.get("家族史"));
         beHospitalizedDoc.setFamilyLabel(familyLabel);
         if (StringUtil.isBlank(structureMap.get("家族史"))) {
@@ -222,7 +223,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
         //        structureMap.remove("家族史");
 
         VitalLabel vitalLabel = new VitalLabel();
-//        vitalLabel.setCrfLabel(false);
+        //        vitalLabel.setCrfLabel(false);
         vitalLabel.setText(structureMap.get("体格检查"));
         beHospitalizedDoc.setVitalLabel(vitalLabel);
         if (StringUtil.isBlank(structureMap.get("体格检查"))) {
@@ -231,7 +232,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
         //        structureMap.remove("体格检查");
 
         VitalLabelSpecial vitalLabelSpecial = new VitalLabelSpecial();
-//        vitalLabelSpecial.setCrfLabel(false);
+        //        vitalLabelSpecial.setCrfLabel(false);
         vitalLabelSpecial.setText(structureMap.get("专科体格检查"));
         beHospitalizedDoc.setVitalLabelSpecial(vitalLabelSpecial);
         if (StringUtil.isBlank(structureMap.get("专科体格检查"))) {
@@ -241,7 +242,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
 
         // 走模型
         PacsLabel pacsLabel = new PacsLabel();
-//        pacsLabel.setCrfLabel(false);
+        //        pacsLabel.setCrfLabel(false);
         pacsLabel.setText(structureMap.get("辅助检查"));
         beHospitalizedDoc.setPacsLabel(pacsLabel);
         if (StringUtil.isBlank(structureMap.get("辅助检查"))) {

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuClinicBloodEffectDocTrans.java

@@ -1,8 +1,8 @@
 package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.ClinicBloodEffectDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -38,6 +38,7 @@ public class YiWuClinicBloodEffectDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuClinicalBloodDocTrans.java

@@ -1,8 +1,8 @@
 package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.ClinicalBloodDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -37,6 +37,7 @@ public class YiWuClinicalBloodDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);

+ 7 - 2
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuConsultationDocTrans.java

@@ -3,8 +3,8 @@ package com.lantone.qc.trans.yiwu;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationApplicationDoc;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationRecordDoc;
@@ -26,7 +26,6 @@ import java.util.Set;
  * @time: 2020/3/17 13:22
  */
 public class YiWuConsultationDocTrans extends ModelDocTrans {
-    private String modeId = "31";
 
     /**
      * 会诊记录包含3个模块:会诊申请单,会诊结果单,会诊记录
@@ -88,12 +87,14 @@ public class YiWuConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationRecordDoc getConsultationRecordDoc(Map<String, Object> contentMap) {
+        String modeId = "7";
         String content = contentMap.get("xmlText").toString();
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationRecord_keyContrasts, modeId);
@@ -135,12 +136,14 @@ public class YiWuConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationResultsDoc getConsultationResultsDoc(Map<String, Object> contentMap) {
+        String modeId = "31";
         String content = contentMap.get("xmlText").toString();
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationResults_keyContrasts, modeId);
@@ -188,12 +191,14 @@ public class YiWuConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationApplicationDoc getConsultationApplicationDoc(Map<String, Object> contentMap) {
+        String modeId = "30";
         String content = contentMap.get("xmlText").toString();
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationApplication_keyContrasts, modeId);

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuCrisisValueReportDocTrans.java

@@ -1,8 +1,8 @@
 package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.CrisisValueReportDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -37,6 +37,7 @@ public class YiWuCrisisValueReportDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuCriticallyIllNoticeDocTrans.java

@@ -1,8 +1,8 @@
 package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.CriticallyIllNoticeDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -37,6 +37,7 @@ public class YiWuCriticallyIllNoticeDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuDeathCaseDiscussDocTrans.java

@@ -1,8 +1,8 @@
 package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.DeathCaseDiscussDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -30,6 +30,7 @@ public class YiWuDeathCaseDiscussDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuDeathRecordDocTrans.java

@@ -1,8 +1,8 @@
 package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.DeathRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -29,6 +29,7 @@ public class YiWuDeathRecordDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuDifficultCaseDiscussDocTrans.java

@@ -1,8 +1,8 @@
 package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.DifficultCaseDiscussDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -37,6 +37,7 @@ public class YiWuDifficultCaseDiscussDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);

+ 7 - 5
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuFirstCourseRecordDocTrans.java

@@ -3,6 +3,7 @@ package com.lantone.qc.trans.yiwu;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -36,13 +37,14 @@ public class YiWuFirstCourseRecordDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
-            List<String> titles = Lists.newArrayList("病历记录时间","一、病例特点","二、初步诊断","三、诊断依据"
-                    ,"四、鉴别诊断","五、诊疗计划","记录医师");
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
+            List<String> titles = Lists.newArrayList("病历记录时间", "一、病例特点", "二、初步诊断", "三、诊断依据"
+                    , "四、鉴别诊断", "五、诊疗计划", "记录医师");
             String text = sourceMap.get("原始文本");
-            CommonAnalysisUtil.cutByTitles(text,titles,0,sourceMap);
+            CommonAnalysisUtil.cutByTitles(text, titles, 0, sourceMap);
             //新生儿科特殊处理
-            if(sourceMap.containsKey("病历记录时间")){
-                sourceMap.put("病历内容","患者"+sourceMap.get("病历记录时间").split("患者")[1]);
+            if (sourceMap.containsKey("病历记录时间")) {
+                sourceMap.put("病历内容", "患者" + sourceMap.get("病历记录时间").split("患者")[1]);
             }
             Map<String, String> changeKeyMap = Maps.newHashMap();
             Iterator<Map.Entry<String, String>> it = sourceMap.entrySet().iterator();

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuLeaveHospitalDocTrans.java

@@ -1,8 +1,8 @@
 package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -29,6 +29,7 @@ public class YiWuLeaveHospitalDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);

+ 0 - 51
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuMedicalWritingDocTrans.java

@@ -1,51 +0,0 @@
-package com.lantone.qc.trans.yiwu;
-
-import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
-import com.lantone.qc.pub.model.doc.MedicalWritingDoc;
-import com.lantone.qc.pub.model.vo.MedrecVo;
-import com.lantone.qc.pub.util.FastJsonUtils;
-import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 病历书写规范文档生成
- * @author: rengb
- * @time: 2020/3/17 13:27
- */
-public class YiWuMedicalWritingDocTrans extends ModelDocTrans {
-
-    @Override
-    public List<MedicalWritingDoc> extract(MedrecVo medrecVo) {
-        List<MedicalWritingDoc> retList = Lists.newArrayList();
-        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
-        contentMaps.forEach(contentMap -> {
-            retList.add(getMedicalWritingDoc(contentMap));
-        });
-        return retList;
-    }
-
-    private MedicalWritingDoc getMedicalWritingDoc(Map<String, Object> contentMap) {
-        String content = contentMap.get("xmlText").toString();
-        Map<String, String> structureMap = null;
-        if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
-            structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            Map<String, String> xmlNodeValueMap = TzXmlUtil.getXmlToMapForTZ(content);
-            xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
-            xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
-            structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
-        }
-
-        MedicalWritingDoc medicalWritingDoc = new MedicalWritingDoc();
-        medicalWritingDoc.setStructureMap(structureMap);
-
-        return medicalWritingDoc;
-    }
-
-    private List<String> keyContrasts = Lists.newArrayList();
-
-}

+ 33 - 28
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuOperationDocTrans.java

@@ -3,8 +3,8 @@ package com.lantone.qc.trans.yiwu;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.operation.OperationDiscussionDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationInformedConsentDoc;
@@ -102,27 +102,28 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
-            List<String> titles = Lists.newArrayList("手术开始时间","术中诊断","麻醉方式","手术方式",
-                    "手术简要经过(包括术中所见)","术后诊疗计划(处理措施)","术后注意观察事项","医师签名",
-                    "签名时间","患者或代理人签名","签名时间");
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
+            List<String> titles = Lists.newArrayList("手术开始时间", "术中诊断", "麻醉方式", "手术方式",
+                    "手术简要经过(包括术中所见)", "术后诊疗计划(处理措施)", "术后注意观察事项", "医师签名",
+                    "签名时间", "患者或代理人签名", "签名时间");
             String text = sourceMap.get("原始文本");
-            List<String> sortTitles=CommonAnalysisUtil.sortTitles(titles,text);
-            CommonAnalysisUtil.cutByTitles(text,sortTitles,0,sourceMap);
+            List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
+            CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             int index = 0;
-            if(text.contains("手术开始时间")){
-                index=text.indexOf("手术开始时间")+8;
+            if (text.contains("手术开始时间")) {
+                index = text.indexOf("手术开始时间") + 8;
             }
-            String timevalue=text.substring(index,index+18);
-            sourceMap.put("手术开始时间",timevalue);
-            String [] str = new String[3];
-            String s="";
-            if(text.contains("术中诊断")){
-                str=text.split("术中诊断");
-                s=str[1].replace(":","");
+            String timevalue = text.substring(index, index + 18);
+            sourceMap.put("手术开始时间", timevalue);
+            String[] str = new String[3];
+            String s = "";
+            if (text.contains("术中诊断")) {
+                str = text.split("术中诊断");
+                s = str[1].replace(":", "");
             }
-            sourceMap.put("术中诊断",s);
+            sourceMap.put("术中诊断", s);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationDiscussion_keyContrasts, modeId);
 
         }
@@ -181,14 +182,15 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
-            List<String> titles = Lists.newArrayList("手术开始时间","手术结束时间","手术前诊断","术(中)后诊断",
-                    "手术名称","手术医师","助手医师","第一助手","洗手护士","麻醉方式","手术人员",
-                    "麻醉医师","手术护士","巡回护士","手术中用药(化疗等药物)","手术切口类别(可选)","术中出血量","输血量","术中输血量"
-                    ,"围术期并发症","手术切除标本","冰冻切片结果","标本件数","是否有植入物","手术步骤","记录者签名","记录日期","术中失血量",
-                    "手术简要经过(包括“术中所见”)","医师签名","时间","患者或代理人签名","术中并发症","日    期");
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
+            List<String> titles = Lists.newArrayList("手术开始时间", "手术结束时间", "手术前诊断", "术(中)后诊断",
+                    "手术名称", "手术医师", "助手医师", "第一助手", "洗手护士", "麻醉方式", "手术人员",
+                    "麻醉医师", "手术护士", "巡回护士", "手术中用药(化疗等药物)", "手术切口类别(可选)", "术中出血量", "输血量", "术中输血量"
+                    , "围术期并发症", "手术切除标本", "冰冻切片结果", "标本件数", "是否有植入物", "手术步骤", "记录者签名", "记录日期", "术中失血量",
+                    "手术简要经过(包括“术中所见”)", "医师签名", "时间", "患者或代理人签名", "术中并发症", "日    期");
             String text = sourceMap.get("原始文本");
-            List<String> sortTitles=CommonAnalysisUtil.sortTitles(titles,text);
-            CommonAnalysisUtil.cutByTitles(text,sortTitles,0,sourceMap);
+            List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
+            CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationRecord_keyContrasts, modeId);
@@ -265,12 +267,13 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
-            List<String> titles = Lists.newArrayList("讨论时间","讨论地点","主持人","经治医师",
-                    "参加人员及技术职称","讨论方式","讨论记录","主持人签名","记录人签名","病史摘要","术前诊断","术前准备"
-            ,"拟施手术","拟施麻醉","术中注意点","家属谈话内容","医生签名","日  期");
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
+            List<String> titles = Lists.newArrayList("讨论时间", "讨论地点", "主持人", "经治医师",
+                    "参加人员及技术职称", "讨论方式", "讨论记录", "主持人签名", "记录人签名", "病史摘要", "术前诊断", "术前准备"
+                    , "拟施手术", "拟施麻醉", "术中注意点", "家属谈话内容", "医生签名", "日  期");
             String text = sourceMap.get("原始文本");
-            List<String> sortTitles=CommonAnalysisUtil.sortTitles(titles,text);
-            CommonAnalysisUtil.cutByTitles(text,sortTitles,0,sourceMap);
+            List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
+            CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts, modeId);
@@ -345,6 +348,7 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationInformedConsent_keyContrasts, modeId);
@@ -403,6 +407,7 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationSafetyChecklist_keyContrasts, modeId);

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuPathologyShipDocTrans.java

@@ -1,8 +1,8 @@
 package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.PathologyShipDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -38,6 +38,7 @@ public class YiWuPathologyShipDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuRescueDocTrans.java

@@ -1,8 +1,8 @@
 package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.RescueDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -37,6 +37,7 @@ public class YiWuRescueDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuSeriouslyIllNoticeDocTrans.java

@@ -1,8 +1,8 @@
 package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.SeriouslyIllNoticeDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -37,6 +37,7 @@ public class YiWuSeriouslyIllNoticeDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuStagesSummaryDocTrans.java

@@ -1,8 +1,8 @@
 package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.StagesSummaryDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -37,6 +37,7 @@ public class YiWuStagesSummaryDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);

+ 2 - 0
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuThreeLevelWardDocTrans.java

@@ -5,6 +5,7 @@ import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.lt.facade.ModelHospitalFacade;
 import com.lantone.qc.dbanaly.util.KernelConstants;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.dbanaly.util.SpecialStorageUtil;
 import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
@@ -63,6 +64,7 @@ public class YiWuThreeLevelWardDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             String recTitle = contentMap.get("recTitle").toString();
             if (recTitles.contains(recTitle)) {

+ 5 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuTransferRecordDocTrans.java

@@ -2,8 +2,8 @@ package com.lantone.qc.trans.yiwu;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.transferrecord.TransferIntoDoc;
 import com.lantone.qc.pub.model.doc.transferrecord.TransferOutDoc;
 import com.lantone.qc.pub.model.doc.transferrecord.TransferRecordDoc;
@@ -147,6 +147,7 @@ public class YiWuTransferRecordDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, transferInto_keyContrasts, modeId);
@@ -187,6 +188,7 @@ public class YiWuTransferRecordDocTrans extends ModelDocTrans {
     }
 
     private TransferRecordDoc getTransferAllDoc(Map<String, Object> contentMap) {
+        String modeId = "34";
         String content = contentMap.get("xmlText").toString();
         Map<String, String> structureMap = null;
         Map<String, String> sourceMap = null;
@@ -194,6 +196,7 @@ public class YiWuTransferRecordDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, transferInto_keyContrasts);
         }
         TransferRecordDoc transferAllDoc = new TransferRecordDoc();
@@ -233,6 +236,7 @@ public class YiWuTransferRecordDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             sourceMap = YiWuXmlUtil.xmlToMap(content);
+            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, transferOut_keyContrasts, modeId);