ICSS化验公表映射

icss-service/src/main/java/com/diagbot/facade/LisConfigFacade.java

@@ -1,18 +1,14 @@
 package com.diagbot.facade;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.diagbot.util.EntityUtil;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.LisConfigDTO;
 import com.diagbot.entity.LisConfig;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.LisConfigServiceImpl;
 import com.diagbot.util.BeanUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * 
@@ -37,27 +33,4 @@ public class LisConfigFacade extends LisConfigServiceImpl {
 		List<LisConfigDTO> datas = BeanUtil.listCopyTo(data, LisConfigDTO.class);
 		return datas;
 	}
-
-	/**
-	 * 根据医院编码获取化验项映射关系
-	 *
-	 * @param hospitalCode
-	 * @return
-	 */
-	public Map<String, Map<String, String>> getLisConfigMapByHospitalCode(String hospitalCode) {
-		Map<String, Map<String, String>> retMap = new LinkedHashMap<>();
-		QueryWrapper<LisConfig> lisConfigQueryWrapper = new QueryWrapper<>();
-		lisConfigQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-				.eq("hospital_code", hospitalCode);
-		List<LisConfig> lisConfigList = this.list(lisConfigQueryWrapper);
-		Map<String, List<LisConfig>> lisConfigMap = EntityUtil.makeEntityListMap(lisConfigList, "mealName");
-		for (Map.Entry<String, List<LisConfig>> entry : lisConfigMap.entrySet()) {
-			if (entry.getValue().size() > 0) {
-				retMap.put(entry.getKey(), EntityUtil.makeMapWithKeyValue(entry.getValue(), "itemName", "uniqueName"));
-			} else {
-				retMap.put(entry.getKey(), null);
-			}
-		}
-		return retMap;
-	}
 }

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -14,6 +14,7 @@ import com.diagbot.dto.QuestionDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.DeptVital;
 import com.diagbot.entity.LisConfig;
+import com.diagbot.entity.LisMapping;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.VitalOrder;
 import com.diagbot.enums.IsDeleteEnum;
@@ -68,7 +69,7 @@ public class PushFacade {
     @Autowired
     private HighRiskServiceClient highRiskServiceClient;
     @Autowired
-    private LisConfigFacade lisConfigFacade;
+    private LisMappingFacade lisMappingFacade;
 
     /**
      * 推理接口
@@ -101,7 +102,7 @@ public class PushFacade {
 
         //化验项映射,转公表
         if (pushVO.getLis().size() > 0) {
-            Map<String, Map<String, String>> lisConfigMap = lisConfigFacade.getLisConfigMapByHospitalCode("A000");
+            Map<String, Map<String, String>> lisConfigMap = lisMappingFacade.getLisMapping();
             for (LisResultVO lisResultVO : pushVO.getLis()) {
                 //source=0 icss页面数据，source=1 外部导入数据
                 if (!lisResultVO.getSource().equals(LisSourceEnum.Inner.getKey())) {

icss-service/src/main/java/com/diagbot/service/impl/impl/LisMappingServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl.impl;
+
+import com.diagbot.entity.LisMapping;
+import com.diagbot.mapper.LisMappingMapper;
+import com.diagbot.service.LisMappingService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 化验项目公表映射 服务实现类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-12-27
+ */
+@Service
+public class LisMappingServiceImpl extends ServiceImpl<LisMappingMapper, LisMapping> implements LisMappingService {
+
+}