电子病历评级

icss-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -3,6 +3,7 @@ package com.diagbot.client;
 import java.util.List;
 import java.util.Map;
 
+import com.diagbot.vo.HosCodeVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -45,9 +46,10 @@ public interface TranServiceClient {
      */
     @PostMapping("/doctorInfo/getDoctorInfo")
     RespDTO<List<DoctorInfoDTO>> getDoctorInfo(@RequestBody DoctorInfoVO doctorInfoVo);
-    
+
     /**
      * 根据ids获取医生信息map
+     *
      * @param ids
      * @return
      */
@@ -62,9 +64,10 @@ public interface TranServiceClient {
      */
     @PostMapping("/hospitalDeptInfo/getHospitalDeptInfo")
     RespDTO<HospitalDeptInfoDTO> getHospitalDeptInfo(@RequestBody HospitalDeptInfoVO hospitalDeptInfoVO);
-    
+
     /**
      * 根据ids获取科室信息map
+     *
      * @param ids
      * @return
      */
@@ -79,8 +82,10 @@ public interface TranServiceClient {
      */
     @PostMapping("/hospitalInfo/getHospitalInfo")
     RespDTO<List<HospitalInfoDTO>> getHospitalInfo(@RequestBody HospitalInfoVO hospitalInfoVO);
+
     /**
      * 匹配公表名
+     *
      * @param lisHospitalCodeVO
      * @return
      */
@@ -104,9 +109,10 @@ public interface TranServiceClient {
      */
     @PostMapping("/patientInfo/getTopPatientInfo")
     RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO);
-    
+
     /**
      * 根据ids获取病人信息
+     *
      * @param ids
      * @return
      */
@@ -130,4 +136,41 @@ public interface TranServiceClient {
      */
     @PostMapping("/diseaseIcd/getDiseaseIcds")
     RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcds(@RequestBody GetDiseaseIcdVO getDiseaseIcdVO);
-}
+
+
+    /**
+     * 根据医院编码获取化验公表映射关系-itemName不为空
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @PostMapping("/tranLisConfig/getLisConfigByHosCode_NotEmptyItemName")
+    RespDTO<Map<String, Map<String, String>>> getLisConfigByHosCode_NotEmptyItemName(@RequestBody HosCodeVO hosCodeVO);
+
+    /**
+     * 根据医院编码获取化验公表映射关系-itemName为空
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @PostMapping("/tranLisConfig/getLisConfigByHosCode_EmptyItemName")
+    RespDTO<Map<String, String>> getLisConfigByHosCode_EmptyItemName(@RequestBody HosCodeVO hosCodeVO);
+
+    /**
+     * 根据医院编码获取辅检公表映射关系
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @PostMapping("/pacsConfig/getPacsConfigByHosCode")
+    RespDTO<Map<String, String>> getPacsConfigByHosCode(@RequestBody HosCodeVO hosCodeVO);
+
+    /**
+     * 根据医院编码获取提示信息标题映射关系
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @PostMapping("/introduceTitleConfig/getTitleMappingHosCode")
+    RespDTO<Map<String, String>> getTitleMappingHosCode(@RequestBody HosCodeVO hosCodeVO);
+}

icss-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -16,14 +16,15 @@ import com.diagbot.entity.PatientInfo;
 import com.diagbot.vo.DoctorInfoVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
+import com.diagbot.vo.HosCodeVO;
 import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.vo.HospitalInfoVO;
 import com.diagbot.vo.LisHospitalCodeVO;
-
 import com.diagbot.vo.PatientInfoVO;
 import com.diagbot.vo.TranFieldInfoVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -44,12 +45,12 @@ public class TranServiceHystrix implements TranServiceClient {
     }
 
     @Override
-	public RespDTO<Map<Long, DoctorInfo>> doctorInfoMapByIds(List<Long> ids) {
-    	log.error("【hystrix】调用{}异常", "doctorInfoMapByIds");
-		return null;
-	}
+    public RespDTO<Map<Long, DoctorInfo>> doctorInfoMapByIds(List<Long> ids) {
+        log.error("【hystrix】调用{}异常", "doctorInfoMapByIds");
+        return null;
+    }
 
-	@Override
+    @Override
     public RespDTO<List<HospitalInfoDTO>> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
         log.error("【hystrix】调用{}异常", "getHospitalInfo");
         return null;
@@ -60,14 +61,14 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "getHospitalDeptInfo");
         return null;
     }
-    
+
     @Override
-	public RespDTO<Map<Long, HospitalDept>> hospitalDeptInfoMapByIds(List<Long> ids) {
-    	 log.error("【hystrix】调用{}异常", "hospitalDeptInfoMapByIds");
-		return null;
-	}
+    public RespDTO<Map<Long, HospitalDept>> hospitalDeptInfoMapByIds(List<Long> ids) {
+        log.error("【hystrix】调用{}异常", "hospitalDeptInfoMapByIds");
+        return null;
+    }
 
-	@Override
+    @Override
     public RespDTO<List<LisConfigDTO>> getLisConfigByhospitalId(LisHospitalCodeVO lisHospitalCodeVO) {
         log.error("【hystrix】调用{}异常", "getLisConfigByhospitalId");
         return null;
@@ -84,14 +85,14 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "getTopPatientInfo");
         return null;
     }
-    
+
     @Override
-	public RespDTO<Map<Long, PatientInfo>> patientInfoMapByIds(List<Long> ids) {
-    	log.error("【hystrix】调用{}异常", "patientInfoMapByIds");
-		return null;
-	}
+    public RespDTO<Map<Long, PatientInfo>> patientInfoMapByIds(List<Long> ids) {
+        log.error("【hystrix】调用{}异常", "patientInfoMapByIds");
+        return null;
+    }
 
-	@Override
+    @Override
     public RespDTO<List<TranFieldInfoDTO>> getInfoByUuid(TranFieldInfoVO tranFieldInfoVO) {
         log.error("【hystrix】调用{}异常", "getInfoByUuid");
         return null;
@@ -104,9 +105,57 @@ public class TranServiceHystrix implements TranServiceClient {
     }
 
 
-//    @Override
-//    public Response<ResponseData> bayesPageData(SearchData searchData) {
-//        log.error("【hystrix】调用{}异常", "bayesPageData");
-//        return null;
-//    }
+    //    @Override
+    //    public Response<ResponseData> bayesPageData(SearchData searchData) {
+    //        log.error("【hystrix】调用{}异常", "bayesPageData");
+    //        return null;
+    //    }
+
+    /**
+     * 根据医院编码获取化验公表映射关系-itemName不为空
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @Override
+    public RespDTO<Map<String, Map<String, String>>> getLisConfigByHosCode_NotEmptyItemName(@RequestBody HosCodeVO hosCodeVO) {
+        log.error("【hystrix】调用{}异常", "getLisConfigByHosCode_NotEmptyItemName");
+        return null;
+    }
+
+    /**
+     * 根据医院编码获取化验公表映射关系-itemName为空
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @Override
+    public RespDTO<Map<String, String>> getLisConfigByHosCode_EmptyItemName(@RequestBody HosCodeVO hosCodeVO) {
+        log.error("【hystrix】调用{}异常", "getLisConfigByHosCode_EmptyItemName");
+        return null;
+    }
+
+    /**
+     * 根据医院编码获取辅检公表映射关系
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @Override
+    public RespDTO<Map<String, String>> getPacsConfigByHosCode(@RequestBody HosCodeVO hosCodeVO) {
+        log.error("【hystrix】调用{}异常", "getPacsConfigByHosCode");
+        return null;
+    }
+
+    /**
+     * 根据医院编码获取提示信息标题映射关系
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @Override
+    public RespDTO<Map<String, String>> getTitleMappingHosCode(@RequestBody HosCodeVO hosCodeVO) {
+        log.error("【hystrix】调用{}异常", "getTitleMappingHosCode");
+        return null;
+    }
 }

icss-service/src/main/java/com/diagbot/dto/EMRIntroduceDTO.java

@@ -3,6 +3,8 @@ package com.diagbot.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -11,6 +13,5 @@ import lombok.Setter;
 @Getter
 @Setter
 public class EMRIntroduceDTO {
-    private String title;
-    private String text;
+    private List<EMRIntroduceDetailDTO> details;
 }

tran-service/src/main/java/com/diagbot/dto/EMRIntroduceDTO.java

@@ -6,11 +6,11 @@ import lombok.Setter;
 /**
  * @Description:
  * @Author:zhaops
- * @time: 2019/3/11 14:00
+ * @time: 2019/3/12 11:16
  */
 @Getter
 @Setter
-public class EMRIntroduceDTO {
+public class EMRIntroduceDetailDTO {
     private String title;
     private String text;
 }

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

@@ -1,8 +1,10 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.EMRIntroduceDTO;
+import com.diagbot.client.TranServiceClient;
+import com.diagbot.dto.EMRIntroduceDetailDTO;
 import com.diagbot.dto.IntroduceDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.entity.IntroduceInfo;
 import com.diagbot.entity.IntroduceMap;
@@ -15,12 +17,14 @@ import com.diagbot.service.impl.IntroduceInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.EMRIntroduceVO;
+import com.diagbot.vo.HosCodeVO;
 import com.diagbot.vo.IntroduceByQuestionVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -35,6 +39,8 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
     IntroduceDetailFacade introduceDetailFacade;
     @Autowired
     QuestionFacade questionFacade;
+    @Autowired
+    TranServiceClient tranServiceClient;
 
     /**
      * 根据标签id获取提示信息
@@ -145,20 +151,61 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
      * @param emrIntroduceVO
      * @return
      */
-    public List<EMRIntroduceDTO> getIntroduceByEMR(EMRIntroduceVO emrIntroduceVO) {
+    public List<EMRIntroduceDetailDTO> getIntroduceByEMR(EMRIntroduceVO emrIntroduceVO) {
+        //入参处理
+        HosCodeVO hosCodeVO = new HosCodeVO();
+        hosCodeVO.setHosCode(emrIntroduceVO.getHosCode());
+        //公表转换
+        String uniqueName = "";
+        Integer type = emrIntroduceVO.getType();
+        if (type.equals(QuestionTypeEnum.Lis.getKey())) {
+            if (StringUtil.isNotBlank(emrIntroduceVO.getMealName()))
+                if (StringUtil.isNotBlank(emrIntroduceVO.getItemName())) {
+                    RespDTO<Map<String, Map<String, String>>> respLisConfigMap = tranServiceClient.getLisConfigByHosCode_NotEmptyItemName(hosCodeVO);
+                    Map<String, Map<String, String>> lisConfigMap = respLisConfigMap.data;
+                    uniqueName = lisConfigMap.get(emrIntroduceVO.getMealName()).get(emrIntroduceVO.getItemName());
+                } else {
+                    RespDTO<Map<String, String>> respLisConfigMap_emptyItemName = tranServiceClient.getLisConfigByHosCode_EmptyItemName(hosCodeVO);
+                    Map<String, String> lisConfigMap_emptyItemName = respLisConfigMap_emptyItemName.data;
+                    uniqueName = lisConfigMap_emptyItemName.get(emrIntroduceVO.getMealName());
+                }
+        } else if (type.equals(QuestionTypeEnum.Pacs.getKey())) {
+            RespDTO<Map<String, String>> respPacsConfigMap = tranServiceClient.getPacsConfigByHosCode(hosCodeVO);
+            Map<String, String> pacsConfigMap = respPacsConfigMap.data;
+            uniqueName = pacsConfigMap.get(emrIntroduceVO.getMealName());
+        }
+
+        //未找到公表映射项目
+        if (uniqueName == null || StringUtil.isBlank(uniqueName)) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "项目未找到");
+        }
+
+        RespDTO<Map<String, String>> respTitleMappingMap = tranServiceClient.getTitleMappingHosCode(hosCodeVO);
+        Map<String, String> titleMappingMap = respTitleMappingMap.data;
+        String[] titles = emrIntroduceVO.getTitles();
+        List<String> uniqueTitleList = Lists.newLinkedList();
+        if (titles.length > 0) {
+            for (String title : titles) {
+                String uniqueTitle = titleMappingMap.get(title);
+                if (StringUtil.isNotBlank(uniqueTitle)) {
+                    uniqueTitleList.add(uniqueTitle);
+                }
+            }
+        }
+
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("tag_name", emrIntroduceVO.getName())
-                .eq("type", emrIntroduceVO.getType());
+                .eq("tag_name", uniqueName)
+                .eq("type", type);
         QuestionInfo questionInfo = questionFacade.getOne(questionInfoQueryWrapper);
         if (questionInfo == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "标签不存在");
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "公表标签不存在");
         }
 
         QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
         introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                 eq("question_id", questionInfo.getId()).
-                eq("type", emrIntroduceVO.getType());
+                eq("type", type);
         IntroduceMap introduceMap = introduceMapFacade.getOne(introduceMapQueryWrapper);
         if (introduceMap == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息未维护");
@@ -168,11 +215,11 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         introduceDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                 eq("introduce_id", introduceMap.getIntroduceId()).orderByAsc("order_no");
         //如果标题不为空，按标题返回，否则，全部返回
-        if (emrIntroduceVO.getTitles().length > 0) {
-            introduceDetailQueryWrapper.in("title", emrIntroduceVO.getTitles());
+        if (uniqueTitleList.size() > 0) {
+            introduceDetailQueryWrapper.in("title", uniqueTitleList);
         }
         List<IntroduceDetail> introduceDetailList = introduceDetailFacade.list(introduceDetailQueryWrapper);
-        List<EMRIntroduceDTO> emrIntroduceDTOList = BeanUtil.listCopyTo(introduceDetailList, EMRIntroduceDTO.class);
-        return emrIntroduceDTOList;
+        List<EMRIntroduceDetailDTO> emrDetailList = BeanUtil.listCopyTo(introduceDetailList, EMRIntroduceDetailDTO.class);
+        return emrDetailList;
     }
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.AIServiceClient;
 import com.diagbot.client.HighRiskServiceClient;
+import com.diagbot.client.TranServiceClient;
 import com.diagbot.client.bean.FeatureRate;
 import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.Response;
@@ -13,6 +14,7 @@ import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.PushEMRDTO;
 import com.diagbot.dto.PushKYJDTO;
 import com.diagbot.dto.QuestionDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.DeptVital;
 import com.diagbot.entity.QuestionInfo;
@@ -25,7 +27,10 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.FastJsonUtils;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
+import com.diagbot.vo.EMRPushVO;
+import com.diagbot.vo.HosCodeVO;
 import com.diagbot.vo.LisKYJVO;
 import com.diagbot.vo.LisResult;
 import com.diagbot.vo.LisResultVO;
@@ -34,6 +39,7 @@ import com.diagbot.vo.PushVO;
 import com.diagbot.vo.QuestionVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
@@ -66,6 +72,8 @@ public class PushFacade {
     private HighRiskServiceClient highRiskServiceClient;
     @Autowired
     private LisMappingFacade lisMappingFacade;
+    @Autowired
+    private TranServiceClient tranServiceClient;
 
     /**
      * 推理接口
@@ -472,11 +480,33 @@ public class PushFacade {
     /**
      * 电子病历评级推理
      *
-     * @param pushVO
+     * @param emrPushVO
      * @return
      */
-    public PushEMRDTO pushEMR(PushVO pushVO) {
+    public PushEMRDTO pushEMR(EMRPushVO emrPushVO) {
         PushEMRDTO pushEMRDTO = new PushEMRDTO();
+        HosCodeVO hosCodeVO = new HosCodeVO();
+        hosCodeVO.setHosCode(emrPushVO.getHosCode());
+        PushVO pushVO = new PushVO();
+        BeanUtil.copyProperties(emrPushVO, pushVO);
+        //化验项转公表内容,参数处理
+        if (ListUtil.isNotEmpty(pushVO.getLis())) {
+            RespDTO<Map<String, Map<String, String>>> respLisConfigMap = tranServiceClient.getLisConfigByHosCode_NotEmptyItemName(hosCodeVO);
+            Map<String, Map<String, String>> lisConfigMap = respLisConfigMap.data;
+            RespDTO<Map<String, String>> respLisConfigMap_emptyItemName = tranServiceClient.getLisConfigByHosCode_EmptyItemName(hosCodeVO);
+            Map<String, String> lisConfigMap_emptyItemName = respLisConfigMap_emptyItemName.data;
+            List<LisResultVO> lisResultVOList = pushVO.getLis();
+            for (LisResultVO lisResultVO : lisResultVOList) {
+                if (StringUtil.isNotBlank(lisResultVO.getName())) {
+                    if (StringUtil.isNotBlank(lisResultVO.getDetailName())) {
+                        lisResultVO.setUniqueName(lisConfigMap.get(lisResultVO.getName()).get(lisResultVO.getDetailName()));
+                    } else {
+                        lisResultVO.setUniqueName(lisConfigMap_emptyItemName.get(lisResultVO.getName()));
+                    }
+                }
+            }
+            pushVO.setLis(lisResultVOList);
+        }
         ResponseData data = pushAI(pushVO);
         String featureType = pushVO.getFeatureType();
         String[] featureTypes = featureType.split(",|，");

icss-service/src/main/java/com/diagbot/vo/EMRIntroduceVO.java

@@ -3,6 +3,8 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -11,7 +13,12 @@ import lombok.Setter;
 @Getter
 @Setter
 public class EMRIntroduceVO {
-    private String name;
+    @NotBlank(message = "请输入医院编码")
+    private String hosCode;
+    @NotBlank(message = "请输入检查或检验类型")
     private Integer type;
+    @NotBlank(message = "请输入检查或检验套餐名称")
+    private String mealName;
+    private String itemName;
     private String[] titles;
 }

icss-service/src/main/java/com/diagbot/vo/EMRPushVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/3/12 13:21
+ */
+@Getter
+@Setter
+public class EMRPushVO extends PushVO {
+    @NotBlank(message = "请输入医院编码")
+    private String hosCode;
+}

tran-service/src/main/java/com/diagbot/vo/LisResultVO.java

@@ -6,10 +6,10 @@ import lombok.Setter;
 /**
  * @Description:
  * @Author:zhaops
- * @time: 2019/3/11 17:55
+ * @time: 2019/3/12 11:05
  */
 @Getter
 @Setter
-public class LisResultVO extends LisResult {
-    private Integer source;
+public class HosCodeVO {
+    private String hosCode;
 }

icss-service/src/main/java/com/diagbot/web/IntroduceInfoController.java

@@ -1,7 +1,7 @@
 package com.diagbot.web;
 
 
-import com.diagbot.dto.EMRIntroduceDTO;
+import com.diagbot.dto.EMRIntroduceDetailDTO;
 import com.diagbot.dto.IntroduceDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.IntroduceInfoFacade;
@@ -67,10 +67,12 @@ public class IntroduceInfoController {
     @ApiOperation(value = "获取电子病历评级提示信息[by:zhaops]",
             notes = "hosCode: 医院编码，必填<br>" +
                     "type: 检验检查类型，5-检验，6-检查，必填<br>" +
+                    "mealName: 套餐名称（检验检查），必填<br>" +
+                    "itemName: 项目名称（检验）<br>" +
                     "titles(数组): 提示信息标题列表<br>")
     @PostMapping("/getIntroduceByEMR")
-    public RespDTO<List<EMRIntroduceDTO>> getIntroduceByEMR(@RequestBody EMRIntroduceVO emrIntroduceVO) {
-        List<EMRIntroduceDTO> data = introduceInfoFacade.getIntroduceByEMR(emrIntroduceVO);
+    public RespDTO<List<EMRIntroduceDetailDTO>> getIntroduceByEMR(@RequestBody EMRIntroduceVO emrIntroduceVO) {
+        List<EMRIntroduceDetailDTO> data = introduceInfoFacade.getIntroduceByEMR(emrIntroduceVO);
         return RespDTO.onSuc(data);
     }
 }

icss-service/src/main/java/com/diagbot/web/PushController.java

@@ -8,6 +8,7 @@ import com.diagbot.dto.PushKYJDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.enums.InputModeEnum;
 import com.diagbot.facade.PushFacade;
+import com.diagbot.vo.EMRPushVO;
 import com.diagbot.vo.PushKYJVO;
 import com.diagbot.vo.PushVO;
 import io.swagger.annotations.Api;
@@ -125,7 +126,8 @@ public class PushController {
     }
 
     @ApiOperation(value = "推理接口-电子病历评级[by:zhaops]",
-            notes = "age： 年龄(必填)<br>" +
+            notes = "hosCode： 医院编码(必填)<br>" +
+                    "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
                     "other：其它史,String<br>" +
@@ -145,7 +147,7 @@ public class PushController {
                     "featureType：类型(必填)，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断，8：治疗方案,String<br>")
     @PostMapping("/pushEMR")
     @SysLogger("pushEMR")
-    public RespDTO<PushEMRDTO> pushEMR(@RequestBody @Valid PushVO pushVO) {
-        return RespDTO.onSuc(pushFacade.pushEMR(pushVO));
+    public RespDTO<PushEMRDTO> pushEMR(@RequestBody @Valid EMRPushVO emrPushVO) {
+        return RespDTO.onSuc(pushFacade.pushEMR(emrPushVO));
     }
 }

tran-service/src/main/java/com/diagbot/client/ICSSServiceClient.java

@@ -1,39 +0,0 @@
-package com.diagbot.client;
-
-import com.diagbot.client.bean.ICSSPushDTO;
-import com.diagbot.client.hystrix.ICSSServiceHystrix;
-import com.diagbot.dto.EMRIntroduceDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.vo.EMRIntroduceVO;
-import com.diagbot.vo.PushVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 14:33
- */
-@FeignClient(value = "icss-service", fallback = ICSSServiceHystrix.class)
-public interface ICSSServiceClient {
-    /**
-     * 获取检验检查提示信息
-     *
-     * @param emrIntroduceVO
-     * @return
-     */
-    @PostMapping("/introduceInfo/getIntroduceByEMR")
-    RespDTO<List<EMRIntroduceDTO>> getIntroduceByEMR(@RequestBody EMRIntroduceVO emrIntroduceVO);
-
-    /**
-     * 检验检查推理
-     *
-     * @param pushVO
-     * @return
-     */
-    @PostMapping("/push/pushEMR")
-    RespDTO<ICSSPushDTO> pushEMR(@RequestBody PushVO pushVO);
-}

tran-service/src/main/java/com/diagbot/client/bean/ICSSPushDTO.java

@@ -1,18 +0,0 @@
-package com.diagbot.client.bean;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 16:51
- */
-@Getter
-@Setter
-public class ICSSPushDTO {
-    private List<String> lisList;
-    private List<String> pacsList;
-}

tran-service/src/main/java/com/diagbot/client/hystrix/ICSSServiceHystrix.java

@@ -1,33 +0,0 @@
-package com.diagbot.client.hystrix;
-
-import com.diagbot.client.ICSSServiceClient;
-import com.diagbot.client.bean.ICSSPushDTO;
-import com.diagbot.dto.EMRIntroduceDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.vo.EMRIntroduceVO;
-import com.diagbot.vo.PushVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 14:33
- */
-@Component
-@Slf4j
-public class ICSSServiceHystrix implements ICSSServiceClient {
-    @Override
-    public RespDTO<List<EMRIntroduceDTO>> getIntroduceByEMR(@RequestBody EMRIntroduceVO emrIntroduceVO) {
-        log.error("【hystrix】调用{}异常", "getIntroduceByEMR");
-        return null;
-    }
-
-    public RespDTO<ICSSPushDTO> pushEMR(@RequestBody PushVO pushVO) {
-        log.error("【hystrix】调用{}异常", "getIntroduceByEMR");
-        return null;
-    }
-}

tran-service/src/main/java/com/diagbot/dto/PushEMRDTO.java

@@ -1,18 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 16:36
- */
-@Getter
-@Setter
-public class PushEMRDTO {
-    private List<String> lisList;
-    private List<String> pacsList;
-}

tran-service/src/main/java/com/diagbot/facade/EMRInfoFacade.java

@@ -1,79 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.client.ICSSServiceClient;
-import com.diagbot.dto.EMRIntroduceDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.enums.TypeEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.EMRInfoVO;
-import com.diagbot.vo.EMRIntroduceVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 13:09
- */
-@Component
-public class EMRInfoFacade {
-    @Autowired
-    private TranLisConfigFacade tranLisConfigFacade;
-    @Autowired
-    private PacsConfigFacade pacsConfigFacade;
-    @Autowired
-    private IntroduceTitleConfigFacade introduceTitleConfigFacade;
-    @Autowired
-    private ICSSServiceClient icssServiceClient;
-
-    public List<EMRIntroduceDTO> getEMRInfo(EMRInfoVO emrInfoVO) {
-        String hoscode = emrInfoVO.getHosCode();
-        Map<String, Map<String, String>> lisConfigMap = tranLisConfigFacade.getLisConfigByHosCode(hoscode);
-        Map<String, String> pacsConfigMap = pacsConfigFacade.getPacsConfigByHosCode(hoscode);
-        Map<String, String> titleMappingMap = introduceTitleConfigFacade.getTitleMappingHosCode(hoscode);
-
-        //公表转换
-        String uniqueName = "";
-        Integer type = emrInfoVO.getType();
-        if (type.equals(TypeEnum.Lis.getKey())) {
-            uniqueName = lisConfigMap.get(emrInfoVO.getMealName()).get(emrInfoVO.getItemName());
-        } else if (type.equals(TypeEnum.Pacs.getKey())) {
-            uniqueName = pacsConfigMap.get(emrInfoVO.getMealName());
-        }
-
-        //未找到公表映射项目
-        if (uniqueName == null || StringUtil.isBlank(uniqueName)) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "项目未找到");
-        }
-
-        String[] titles = emrInfoVO.getTitles();
-        List<String> titleList = Lists.newLinkedList();
-        if (titles.length > 0) {
-            for (String title : titles) {
-                String innerTitle = titleMappingMap.get(title);
-                if (StringUtil.isNotBlank(innerTitle)) {
-                    titleList.add(innerTitle);
-                }
-            }
-        }
-
-        //标题转换
-        EMRIntroduceVO introduceVO = new EMRIntroduceVO();
-        introduceVO.setName(uniqueName);
-        introduceVO.setType(type);
-        if (titleList.size() > 0) {
-            String[] mappingTitles = null;
-            introduceVO.setTitles(titleList.toArray(mappingTitles));
-        }
-
-        RespDTO<List<EMRIntroduceDTO>> respDTO = icssServiceClient.getIntroduceByEMR(introduceVO);
-        List<EMRIntroduceDTO> emrIntroduceDTOList = respDTO.data;
-        return emrIntroduceDTOList;
-    }
-}

tran-service/src/main/java/com/diagbot/facade/EMRPushFacade.java

@@ -1,64 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.client.ICSSServiceClient;
-import com.diagbot.client.bean.ICSSPushDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.EMRLisResultVO;
-import com.diagbot.vo.EMRPushVO;
-import com.diagbot.vo.LisResultVO;
-import com.diagbot.vo.PushVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 16:47
- */
-@Component
-public class EMRPushFacade {
-    @Autowired
-    private ICSSServiceClient icssServiceClient;
-    @Autowired
-    private TranLisConfigFacade tranLisConfigFacade;
-
-    /**
-     * 电子病历评级-推理
-     *
-     * @param emrPushVO
-     * @return
-     */
-    public ICSSPushDTO emrPush(EMRPushVO emrPushVO) {
-        PushVO pushVO = new PushVO();
-        BeanUtil.copyProperties(emrPushVO, pushVO);
-        pushVO.setFeatureType(emrPushVO.getType());
-
-        //化验项转公表内容,参数处理
-        if (emrPushVO.getLis() != null && emrPushVO.getLis().size() > 0) {
-            Map<String, Map<String, String>> lisConfigMap = tranLisConfigFacade.getLisConfigByHosCode(emrPushVO.getHosCode());
-            List<EMRLisResultVO> emrLisResultVOList = emrPushVO.getLis();
-            List<LisResultVO> lisResultVOList = Lists.newLinkedList();
-            for (EMRLisResultVO emrLisResultVO : emrLisResultVOList) {
-                if (StringUtil.isNotBlank(emrLisResultVO.getMealName()) && StringUtil.isNotBlank(emrLisResultVO.getItemName())) {
-                    emrLisResultVO.setUniqueName(lisConfigMap.get(emrLisResultVO.getMealName()).get(emrLisResultVO.getItemName()));
-                }
-                LisResultVO lisResultVO = new LisResultVO();
-                BeanUtil.copyProperties(emrLisResultVO, lisResultVO);
-                lisResultVO.setName(emrLisResultVO.getMealName());
-                lisResultVO.setDetailName(emrLisResultVO.getItemName());
-                lisResultVO.setSource(1);
-                lisResultVOList.add(lisResultVO);
-            }
-            pushVO.setLis(lisResultVOList);
-        }
-
-        RespDTO<ICSSPushDTO> respDTO = icssServiceClient.pushEMR(pushVO);
-        return respDTO.data;
-    }
-}

tran-service/src/main/java/com/diagbot/facade/TranLisConfigFacade.java

@@ -1,19 +1,17 @@
 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.TranLisConfig;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.TranLisConfigServiceImpl;
 import com.diagbot.util.BeanUtil;
-import com.diagbot.util.GsonUtil;
+import com.diagbot.util.EntityUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 /**
  * 
  * @author wangfeng
@@ -41,14 +39,15 @@ public class TranLisConfigFacade extends TranLisConfigServiceImpl{
 	}
 
 	/**
-	 * 根据医院编码获取化验公表映射关系 Map<mealName,Map<itemName,uniqueName>>
+	 * 根据医院编码获取化验公表映射关系-itemName不为空 Map<mealName,Map<itemName,uniqueName>>
 	 *
 	 * @return
 	 */
-	public Map<String, Map<String, String>> getLisConfigByHosCode(String hosCode) {
+	public Map<String, Map<String, String>> getLisConfigByHosCode_NotEmptyItemName(String hosCode) {
 		Map<String, Map<String, String>> retMap = new LinkedHashMap<>();
 		QueryWrapper<TranLisConfig> lisConfigQueryWrapper = new QueryWrapper<>();
-		lisConfigQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("hospital_code",hosCode);
+		lisConfigQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("hospital_code",hosCode).
+				isNotNull("item_name").and(i->i.ne("item_name",""));
 		List<TranLisConfig> lisConfigList = this.list(lisConfigQueryWrapper);
 		Map<String, List<TranLisConfig>> lisConfigMap = EntityUtil.makeEntityListMap(lisConfigList, "mealName");
 		for (Map.Entry<String, List<TranLisConfig>> entry : lisConfigMap.entrySet()) {
@@ -60,4 +59,18 @@ public class TranLisConfigFacade extends TranLisConfigServiceImpl{
 		}
 		return retMap;
 	}
+
+	/**
+	 * 根据医院编码获取化验公表映射关系-itemName为空 Map<mealName,uniqueName>
+	 *
+	 * @return
+	 */
+	public Map<String, String> getLisConfigByHosCode_EmptyItemName(String hosCode) {
+		QueryWrapper<TranLisConfig> lisConfigQueryWrapper = new QueryWrapper<>();
+		lisConfigQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("hospital_code",hosCode).
+				isNull("item_name").or(i->i.eq("item_name",""));
+		List<TranLisConfig> lisConfigList = this.list(lisConfigQueryWrapper);
+		Map<String, String> retMap = EntityUtil.makeMapWithKeyValue(lisConfigList, "mealName", "uniqueName");
+		return retMap;
+	}
 }

tran-service/src/main/java/com/diagbot/vo/EMRInfoVO.java

@@ -1,24 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 11:19
- */
-@Getter
-@Setter
-public class EMRInfoVO {
-    @NotBlank(message = "请输入医院编码")
-    private String hosCode;
-    @NotBlank(message = "请输入检查或检验类型")
-    private Integer type;
-    @NotBlank(message = "请输入检查或检验套餐名称")
-    private String mealName;
-    private String itemName;
-    private String[] titles;
-}

tran-service/src/main/java/com/diagbot/vo/EMRIntroduceVO.java

@@ -1,17 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 13:50
- */
-@Getter
-@Setter
-public class EMRIntroduceVO {
-    private String name;
-    private Integer type;
-    private String[] titles;
-}

tran-service/src/main/java/com/diagbot/vo/EMRLisResultVO.java

@@ -1,22 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 17:02
- */
-@Getter
-@Setter
-public class EMRLisResultVO {
-    private String mealName;//套餐名称
-    private String itemName;//化验项名称
-    private String uniqueName;//公表名称
-    private Double value;//值
-    private Double maxValue;//最大值
-    private Double minValue;//最小值
-    private String units;//单位
-    private String otherValue;//其他结果，包括阴性阳性，文字描述等
-}

tran-service/src/main/java/com/diagbot/vo/EMRPushVO.java

@@ -1,33 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 11:19
- */
-@Getter
-@Setter
-public class EMRPushVO {
-    @NotBlank(message = "请输入医院编码")
-    private String hosCode;
-    @NotNull(message = "请输入年龄")
-    private Integer age;
-    @NotNull(message = "请输入性别")
-    private Integer sex;
-    @NotBlank(message = "请输入推送类型")
-    private String  type;//5-检验，6-检查
-    private String symptom;
-    private String diag;
-    private String vital;
-    private List<EMRLisResultVO> lis;
-    private String pacs;
-    private String past;
-    private String other;
-}

tran-service/src/main/java/com/diagbot/dto/EMRInfoDTO.java

@@ -1,4 +1,4 @@
-package com.diagbot.dto;
+package com.diagbot.vo;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -6,9 +6,10 @@ import lombok.Setter;
 /**
  * @Description:
  * @Author:zhaops
- * @time: 2019/3/11 11:23
+ * @time: 2019/3/12 10:45
  */
 @Getter
 @Setter
-public class EMRInfoDTO {
+public class HosCodeVO {
+    private String hosCode;
 }

tran-service/src/main/java/com/diagbot/vo/LisResult.java

@@ -1,22 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:化验信息
- * @Author:zhaops
- * @time: 2018/12/19 14:03
- */
-@Getter
-@Setter
-public class LisResult {
-    private String name;//套餐名称
-    private String detailName;//化验项名称
-    private String uniqueName;//公表名称
-    private Double value;//值
-    private Double maxValue;//最大值
-    private Double minValue;//最小值
-    private String units;//单位
-    private String otherValue;//其他结果，包括阴性阳性，文字描述等
-}

tran-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -1,31 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 15:35
- */
-@Getter
-@Setter
-public class PushVO {
-    @NotNull(message = "请输入年龄")
-    private Integer age;
-    @NotNull(message = "请输入性别")
-    private Integer sex;
-    @NotBlank(message = "请输入推送类型")
-    private String featureType;//5-检验，6-检查
-    private String symptom;
-    private String diag;
-    private String vital;
-    private List<LisResultVO> lis;
-    private String pacs;
-    private String past;
-    private String other;
-}

tran-service/src/main/java/com/diagbot/web/EMRInfoController.java

@@ -1,42 +0,0 @@
-package com.diagbot.web;
-
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.LisConfigDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.EMRInfoFacade;
-import com.diagbot.vo.EMRInfoVO;
-import com.diagbot.vo.LisHospitalCodeVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 11:40
- */
-@RestController
-@RequestMapping("/EMRInfo")
-@Api(value = "电子病历评级-检验检查指标解读相关API", tags = { "电子病历评级-检验检查指标解读相关API" })
-public class EMRInfoController {
-    @Autowired
-    EMRInfoFacade emrInfoFacade;
-
-    @ApiOperation(value = "电子病历评级检验检测项解读:[by:zhaops]",
-            notes = "name: 标签名称，必填<br>" +
-                    "type: 标签类型，必填<br>" +
-                    "mealName: 套餐名称（检验检查），必填<br>" +
-                    "itemName: 项目名称（检验）<br>" +
-                    "titles(数组): 标题列表<br>")
-    @PostMapping("/getEMRInfo")
-    @SysLogger("getEMRInfo")
-    public RespDTO<List<LisConfigDTO>> getEMRInfo(@RequestBody EMRInfoVO emrInfoVO) {
-        return RespDTO.onSuc(emrInfoFacade.getEMRInfo(emrInfoVO));
-    }
-}

tran-service/src/main/java/com/diagbot/web/EMRPushController.java

@@ -1,51 +0,0 @@
-package com.diagbot.web;
-
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.client.bean.ICSSPushDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.EMRPushFacade;
-import com.diagbot.vo.EMRPushVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 16:46
- */
-@RestController
-@RequestMapping("/EMRPush")
-@Api(value = "电子病历评级-推理相关API", tags = { "电子病历评级-推理相关API" })
-public class EMRPushController {
-    @Autowired
-    EMRPushFacade emrPushFacade;
-
-    @ApiOperation(value = "电子病历评级-推理[by:zhaops]",
-            notes = "age： 年龄(必填)<br>" +
-                    "sex：性别(必填)，1：男，2：女<br>" +
-                    "symptom：症状,String<br>" +
-                    "other：其它史,String<br>" +
-                    "vital：查体,String<br>" +
-                    "lis：化验,Array<br>" +
-                    "lis：mealName：套餐名称(必填),String<br>" +
-                    "lis：itemName：化验项名称(必填),String<br>" +
-                    "lis：uniqueName：公表名称,String<br>" +
-                    "lis：value：值,Double<br>" +
-                    "lis：maxValue：最大值,Double<br>" +
-                    "lis：minValue：最小值,Double<br>" +
-                    "lis：units：单位,String<br>" +
-                    "lis：otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
-                    "pacs：辅检,String<br>" +
-                    "diag：诊断,String<br>" +
-                    "type：类型(必填)，5：化验，6：辅检,String<br>")
-    @PostMapping("/emrPush")
-    @SysLogger("emrPush")
-    public RespDTO<ICSSPushDTO> emrPush(@RequestBody EMRPushVO emrPushVO) {
-        return RespDTO.onSuc(emrPushFacade.emrPush(emrPushVO));
-    }
-}

tran-service/src/main/java/com/diagbot/web/IntroduceTitleConfigController.java

@@ -0,0 +1,36 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.IntroduceTitleConfigFacade;
+import com.diagbot.vo.HosCodeVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/3/12 10:56
+ */
+@RestController
+@RequestMapping("/introduceTitleConfig")
+@Api(value = "提示信息标题映射相关API", tags = { "提示信息标题映射相关API" })
+public class IntroduceTitleConfigController {
+    @Autowired
+    IntroduceTitleConfigFacade introduceTitleConfigFacade;
+
+    @ApiOperation(value = "根据医院编码查询标题映射:[by:zhaops]",
+            notes = "hosCode: 医院编码，必填<br>")
+    @PostMapping("/getTitleMappingHosCode")
+    @SysLogger("getTitleMappingHosCode")
+    public RespDTO<Map<String, String>> getTitleMappingHosCode(@RequestBody HosCodeVO hosCodeVO) {
+        return RespDTO.onSuc(introduceTitleConfigFacade.getTitleMappingHosCode(hosCodeVO.getHosCode()));
+    }
+}

tran-service/src/main/java/com/diagbot/web/PacsConfigController.java

@@ -0,0 +1,37 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.PacsConfigFacade;
+import com.diagbot.vo.HosCodeVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/3/12 10:50
+ */
+@RestController
+@RequestMapping("/pacsConfig")
+@Api(value = "辅检公表映射配置相关API", tags = { "辅检公表映射配置相关API" })
+public class PacsConfigController {
+
+    @Autowired
+    PacsConfigFacade pacsConfigFacade;
+
+    @ApiOperation(value = "根据医院编码查询辅检公表映射:[by:zhaops]",
+            notes = "hosCode: 医院编码，必填<br>")
+    @PostMapping("/getPacsConfigByHosCode")
+    @SysLogger("getPacsConfigByHosCode")
+    public RespDTO<Map<String, String>> getPacsConfigByHosCode(@RequestBody HosCodeVO hosCodeVO) {
+        return RespDTO.onSuc(pacsConfigFacade.getPacsConfigByHosCode(hosCodeVO.getHosCode()));
+    }
+}

tran-service/src/main/java/com/diagbot/web/TranLisConfigController.java

@@ -1,7 +1,9 @@
 package com.diagbot.web;
 
 import java.util.List;
+import java.util.Map;
 
+import com.diagbot.vo.HosCodeVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -33,10 +35,25 @@ public class TranLisConfigController {
 	TranLisConfigFacade tranLisConfigFacade;
 
 	@ApiOperation(value = "根据医院编码查询公表映射配置:[by:wangfeng]", notes = "根据医院编码查询公表映射配置")
-    @PostMapping("/getLisConfigByhospitalId")
-    @SysLogger("getLisConfigByhospitalId")
-	public  RespDTO<List<LisConfigDTO>> getLisConfigByhospitalId(@RequestBody LisHospitalCodeVO lisHospitalCodeVO) {
+	@PostMapping("/getLisConfigByhospitalId")
+	@SysLogger("getLisConfigByhospitalId")
+	public RespDTO<List<LisConfigDTO>> getLisConfigByhospitalId(@RequestBody LisHospitalCodeVO lisHospitalCodeVO) {
 		return RespDTO.onSuc(tranLisConfigFacade.getLisConfigByhospitalIds(lisHospitalCodeVO.getHospitalCode()));
 	}
 
+	@ApiOperation(value = "根据医院编码获取化验公表映射关系-itemName不为空:[by:zhaops]",
+			notes = "hosCode: 医院编码，必填<br>")
+	@PostMapping("/getLisConfigByHosCode_NotEmptyItemName")
+	@SysLogger("getLisConfigByHosCode_NotEmptyItemName")
+	public RespDTO<Map<String, Map<String, String>>> getLisConfigByHosCode_NotEmptyItemName(@RequestBody HosCodeVO hosCodeVO) {
+		return RespDTO.onSuc(tranLisConfigFacade.getLisConfigByHosCode_NotEmptyItemName(hosCodeVO.getHosCode()));
+	}
+
+	@ApiOperation(value = "根据医院编码获取化验公表映射关系-itemName为空 :[by:zhaops]",
+			notes = "hosCode: 医院编码，必填<br>")
+	@PostMapping("/getLisConfigByHosCode_EmptyItemName")
+	@SysLogger("getLisConfigByHosCode_EmptyItemName")
+	public RespDTO<Map<String, String>> getLisConfigByHosCode_EmptyItemName(@RequestBody HosCodeVO hosCodeVO) {
+		return RespDTO.onSuc(tranLisConfigFacade.getLisConfigByHosCode_EmptyItemName(hosCodeVO.getHosCode()));
+	}
 }