义乌moban修改

dbanaly/src/main/java/com/lantone/qc/dbanaly/util/ModuleMappingUtil.java

@@ -2,7 +2,9 @@ package com.lantone.qc.dbanaly.util;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.lantone.qc.pub.model.vo.BehospitalInfoVO;
 import com.lantone.qc.pub.util.SpringContextUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.collections.MapUtils;
 
 import java.util.ArrayList;
@@ -54,4 +56,15 @@ public class ModuleMappingUtil {
         return standardModuleInfo.get(specialStorageUtil.getHospitalIdThreadLocal().get()).get(modeId);
     }
 
+    public static String getDeptModuleId(String modeId) {
+        BehospitalInfoVO behospitalInfo = specialStorageUtil.getBehospitalInfoThreadLocal().get();
+        if (behospitalInfo != null) {
+            String behDeptId = behospitalInfo.getBehDeptId();
+            if (StringUtil.isNotBlank(behDeptId)) {
+                return getHtmlDataTypeModuleId(modeId + "-" + behDeptId);
+            }
+        }
+        return null;
+    }
+
 }

trans/src/main/java/com/lantone/qc/trans/comsis/OrdinaryAssistant.java

@@ -21,7 +21,10 @@ public class OrdinaryAssistant {
 
     public static Map<String, String> mapKeyContrast(Map<String, String> sourceMap, List<String> keyContrasts) {
         Map<String, String> retMap = Maps.newHashMap();
-        String modeId = ModuleMappingUtil.getXmlDataTypeModuleId(sourceMap);
+        String modeId = sourceMap.get("mode_id");
+        if (StringUtil.isBlank(modeId)) {
+            modeId = ModuleMappingUtil.getXmlDataTypeModuleId(sourceMap);
+        }
         if (StringUtil.isNotBlank(modeId)) {
             retMap.put("mode_id", modeId);
             sourceMap.put("mode_id", modeId);
@@ -32,7 +35,10 @@ public class OrdinaryAssistant {
 
     public static Map<String, String> mapKeyContrast(Map<String, String> sourceMap, List<String> keyContrasts, String defaultModeId) {
         Map<String, String> retMap = Maps.newHashMap();
-        String modeId = ModuleMappingUtil.getXmlDataTypeModuleId(sourceMap);
+        String modeId = sourceMap.get("mode_id");
+        if (StringUtil.isBlank(modeId)) {
+            modeId = ModuleMappingUtil.getXmlDataTypeModuleId(sourceMap);
+        }
         if (StringUtil.isBlank(modeId)) {
             modeId = ModuleMappingUtil.getStandardModuleId(defaultModeId);
         }