Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

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

@@ -1,19 +1,24 @@
 package com.diagbot.client;
 
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.diagbot.client.bean.HosCodeVO;
 import com.diagbot.client.hystrix.TranServiceHystrix;
 import com.diagbot.dto.GetDiseaseIcdDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoVO;
+import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
+import com.diagbot.vo.IndexDataSaveVO;
+import com.diagbot.vo.IndexDataiIds;
 
 /**
  * @Description: 调用信息对接层服务
@@ -48,4 +53,91 @@ public interface TranServiceClient {
      */
     @PostMapping("/patientInfo/getTopPatientInfo")
     RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO);
+
+    /**
+     * 根据医院编码获取化验公表映射关系-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);
+
+    /**
+     * 根据医院编码查询诊断icd映射
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @PostMapping("/diseaseIcd/getDiseaseIcdByHosCode")
+    RespDTO<Map<String, String>> getDiseaseIcdByHosCode(@RequestBody HosCodeVO hosCodeVO);
+
+    /**
+     * 数据服务模式是否对外对接
+     *
+     * @return
+     */
+    @PostMapping("/dataService/isDocking")
+    RespDTO<Boolean> isDocking();
+
+    /**
+     * 根据医院编码获取化验公表映射关系，公表项做key
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @PostMapping("/tranLisConfig/getLisConfigByUniqueNameAndHosCode")
+    RespDTO<Map<String, List<String>>> getLisConfigByUniqueNameAndHosCode(@RequestBody HosCodeVO hosCodeVO);
+
+    /**
+     * 根据医院编码查询辅检公表映射，公表项做key
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @PostMapping("/pacsConfig/getPacsConfigByUniqueNameAndHosCode")
+    RespDTO<Map<String, List<String>>> getPacsConfigByUniqueNameAndHosCode(@RequestBody HosCodeVO hosCodeVO);
+
+	/**
+	 * 指标数据获取
+	 * @param indexDataFindVO
+	 * @return
+	 */
+	@PostMapping(value = "/indexData/getIndexDatas")
+	RespDTO<List<IndexDataDTO>> getIndexDatas(@RequestBody IndexDataiIds indexDataFindVO);
+
+	/**
+	 * 指标数据保存
+	 * @param indexDataSaveVO
+	 * @return
+	 */
+	@PostMapping(value = "/indexData/saveIndexDatas")
+	RespDTO<Boolean> saveIndexDatas(@RequestBody IndexDataSaveVO indexDataSaveVO);
 }

aipt-service/src/main/java/com/diagbot/client/bean/HosCodeVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/3/12 11:05
+ */
+@Getter
+@Setter
+public class HosCodeVO {
+    private String hosCode;
+}

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

@@ -1,18 +1,27 @@
 package com.diagbot.client.hystrix;
 
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
 import com.diagbot.client.TranServiceClient;
+import com.diagbot.client.bean.HosCodeVO;
 import com.diagbot.dto.GetDiseaseIcdDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoVO;
+import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
+import com.diagbot.vo.IndexDataSaveVO;
+import com.diagbot.vo.IndexDataiIds;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
 
 /**
  * @Description: 调用信息对接层服务
@@ -39,4 +48,112 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "getTopPatientInfo");
         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;
+    }
+
+    /**
+     * 根据医院编码查询诊断icd映射
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @Override
+    public RespDTO<Map<String, String>> getDiseaseIcdByHosCode(@RequestBody HosCodeVO hosCodeVO) {
+        log.error("【hystrix】调用{}异常", "getDiseaseIcdByHosCode");
+        return null;
+    }
+
+    /**
+     * 数据服务模式是否对外对接
+     *
+     * @return
+     */
+    @Override
+    public RespDTO<Boolean> isDocking() {
+        log.error("【hystrix】调用{}异常", "isDocking");
+        return null;
+    }
+
+    /**
+     * 根据医院编码获取化验公表映射关系，公表项做key
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @Override
+    public RespDTO<Map<String, List<String>>> getLisConfigByUniqueNameAndHosCode(@RequestBody HosCodeVO hosCodeVO) {
+        log.error("【hystrix】调用{}异常", "getLisConfigByUniqueNameAndHosCode");
+        return null;
+    }
+
+    /**
+     * 根据医院编码查询辅检公表映射，公表项做key
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    @Override
+    public RespDTO<Map<String, List<String>>> getPacsConfigByUniqueNameAndHosCode(@RequestBody HosCodeVO hosCodeVO) {
+        log.error("【hystrix】调用{}异常", "getPacsConfigByUniqueNameAndHosCode");
+        return null;
+    }
+
+	@Override
+	public RespDTO<List<IndexDataDTO>> getIndexDatas(@Valid IndexDataiIds indexDataFindVO) {
+		log.error("【hystrix】调用{}异常", "getIndexDatas");
+		return null;
+	}
+
+	@Override
+	public RespDTO<Boolean> saveIndexDatas(@Valid IndexDataSaveVO indexDataSaveVO) {
+		log.error("【hystrix】调用{}异常", "saveIndexDatas");
+		return null;
+	}
+
 }

aipt-service/src/main/java/com/diagbot/dto/ConceptPushDTO.java

@@ -12,4 +12,6 @@ import lombok.Setter;
 @Setter
 public class ConceptPushDTO extends ConceptBaseDTO {
     private Integer libType;
+    //数据服务模式调用方名称
+    private String clientName;
 }

aipt-service/src/main/java/com/diagbot/dto/DisclaimerInformationDTO.java

@@ -0,0 +1,66 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午4:23:48
+ */
+@Setter
+@Getter
+public class DisclaimerInformationDTO {
+	private Long id;
+
+//    /**
+//     * 记录创建时间
+//     */
+//    private Date gmtCreate;
+//
+//
+//
+//    /**
+//     * 创建人，0表示无创建人值
+//     */
+//    private String creator;
+//
+//    /**
+//     * 主表id
+//     */
+//    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+//    /**
+//     * 1：启动，0：不启用
+//     */
+//    private String status;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+//    /**
+//     * 备注
+//     */
+//    private String remark;
+
+}

aipt-service/src/main/java/com/diagbot/dto/LisResult.java

@@ -3,6 +3,8 @@ package com.diagbot.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @Description:化验信息
  * @Author:zhaops
@@ -19,4 +21,6 @@ public class LisResult {
     private Double minValue;//最小值
     private String units;//单位
     private String otherValue;//其他结果，包括阴性阳性，文字描述等
-}
+    @NotNull(message = "请输入数据来源")
+    private Integer source;
+}

icss-service/src/main/java/com/diagbot/entity/DisclaimerInformation.java

@@ -1,12 +1,12 @@
 package com.diagbot.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 免责申明详情
@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author wangfeng
  * @since 2018-11-20
  */
-@TableName("icss_disclaimer_information")
+@TableName("kl_disclaimer_information")
 public class DisclaimerInformation implements Serializable {
 
     private static final long serialVersionUID = 1L;

triage-service/src/main/java/com/diagbot/enums/ShowTypeEnum.java

@@ -4,14 +4,14 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * @Description:检索显示类型枚举类
- * @author: zhoutg
- * @Date: 2018/10/26 10:35
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午2:31:42
  */
-public enum ShowTypeEnum implements KeyedNamed {
-
-    ITSELF(1, "本体"),
-    SYNONYMS(2, "同义词");
+public enum StatusEnum implements KeyedNamed {
+    Disable(0, "禁用"),
+    Enable(1, "启用");
 
     @Setter
     private Integer key;
@@ -19,13 +19,13 @@ public enum ShowTypeEnum implements KeyedNamed {
     @Setter
     private String name;
 
-    ShowTypeEnum(Integer key, String name) {
+    StatusEnum(Integer key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ShowTypeEnum getEnum(Integer key) {
-        for (ShowTypeEnum item : ShowTypeEnum.values()) {
+    public static StatusEnum getEnum(Integer key) {
+        for (StatusEnum item : StatusEnum.values()) {
             if (item.key == key) {
                 return item;
             }
@@ -34,7 +34,7 @@ public enum ShowTypeEnum implements KeyedNamed {
     }
 
     public static String getName(Integer key) {
-        ShowTypeEnum item = getEnum(key);
+        StatusEnum item = getEnum(key);
         return item != null ? item.name : null;
     }
 
@@ -48,3 +48,4 @@ public enum ShowTypeEnum implements KeyedNamed {
         return name;
     }
 }
+

aipt-service/src/main/java/com/diagbot/facade/ConceptDetailFacade.java

@@ -25,7 +25,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * @Description:
+ * @Description:提示信息
  * @Author:zhaops
  * @time: 2019/5/6 15:03
  */
@@ -52,8 +52,13 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
         conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("concept_id", concept.getId())
-                .apply("find_in_set({0},position)", conceptIntroduceVO.getPosition())
                 .orderByAsc("order_no");
+        if (conceptIntroduceVO.getPosition() != null) {
+            conceptDetailQueryWrapper.apply("find_in_set({0},position)", conceptIntroduceVO.getPosition());
+        }
+        if (ListUtil.isNotEmpty(conceptIntroduceVO.getTitles())) {
+            conceptDetailQueryWrapper.in("title", conceptIntroduceVO.getTitles());
+        }
         List<ConceptDetail> conceptDetailList = this.list(conceptDetailQueryWrapper);
         List<ConceptDetailDTO> conceptDetailDTOList = ListUtil.newArrayList();
         if (ListUtil.isNotEmpty(conceptDetailList)) {
@@ -80,8 +85,13 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
         conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("concept_id", concept.getId())
-                .apply("find_in_set({0},position)", conceptIntroduceVO.getPosition())
                 .orderByAsc("order_no");
+        if (conceptIntroduceVO.getPosition() != null) {
+            conceptDetailQueryWrapper.apply("find_in_set({0},position)", conceptIntroduceVO.getPosition());
+        }
+        if (ListUtil.isNotEmpty(conceptIntroduceVO.getTitles())) {
+            conceptDetailQueryWrapper.in("title", conceptIntroduceVO.getTitles());
+        }
         List<ConceptDetail> conceptDetailList = this.list(conceptDetailQueryWrapper);
         return conceptDetailList;
     }

aipt-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -0,0 +1,38 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.entity.DisclaimerInformation;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.service.impl.DisclaimerInformationServiceImpl;
+import com.diagbot.util.BeanUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月27日 下午3:36:14
+ */
+@Component
+public class DisclaimerInformationFacade extends DisclaimerInformationServiceImpl {
+
+	/**
+	 * 
+	 * @return
+	 */
+	public List<DisclaimerInformationDTO> getDisclaimerInformation() {
+
+		QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
+		disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+				.orderByAsc("order_no");
+		List<DisclaimerInformation> data = list(disclaimerInformation);
+		// getDisclaimerInformationAll();
+		List<DisclaimerInformationDTO> datas = BeanUtil.listCopyTo(data, DisclaimerInformationDTO.class);
+		return datas;
+	}
+
+}

aipt-service/src/main/java/com/diagbot/facade/IndexDataFacade.java

@@ -0,0 +1,138 @@
+package com.diagbot.facade;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.diagbot.client.TranServiceClient;
+import com.diagbot.dto.IndexConfigAndDataDTO;
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.dto.IndexDTO;
+import com.diagbot.dto.IndexDataDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.IndexDataAllVO;
+import com.diagbot.vo.IndexDataFindVO;
+import com.diagbot.vo.IndexDataSaveVO;
+import com.diagbot.vo.IndexDataVO;
+import com.diagbot.vo.IndexDataiIds;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月6日 下午8:04:09
+ */
+@Component
+public class IndexDataFacade {
+
+	@Autowired
+	TranServiceClient tranServiceClient;
+	@Autowired
+	IndexConfigFacade indexConfigFacade;
+
+	/**
+	 * 
+	 * @param indexDataFindVO
+	 * @return
+	 */
+	public IndexConfigAndDataDTO getIndexDataAll(IndexDataFindVO indexDataFindVO) {
+
+		Map<String, Object> indexDataMap = new HashMap<>();
+		indexDataMap.put("diseaseName", indexDataFindVO.getDiseaseName());
+		indexDataMap.put("patientId", indexDataFindVO.getPatientId());
+		indexDataMap.put("startTime", indexDataFindVO.getStartTime());
+		indexDataMap.put("endTime", indexDataFindVO.getEndTime());
+		List<Long> ids = new ArrayList<Long>();
+		// 获取所有需要记录的指标项
+		List<IndexConfigDTO> indexConfigdata = indexConfigFacade.getIndexConfig(indexDataFindVO.getDiseaseName());
+		for (IndexConfigDTO indexconfig : indexConfigdata) {
+			ids.add(indexconfig.getUniqueId());
+		}
+		IndexDataiIds indexDataiIds= new IndexDataiIds();
+		BeanUtil.copyProperties(indexDataFindVO,indexDataiIds);
+		indexDataiIds.setIds(ids);
+		// 获取慢病指标数据
+		RespDTO<List<IndexDataDTO>> dataAll = tranServiceClient.getIndexDatas(indexDataiIds);
+		 if (dataAll == null || !"0".equals(dataAll.code)) {
+	            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+	                    "获取指标数据失败");
+	        }
+		List<IndexDataDTO> data = dataAll.data;
+		List<IndexDTO> list = new ArrayList<IndexDTO>();
+		// 根据公表名分组
+    	//Map<String, List<IndexDataDTO>> dataMap =datas.stream().collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
+		 // 根据公表名分组
+        Map<String, List<IndexDataDTO>> dataMap = data.stream().collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
+		for (String key : dataMap.keySet()) {
+			IndexDTO itemIndexDTO = new IndexDTO();
+			itemIndexDTO.setItemName(key);
+			List<String> indexUnits = new ArrayList<String>();
+			List<String> indexValues = new ArrayList<String>();
+			List<Integer> isAbnormals = new ArrayList<Integer>();
+			List<Date> creatTimes = new ArrayList<Date>();
+			List<IndexDataDTO> indexDatas = dataMap.get(key);
+			for (IndexDataDTO indexDataDTO : indexDatas) {
+				indexUnits.add(indexDataDTO.getIndexUnit());
+				indexValues.add(indexDataDTO.getIndexValue());
+				isAbnormals.add(indexDataDTO.getIsAbnormal());
+				creatTimes.add(indexDataDTO.getCreatTime());
+			}
+
+			itemIndexDTO.setIndexUnit(indexUnits);
+			itemIndexDTO.setIndexValue(indexValues);
+			itemIndexDTO.setIsAbnormal(isAbnormals);
+			itemIndexDTO.setCreatTime(creatTimes);
+			list.add(itemIndexDTO);
+
+		}
+		IndexConfigAndDataDTO indexsData = new IndexConfigAndDataDTO();
+		indexsData.setIndexConfigData(indexConfigFacade.getIndexConfig(indexDataFindVO.getDiseaseName()));
+		indexsData.setIndexData(list);
+		return indexsData;
+
+	}
+
+	public boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
+		boolean res = false;
+		if (null != indexDataSaveVO && ListUtil.isNotEmpty(indexDataSaveVO.getIndexData())) {
+			// 获取所有需要记录的指标项
+			List<IndexConfigDTO> data = indexConfigFacade.getIndexConfig("");
+			// 遍历数据进行保存
+			List<IndexDataVO> indexDataList = new ArrayList<IndexDataVO>();
+			//过滤化验数据
+			List<IndexDataVO> indexDatas = indexDataSaveVO.getIndexData();
+			for (IndexConfigDTO configData : data) {
+				for (IndexDataVO indexDataNew : indexDatas) {
+					if (configData.getIndexUnique().equals(indexDataNew.getIndexUnique())) {
+						IndexDataAllVO indexData = new IndexDataAllVO();
+						indexData.setIndexId(configData.getUniqueId());
+						indexData.setIndexUnique(configData.getIndexUnique());
+						indexData.setCreatTime(indexDataNew.getCreatTime());
+						indexData.setIndexUnit(indexDataNew.getIndexUnit());
+						indexData.setIndexValue(indexDataNew.getIndexValue());
+						indexData.setIsAbnormal(indexDataNew.getIsAbnormal());
+						indexDataList.add(indexData);
+					}
+				}
+			}
+			indexDataSaveVO.setIndexData(indexDataList);
+	        RespDTO<Boolean> resData = tranServiceClient.saveIndexDatas(indexDataSaveVO);
+	        RespDTOUtil.respNGDeal(resData, resData.msg);
+	        res = resData.data;
+		}
+		
+		return res;
+	}
+
+}

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

@@ -4,12 +4,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.client.bean.FeatureRate;
 import com.diagbot.client.bean.GdbResponse;
+import com.diagbot.client.bean.HosCodeVO;
 import com.diagbot.client.bean.MedicalIndication;
 import com.diagbot.client.bean.MedicalIndicationDetail;
 import com.diagbot.client.bean.ResponseData;
-import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.ConceptPushDTO;
+import com.diagbot.dto.LisResult;
 import com.diagbot.dto.PushDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Concept;
 import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.FeatureTypeEnum;
@@ -20,6 +22,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.FastJsonUtils;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.ParamConvertUtil;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.ConceptBaseVO;
 import com.diagbot.vo.SearchVo;
@@ -60,12 +63,30 @@ public class PushFacade {
      */
     public PushDTO pushInner(SearchVo searchVo) {
         PushDTO pushDTO = new PushDTO();
+        //是否对接
+        RespDTO<Boolean> dockingRes = tranServiceClient.isDocking();
+        Boolean isDocking = false;
+        if (RespDTOUtil.respIsOK(dockingRes)) {
+            isDocking = dockingRes.data;
+            if (isDocking) {
+                if (StringUtil.isBlank(searchVo.getHosCode())) {
+                    throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入医院编码");
+                }
+            }
+        }
+        //化验转公表项处理
+        if (isDocking) {
+            List<LisResult> lisArr = searchVo.getLisArr();
+            lisArr = addUniqueName(lisArr, searchVo.getHosCode());
+            searchVo.setLisArr(lisArr);
+        }
         ResponseData data = clinicalFacade.processClinicalData(searchVo);
 
         String featureType = searchVo.getFeatureType();
         String[] featureTypes = featureType.split(",|，");
         Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
 
+
         //确定推送科室
         List<FeatureRate> dis = data.getDis();
         pushDTO.setDept(getDept(dis));
@@ -96,7 +117,11 @@ public class PushFacade {
             if (ListUtil.isNotEmpty(lis)) {
                 List<String> nameList = lis.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(nameList)) {
-                    pushDTO.setLab(getConceptDTOList(nameList, LexiconTypeEnum.LIS_TABLES.getKey()));
+                    List<ConceptPushDTO> lisDTO = getConceptDTOList(nameList, LexiconTypeEnum.LIS_TABLES.getKey());
+                    if (isDocking) {
+                        lisDTO = addClientName(lisDTO, searchVo.getHosCode(), ConceptTypeEnum.Lis.getKey());
+                    }
+                    pushDTO.setLab(lisDTO);
                 }
             }
         }
@@ -106,7 +131,11 @@ public class PushFacade {
             if (ListUtil.isNotEmpty(pacs)) {
                 List<String> nameList = pacs.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(nameList)) {
-                    pushDTO.setPacs(getConceptDTOList(nameList, LexiconTypeEnum.PACS_ITEMS.getKey()));
+                    List<ConceptPushDTO> pacsDTO = getConceptDTOList(nameList, LexiconTypeEnum.PACS_ITEMS.getKey());
+                    if (isDocking) {
+                        pacsDTO = addClientName(pacsDTO, searchVo.getHosCode(), ConceptTypeEnum.Pacs.getKey());
+                    }
+                    pushDTO.setPacs(pacsDTO);
                 }
             }
         }
@@ -133,6 +162,9 @@ public class PushFacade {
                         }
                         if (ListUtil.isNotEmpty(hrNameList)) {
                             List<ConceptPushDTO> hrDisDTO = getConceptDTOList(hrNameList, LexiconTypeEnum.DIAGNOSIS.getKey());
+                            if (isDocking) {
+                                hrDisDTO = addClientName(hrDisDTO, searchVo.getHosCode(), ConceptTypeEnum.Disease.getKey());
+                            }
                             disMapDTO.put("警惕", hrDisDTO);
                         }
                     }
@@ -156,6 +188,9 @@ public class PushFacade {
                     List<String> nameListByDisClass = entry.getValue().stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
                     if (ListUtil.isNotEmpty(nameListByDisClass)) {
                         List<ConceptPushDTO> disDTO = getConceptDTOList(nameListByDisClass, LexiconTypeEnum.DIAGNOSIS.getKey());
+                        if (isDocking) {
+                            disDTO = addClientName(disDTO, searchVo.getHosCode(), ConceptTypeEnum.Disease.getKey());
+                        }
                         disMapDTO.put(entry.getKey(), disDTO);
                     }
                 }
@@ -221,6 +256,16 @@ public class PushFacade {
         }
     }
 
+    /**
+     * 获取量表推理内容
+     *
+     * @param searchVo
+     * @return
+     */
+    public Map<String, Object> scale(SearchVo searchVo) {
+        Map<String, Object> data = clinicalFacade.scale(searchVo);
+        return data;
+    }
 
     /**
      * 获取治疗方案
@@ -299,4 +344,90 @@ public class PushFacade {
         }
         return deptDTO;
     }
+
+    /**
+     * 增加化验公表项
+     *
+     * @param lisResults
+     * @param hosCode
+     * @return
+     */
+    public List<LisResult> addUniqueName(List<LisResult> lisResults, String hosCode) {
+        HosCodeVO hosCodeVO = new HosCodeVO();
+        hosCodeVO.setHosCode(hosCode);
+        //化验项转公表内容,参数处理
+        if (ListUtil.isNotEmpty(lisResults)) {
+            RespDTO<Map<String, Map<String, String>>> lisConfigRes = tranServiceClient.getLisConfigByHosCode_NotEmptyItemName(hosCodeVO);
+            RespDTO<Map<String, String>> lisConfigWithEmptyItemNameRes = tranServiceClient.getLisConfigByHosCode_EmptyItemName(hosCodeVO);
+            Map<String, Map<String, String>> lisConfigMap = new LinkedHashMap<>();
+            Map<String, String> lisConfigMap_emptyItemName = new LinkedHashMap<>();
+            if (RespDTOUtil.respIsOK(lisConfigRes)) {
+                lisConfigMap = lisConfigRes.data;
+            }
+            if (RespDTOUtil.respIsOK(lisConfigWithEmptyItemNameRes)) {
+                lisConfigMap_emptyItemName = lisConfigWithEmptyItemNameRes.data;
+            }
+
+            for (LisResult lisResult : lisResults) {
+                if (StringUtil.isNotBlank(lisResult.getName())) {
+                    if (StringUtil.isNotBlank(lisResult.getDetailName())) {
+                        if (lisConfigMap.get(lisResult.getName()) != null) {
+                            lisResult.setUniqueName(lisConfigMap.get(lisResult.getName()).get(lisResult.getDetailName()));
+                        }
+                    } else {
+                        lisResult.setUniqueName(lisConfigMap_emptyItemName.get(lisResult.getName()));
+                    }
+                }
+            }
+        }
+        return lisResults;
+    }
+
+    /**
+     * 添加外部名称（调用方）
+     *
+     * @param concepts
+     * @param hosCode
+     * @param type
+     * @return
+     */
+    public List<ConceptPushDTO> addClientName(List<ConceptPushDTO> concepts, String hosCode, Integer type) {
+        HosCodeVO hosCodeVO = new HosCodeVO();
+        hosCodeVO.setHosCode(hosCode);
+        if (type.equals(ConceptTypeEnum.Lis.getKey())) {
+            RespDTO<Map<String, List<String>>> lisRes = tranServiceClient.getLisConfigByUniqueNameAndHosCode(hosCodeVO);
+            if (RespDTOUtil.respIsOK(lisRes)) {
+                Map<String, List<String>> lisMappingByUniqueName = lisRes.data;
+                for (ConceptPushDTO concept : concepts) {
+                    List<String> clientNames = lisMappingByUniqueName.get(concept.getName());
+                    if (ListUtil.isNotEmpty(clientNames)) {
+                        concept.setClientName(clientNames.get(0));
+                    }
+                }
+            }
+        } else if (type.equals(ConceptTypeEnum.Pacs.getKey())) {
+            RespDTO<Map<String, List<String>>> pacsRes = tranServiceClient.getPacsConfigByUniqueNameAndHosCode(hosCodeVO);
+            if (RespDTOUtil.respIsOK(pacsRes)) {
+                Map<String, List<String>> pacsConfigMapByUniqueName = pacsRes.data;
+                for (ConceptPushDTO concept : concepts) {
+                    List<String> clientNames = pacsConfigMapByUniqueName.get(concept.getName());
+                    if (ListUtil.isNotEmpty(clientNames)) {
+                        concept.setClientName(clientNames.get(0));
+                    }
+                }
+            }
+        } else if (type.equals(ConceptTypeEnum.Disease.getKey())) {
+            RespDTO<Map<String, String>> disRes = tranServiceClient.getDiseaseIcdByHosCode(hosCodeVO);
+            if (RespDTOUtil.respIsOK(disRes)) {
+                Map<String, String> disMap = disRes.data;
+                for (ConceptPushDTO concept : concepts) {
+                    String clientName = disMap.get(concept.getName());
+                    if (StringUtil.isNotBlank(clientName)) {
+                        concept.setClientName(disMap.get(concept.getName()));
+                    }
+                }
+            }
+        }
+        return concepts;
+    }
 }

aipt-service/src/main/java/com/diagbot/facade/TreatmentFacade.java

@@ -150,7 +150,7 @@ public class TreatmentFacade {
         retMap.put("treatment", drugsList);
 
         //判断是否慢病，慢病增加回访时间，上次用药，不良反应
-        if (disType.equals(DisTypeEnum.CHRONIC.getKey())) {
+        if (disType != null && disType.equals(DisTypeEnum.CHRONIC.getKey())) {
             //验证是否慢病
             conceptBaseVO.setName("慢病");
             conceptBaseVO.setLibType(LexiconTypeEnum.TYPES_OF_DISEASE.getKey());

icss-service/src/main/java/com/diagbot/mapper/DisclaimerInformationMapper.java

@@ -1,12 +1,11 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.entity.DisclaimerInformation;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 /**
  * <p>
  * 免责申明详情 Mapper 接口

aipt-service/src/main/java/com/diagbot/vo/ConceptIntroduceVO.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:获取提示信息入参
@@ -13,6 +14,6 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 public class ConceptIntroduceVO extends ConceptBaseVO {
-    @NotNull(message = "请输入展示位置")
     private Integer position;
+    private List<String> titles;
 }

aipt-service/src/main/java/com/diagbot/vo/IndexDataAllVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月9日 上午9:50:05
+ */
+@Setter
+@Getter
+public class IndexDataAllVO extends IndexDataVO{
+
+	private Long indexId;
+}

aipt-service/src/main/java/com/diagbot/vo/SearchVo.java

@@ -34,4 +34,5 @@ public class SearchVo {
     private String indications; //指标结果
     private String adverseReactions; //不良反应
     private Integer disType;    //诊断类型
+    private String hosCode;  // 对接时，hosCode必填
 }

aipt-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -0,0 +1,41 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DisclaimerInformationFacade;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * @author wangfeng
+ * @Description: 免责申明详情 前端控制器
+ * @date 2018年11月27日 下午3:35:57
+ */
+@RestController
+@RequestMapping("/disclaimerInformation")
+@Api(value = "免责申明详情API[by:wangfeng]", tags = { "WF——免责申明详情API" })
+@SuppressWarnings("unchecked")
+public class DisclaimerInformationController {
+
+    @Autowired
+    DisclaimerInformationFacade disclaimerInformationFacade;
+
+    @ApiOperation(value = "获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
+    @PostMapping("/getDisclaimerInformations")
+    @SysLogger("getDisclaimerInformations")
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
+
+        List<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation();
+
+        return RespDTO.onSuc(data);
+    }
+}

aipt-service/src/main/java/com/diagbot/web/IndexDataController.java

@@ -0,0 +1,59 @@
+package com.diagbot.web;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+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 com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.IndexConfigAndDataDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.IndexDataFacade;
+import com.diagbot.vo.IndexDataFindVO;
+import com.diagbot.vo.IndexDataSaveVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <p>
+ * 指标数据表 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-05-06
+ */
+@RestController
+@RequestMapping("/indexData")
+@Api(value = "指标数据API[by:wangfeng]", tags = { "知识库标准化-指标数据API" })
+@SuppressWarnings("unchecked")
+public class IndexDataController {
+
+	@Autowired
+	IndexDataFacade indexDataFacade;
+
+	@ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]", notes = "diseaseName：疾病名  必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
+	@PostMapping("/getIndexDatas")
+	@SysLogger("getIndexDatas")
+	public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
+
+		IndexConfigAndDataDTO data = indexDataFacade.getIndexDataAll(indexDataFindVO);
+
+		return RespDTO.onSuc(data);
+	}
+
+	@ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
+	@PostMapping("/saveIndexDatas")
+	@SysLogger("saveIndexDatas")
+	@Transactional
+	public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
+
+		boolean res = indexDataFacade.saveIndexDatas(indexDataSaveVO);
+
+		return RespDTO.onSuc(res);
+	}
+}

icss-service/src/main/resources/mapper/DisclaimerInformationMapper.xml

@@ -30,7 +30,7 @@
 		status as status,
 		disclaimer_code as disclaimerCode,
 		remark as remark
-		FROM icss_disclaimer_information
+		FROM kl_disclaimer_information
 		WHERE is_deleted = "N"
 		and STATUS = '1'
 		AND version_id =0

config-server/src/main/resources/shared/knowledgeman-service-dev.yml

@@ -101,3 +101,10 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+fastdfs:
+  connect_timeout_in_seconds: 60
+  network_timeout_in_seconds: 60
+  charset: UTF-8
+  http_tracker_http_port: 8080
+  http_anti_steal_token: no
+  tracker_servers: 192.168.2.236:22122

config-server/src/main/resources/shared/knowledgeman-service-local.yml

@@ -101,3 +101,10 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+fastdfs:
+  connect_timeout_in_seconds: 60
+  network_timeout_in_seconds: 60
+  charset: UTF-8
+  http_tracker_http_port: 8080
+  http_anti_steal_token: no
+  tracker_servers: 192.168.2.236:22122

config-server/src/main/resources/shared/knowledgeman-service-pro.yml

@@ -101,3 +101,10 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+fastdfs:
+  connect_timeout_in_seconds: 60
+  network_timeout_in_seconds: 60
+  charset: UTF-8
+  http_tracker_http_port: 8080
+  http_anti_steal_token: no
+  tracker_servers: 192.168.2.236:22122

config-server/src/main/resources/shared/knowledgeman-service-test.yml

@@ -101,3 +101,10 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+fastdfs:
+  connect_timeout_in_seconds: 60
+  network_timeout_in_seconds: 60
+  charset: UTF-8
+  http_tracker_http_port: 8080
+  http_anti_steal_token: no
+  tracker_servers: 192.168.2.241:22122

config-server/src/main/resources/shared/triage-service-dev.yml

@@ -3,53 +3,6 @@ server:
 
 # 驱动配置信息
 spring:
-  datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-triage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-      username: root
-      password: lantone
-      # 连接池的配置信息
-      # 初始化大小，最小，最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache，并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
-          enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
-
   cloud:
     stream:
       bindings:
@@ -65,35 +18,3 @@ spring:
     password: lantone
     publisher-confirms: true
     virtual-host: /
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-ai:
-  server:
-    address: http://192.168.2.234:8080

config-server/src/main/resources/shared/triage-service-local.yml

@@ -3,53 +3,6 @@ server:
 
 # 驱动配置信息
 spring:
-  datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-triage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-      username: root
-      password: lantone
-      # 连接池的配置信息
-      # 初始化大小，最小，最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache，并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
-          enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
-
   cloud:
     stream:
       bindings:
@@ -65,35 +18,3 @@ spring:
     password: guest
     publisher-confirms: true
     virtual-host: /
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-ai:
-  server:
-    address: http://192.168.2.234:8080

config-server/src/main/resources/shared/triage-service-pro.yml

@@ -3,53 +3,6 @@ server:
 
 # 驱动配置信息
 spring:
-  datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-triage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-      username: root
-      password: lantone
-      # 连接池的配置信息
-      # 初始化大小，最小，最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache，并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
-          enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
-
   cloud:
     stream:
       bindings:
@@ -65,35 +18,3 @@ spring:
     password: lantone
     publisher-confirms: true
     virtual-host: /
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-ai:
-  server:
-    address: http://192.168.2.234:8080

config-server/src/main/resources/shared/triage-service-test.yml

@@ -3,53 +3,6 @@ server:
 
 # 驱动配置信息
 spring:
-  datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-triage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-      username: root
-      password: lantone
-      # 连接池的配置信息
-      # 初始化大小，最小，最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache，并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
-          enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
-
   cloud:
     stream:
       bindings:
@@ -65,35 +18,3 @@ spring:
     password: lantone
     publisher-confirms: true
     virtual-host: /
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-ai:
-  server:
-    address: http://192.168.2.234:8080

data-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -1,7 +1,21 @@
 package com.diagbot.client;
 
+import com.diagbot.client.bean.CalculateData;
+import com.diagbot.client.bean.ScaleContent;
+import com.diagbot.client.bean.SearchData;
 import com.diagbot.client.hystrix.AiptServiceHystrix;
+import com.diagbot.dto.ConceptIntroduceDTO;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.PushDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.vo.ConceptIntroduceVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 调用知识库服务
@@ -11,4 +25,51 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "aipt-service", fallback = AiptServiceHystrix.class)
 public interface AiptServiceClient {
 
+    /**
+     * 推理
+     *
+     * @param searchData
+     * @return
+     */
+    @PostMapping("/push/pushInner")
+    RespDTO<PushDTO> pushInner(@RequestBody SearchData searchData);
+
+    /**
+     * 获取治疗方案
+     *
+     * @param searchData
+     * @return
+     */
+    @PostMapping("/push/treatment")
+    RespDTO<Map<String, Object>> getTreatment(@RequestBody SearchData searchData);
+
+    @PostMapping("/disclaimerInformation/getDisclaimerInformations")
+    RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations();
+
+    /**
+     * 计算接口-量表/公式
+     *
+     * @param calculateData
+     * @return
+     */
+    @PostMapping(value = "/clinicaldata/scaleCalc")
+    RespDTO<Map<String, Object>> scaleCalc(@RequestBody CalculateData calculateData);
+
+    /**
+     * 获取量表接口
+     *
+     * @param searchData
+     * @return
+     */
+    @PostMapping(value = "/clinicaldata/getScale")
+    RespDTO<List<ScaleContent>> getScale(@RequestBody SearchData searchData);
+
+    /**
+     * 获取提示信息
+     *
+     * @param conceptIntroduceVO
+     * @return
+     */
+    @PostMapping(value = "/conceptDetail/getConceptDetail")
+    RespDTO<ConceptIntroduceDTO> getConceptDetail(@Valid @RequestBody ConceptIntroduceVO conceptIntroduceVO);
 }

data-service/src/main/java/com/diagbot/client/bean/CalculateData.java

@@ -0,0 +1,17 @@
+package com.diagbot.client.bean;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:计算接口入参
+ * @Author:zhaops
+ * @time: 2019/4/24 15:15
+ */
+@Getter
+@Setter
+public class CalculateData {
+    private Integer type;  //1-量表，2-计算公式
+    private JSONObject data;
+}

data-service/src/main/java/com/diagbot/client/bean/LisResult.java

@@ -0,0 +1,26 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @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;//其他结果，包括阴性阳性，文字描述等
+    @NotNull(message = "请输入数据来源")
+    private Integer source;
+}

data-service/src/main/java/com/diagbot/client/bean/MedicalIndication.java

@@ -0,0 +1,21 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+
+/**
+ * @Description:推送指标
+ * @Author:zhaops
+ * @time: 2019/3/14 14:40
+ */
+@Getter
+@Setter
+public class MedicalIndication {
+    private Long conceptId;
+    private Integer libType;
+    private String name;
+    private List<MedicalIndicationDetail> details;
+}

data-service/src/main/java/com/diagbot/client/bean/MedicalIndicationDetail.java

@@ -0,0 +1,17 @@
+package com.diagbot.client.bean;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:推送指标明细
+ * @Author:zhaops
+ * @time: 2019/4/11 10:15
+ */
+@Getter
+@Setter
+public class MedicalIndicationDetail {
+    private Integer type; //1-量表，2-公式，3-其他指标
+    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""}
+}

data-service/src/main/java/com/diagbot/client/bean/ScaleContent.java

@@ -0,0 +1,37 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 量表内容表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-11
+ */
+@Getter
+@Setter
+public class ScaleContent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 量表概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 0:文本，1：大数据接口填充
+     */
+    private Integer type;
+
+}

data-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -0,0 +1,36 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * Created by fyeman on 2018/1/31.
+ */
+@Getter
+@Setter
+public class SearchData {
+    private int length;
+    private int age;
+    private String sex;
+    //特征类别
+    private String featureType;
+    //外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
+    private String sysCode;
+    private String symptom;
+    private String past;
+    private String other;
+    private String vital;
+    private String lis;
+    private List<LisResult> lisArr;
+    private String pacs;
+    private String diag;
+    private String diseaseName; //指定诊断，例如取治疗方案
+    private String scaleName;   //量表名称
+    private String indications; //指标结果
+    private String adverseReactions; //不良反应
+    private Integer disType;    //诊断类型
+    private String adverseEvent;
+    private String hosCode;
+}

data-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -1,8 +1,21 @@
 package com.diagbot.client.hystrix;
 
 import com.diagbot.client.AiptServiceClient;
+import com.diagbot.client.bean.CalculateData;
+import com.diagbot.client.bean.ScaleContent;
+import com.diagbot.client.bean.SearchData;
+import com.diagbot.dto.ConceptIntroduceDTO;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.PushDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.vo.ConceptIntroduceVO;
 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;
+import java.util.Map;
 
 /**
  * @Description: 调用知识库服务
@@ -12,4 +25,69 @@ import org.springframework.stereotype.Component;
 @Component
 @Slf4j
 public class AiptServiceHystrix implements AiptServiceClient {
+    /**
+     * 推理
+     *
+     * @param searchData
+     * @return
+     */
+    @Override
+    public RespDTO<PushDTO> pushInner(@RequestBody SearchData searchData) {
+        log.error("【hystrix】调用{}异常", "pushInner");
+        return null;
+    }
+
+    /**
+     * 获取治疗方案
+     *
+     * @param searchData
+     * @return
+     */
+    @Override
+    public RespDTO<Map<String, Object>> getTreatment(@RequestBody SearchData searchData) {
+        log.error("【hystrix】调用{}异常", "getTreatment");
+        return null;
+    }
+
+    @Override
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
+        log.error("【hystrix】调用{}异常", "getDisclaimerInformations");
+        return null;
+    }
+
+    /**
+     * 计算接口-量表/公式
+     *
+     * @param calculateData
+     * @return
+     */
+    @Override
+    public RespDTO<Map<String, Object>> scaleCalc(@RequestBody CalculateData calculateData) {
+        log.error("【hystrix】调用{}异常", "scaleCalc");
+        return null;
+    }
+
+    /**
+     * 获取量表接口
+     *
+     * @param searchData
+     * @return
+     */
+    @Override
+    public RespDTO<List<ScaleContent>> getScale(@RequestBody SearchData searchData) {
+        log.error("【hystrix】调用{}异常", "getScale");
+        return null;
+    }
+
+    /**
+     * 获取提示信息
+     *
+     * @param conceptIntroduceVO
+     * @return
+     */
+    @Override
+    public RespDTO<ConceptIntroduceDTO> getConceptDetail(@Valid @RequestBody ConceptIntroduceVO conceptIntroduceVO) {
+        log.error("【hystrix】调用{}异常", "getConceptDetail");
+        return null;
+    }
 }

data-service/src/main/java/com/diagbot/dto/ConceptBaseDTO.java

@@ -0,0 +1,16 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 概念出参基础实体类
+ * @author: gaodm
+ * @time: 2019/5/7 9:44
+ */
+@Getter
+@Setter
+public class ConceptBaseDTO {
+    private Long conceptId; // 概念id
+    private String name;    //概念名称
+}

data-service/src/main/java/com/diagbot/dto/ConceptDetailDTO.java

@@ -0,0 +1,33 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:提示信息明细
+ * @Author:zhaops
+ * @time: 2019/5/6 16:33
+ */
+@Getter
+@Setter
+public class ConceptDetailDTO {
+    /**
+     * 提示明细标题
+     */
+    private String title;
+
+    /**
+     * 提示明细内容
+     */
+    private String content;
+
+    /**
+     * 纯文本
+     */
+    private String text;
+
+    /**
+     * 是否诊断依据（1-是，0-否）
+     */
+    private Integer isReason;
+}

data-service/src/main/java/com/diagbot/dto/ConceptIntroduceDTO.java

@@ -0,0 +1,17 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/13 20:24
+ */
+@Getter
+@Setter
+public class ConceptIntroduceDTO extends ConceptBaseDTO {
+    private List<ConceptDetailDTO> details;
+}

data-service/src/main/java/com/diagbot/dto/ConceptPushDTO.java

@@ -0,0 +1,16 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:推理返回标签（概念）
+ * @Author:zhaops
+ * @time: 2019/5/7 20:06
+ */
+@Getter
+@Setter
+public class ConceptPushDTO extends ConceptBaseDTO {
+    private Integer libType;  //词性
+    private String clientName;//数据服务模式调用方名称
+}

data-service/src/main/java/com/diagbot/dto/DisclaimerInformationDTO.java

@@ -0,0 +1,64 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ *
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午4:23:48
+ */
+@Setter
+@Getter
+public class DisclaimerInformationDTO {
+    private Long id;
+
+    //    /**
+    //     * 记录创建时间
+    //     */
+    //    private Date gmtCreate;
+    //
+    //
+    //
+    //    /**
+    //     * 创建人，0表示无创建人值
+    //     */
+    //    private String creator;
+    //
+    //    /**
+    //     * 主表id
+    //     */
+    //    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    //    /**
+    //     * 1：启动，0：不启用
+    //     */
+    //    private String status;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+    //    /**
+    //     * 备注
+    //     */
+    //    private String remark;
+
+}

data-service/src/main/java/com/diagbot/dto/PushDTO.java

@@ -0,0 +1,25 @@
+package com.diagbot.dto;
+
+import com.diagbot.client.bean.MedicalIndication;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 推理出参
+ * @Author:zhaops
+ * @time: 2018/11/20 13:44
+ */
+@Getter
+@Setter
+public class PushDTO {
+    private List<ConceptPushDTO> symptom;
+    private List<ConceptPushDTO> other;
+    private List<ConceptPushDTO> vital;
+    private List<ConceptPushDTO> lab;
+    private List<ConceptPushDTO> pacs;
+    private Map<String, List<ConceptPushDTO>> dis;
+    private List<MedicalIndication> medicalIndications;
+}

data-service/src/main/java/com/diagbot/entity/User.java

@@ -1,136 +0,0 @@
-package com.diagbot.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 系统用户表
- * </p>
- *
- * @author gaodm
- * @since 2018-08-30
- */
-public class User implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户ID
-     */
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 用户密码
-     */
-    private String password;
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    @Override
-    public String toString() {
-        return "User{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", password=" + password +
-                ", username=" + username +
-                "}";
-    }
-}

data-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -0,0 +1,57 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 推送类型
+ * @Author:zhaops
+ * @time: 2019/3/14 11:28
+ */
+public enum FeatureTypeEnum implements KeyedNamed {
+    Symptom(1, "症状"),
+    Other(3, "其他史"),
+    Vital(4, "查体"),
+    Lis(5, "化验"),
+    Pacs(6, "辅检"),
+    Disease(7, "诊断"),
+    Treat(8, "治疗"),
+    Scale(21, "量表内容"),
+    MedicalIndication(22, "指标"),
+    ManagementEvaluation(11, "管理评估");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    FeatureTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static FeatureTypeEnum getEnum(Integer key) {
+        for (FeatureTypeEnum item : FeatureTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        FeatureTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

data-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -0,0 +1,53 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.bean.SearchData;
+import com.diagbot.vo.PushVO;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/9 15:40
+ */
+@Component
+public class AssembleFacade {
+
+    /**
+     * 拼装数据
+     *
+     * @param pushVO
+     * @return SearchData
+     */
+    public SearchData assembleData(PushVO pushVO) {
+        SearchData searchData = new SearchData();
+        searchData.setAge(pushVO.getAge());
+        searchData.setSymptom(pushVO.getSymptom());
+        searchData.setVital(pushVO.getVital());
+        searchData.setPacs(pushVO.getPacs());
+        searchData.setPast(pushVO.getPast());
+        searchData.setOther(pushVO.getOther());
+        searchData.setDiag(pushVO.getDiag());
+        searchData.setDisType(pushVO.getDisType());
+        searchData.setAdverseEvent(pushVO.getAdverseReactions());
+        searchData.setScaleName(pushVO.getScaleName());
+        searchData.setDiseaseName(pushVO.getDiseaseName());
+        searchData.setIndications(pushVO.getIndications());
+        searchData.setFeatureType(pushVO.getFeatureType());
+        searchData.setSysCode("1");
+        searchData.setLength(10);
+        searchData.setHosCode(pushVO.getHosCode());
+
+        switch (pushVO.getSex()) {
+            case 1:
+                searchData.setSex("M");
+                break;
+            case 2:
+                searchData.setSex("F");
+                break;
+            default:
+                searchData.setSex("A");
+                break;
+        }
+        return searchData;
+    }
+}

data-service/src/main/java/com/diagbot/facade/CalculateFacade.java

@@ -0,0 +1,28 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.CalculateVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/13 20:19
+ */
+@Component
+public class CalculateFacade {
+    @Autowired
+    AiptServiceClient aiptServiceClient;
+
+    public Map<String, Object> calculate(CalculateVO calculateVO) {
+        RespDTO<Map<String, Object>> res = aiptServiceClient.scaleCalc(calculateVO);
+        RespDTOUtil.respNGDealCover(res, "计算没有结果返回");
+        Map<String, Object> map = res.data;
+        return map;
+    }
+}

data-service/src/main/java/com/diagbot/facade/ConceptDetailFacade.java

@@ -0,0 +1,26 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.ConceptIntroduceDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.ConceptIntroduceVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/14 9:49
+ */
+@Component
+public class ConceptDetailFacade {
+    @Autowired
+    private AiptServiceClient aiptServiceClient;
+
+    public ConceptIntroduceDTO getConceptDetail(ConceptIntroduceVO conceptIntroduceVO) {
+        RespDTO<ConceptIntroduceDTO> res = aiptServiceClient.getConceptDetail(conceptIntroduceVO);
+        RespDTOUtil.respNGDeal(res, "获取提示信息失败");
+        return res.data;
+    }
+}

data-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -0,0 +1,33 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.util.RespDTOUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月27日 下午3:36:14
+ */
+@Component
+public class DisclaimerInformationFacade {
+
+	@Autowired
+	private AiptServiceClient aiptServiceClient;
+	/**
+	 * 
+	 * @return
+	 */
+	public List<DisclaimerInformationDTO> getDisclaimerInformation() {
+		RespDTO<List<DisclaimerInformationDTO>> res =  aiptServiceClient.getDisclaimerInformations();
+		RespDTOUtil.respNGDealCover(res, "获取免责声明失败");
+		return res.data;
+	}
+
+}

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

@@ -0,0 +1,112 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.client.bean.ScaleContent;
+import com.diagbot.client.bean.SearchData;
+import com.diagbot.dto.ConceptPushDTO;
+import com.diagbot.dto.PushDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.enums.FeatureTypeEnum;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.PushVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/13 17:47
+ */
+@Component
+public class PushFacade {
+    @Autowired
+    AiptServiceClient aiptServiceClient;
+    @Autowired
+    AssembleFacade assembleFacade;
+
+    /**
+     * 推理接口
+     *
+     * @param pushVO
+     * @return
+     */
+    public PushDTO push(PushVO pushVO) {
+        PushDTO pushDTO = new PushDTO();
+        SearchData searchData = assembleFacade.assembleData(pushVO);
+        RespDTO<PushDTO> respDTO = aiptServiceClient.pushInner(searchData);
+        PushDTO data = new PushDTO();
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            data = respDTO.data;
+        }
+
+        String featureType = searchData.getFeatureType();
+        String[] featureTypes = featureType.split(",|，");
+        Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
+
+        //症状
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Symptom.getKey()))) {
+            List<ConceptPushDTO> symptom = data.getSymptom();
+            pushDTO.setSymptom(symptom);
+        }
+        //其他史
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Other.getKey()))) {
+        }
+        //查体
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Vital.getKey()))) {
+            List<ConceptPushDTO> vitals = data.getVital();
+            pushDTO.setVital(vitals);
+        }
+        //化验
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Lis.getKey()))) {
+            List<ConceptPushDTO> labs = data.getLab();
+            pushDTO.setLab(labs);
+        }
+        //辅检
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Pacs.getKey()))) {
+            pushDTO.setPacs(data.getPacs());
+        }
+        //诊断
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Disease.getKey()))) {
+            pushDTO.setDis(data.getDis());
+        }
+        //推送指标
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.MedicalIndication.getKey()))) {
+            pushDTO.setMedicalIndications(data.getMedicalIndications());
+        }
+        return pushDTO;
+    }
+
+    /**
+     * 治疗方案推送-不包含慢病内容
+     *
+     * @param pushVO
+     * @return
+     */
+    public Map<String, Object> pushTreatment(PushVO pushVO) {
+        SearchData searchData = assembleFacade.assembleData(pushVO);
+        RespDTO<Map<String, Object>> res = aiptServiceClient.getTreatment(searchData);
+        RespDTOUtil.respNGDealCover(res, "中间层没有返回治疗方案");
+        Map<String, Object> data = res.data;
+        return data;
+    }
+
+    /**
+     * 治疗方案推送-不包含慢病内容
+     *
+     * @param pushVO
+     * @return
+     */
+    public List<ScaleContent> pushScale(PushVO pushVO) {
+        SearchData searchData = assembleFacade.assembleData(pushVO);
+        RespDTO<List<ScaleContent>> res = aiptServiceClient.getScale(searchData);
+        RespDTOUtil.respNGDealCover(res, "中间层没有返回量表");
+        List<ScaleContent> data = res.data;
+        return data;
+    }
+}

data-service/src/main/java/com/diagbot/facade/SysLogFacade.java

@@ -1,12 +0,0 @@
-package com.diagbot.facade;
-
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 用户日志业务层
- * @author: gaodm
- * @time: 2018/8/6 9:11
- */
-@Component
-public class SysLogFacade {
-}

data-service/src/main/java/com/diagbot/vo/CalculateVO.java

@@ -0,0 +1,11 @@
+package com.diagbot.vo;
+
+import com.diagbot.client.bean.CalculateData;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/13 20:20
+ */
+public class CalculateVO extends CalculateData {
+}

data-service/src/main/java/com/diagbot/vo/ConceptBaseVO.java

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2019/5/6 18:50
+ */
+@Getter
+@Setter
+public class ConceptBaseVO {
+    @NotBlank(message = "概念名称不能为空")
+    private String name;
+    @NotNull(message = "词性不能为空")
+    private Integer libType;
+}

data-service/src/main/java/com/diagbot/vo/ConceptIntroduceVO.java

@@ -0,0 +1,24 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @Description:获取提示信息入参
+ * @Author:zhaops
+ * @time: 2019/5/6 15:43
+ */
+@Getter
+@Setter
+public class ConceptIntroduceVO extends ConceptBaseVO {
+    //此版本暂不提供该过滤条件
+    @ApiModelProperty(hidden = true)
+    private Integer position;
+    //此版本暂不提供该过滤条件
+    @ApiModelProperty(hidden = true)
+    private List<String> titles;
+}

data-service/src/main/java/com/diagbot/vo/PushBaseVO.java

@@ -0,0 +1,32 @@
+package com.diagbot.vo;
+
+import com.diagbot.client.bean.LisResult;
+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/4/17 14:42
+ */
+@Getter
+@Setter
+public class PushBaseVO {
+    @NotNull(message = "请输入年龄")
+    private Integer age;
+    @NotNull(message = "请输入性别")
+    private Integer sex;
+    @NotBlank(message = "请输入推送类型")
+    private String featureType;
+    private String symptom;
+    private String diag;
+    private String vital;
+    private List<LisResult> lis;
+    private String pacs;
+    private String past;
+    private String other;
+}

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

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/20 13:38
+ */
+@Getter
+@Setter
+public class PushVO  extends PushBaseVO {
+    private String diseaseName;
+    private String scaleName; //量表名称
+    @ApiModelProperty(hidden = true)
+    private Integer disType;  //0-普通病（默认不填），1-慢病，2-急诊
+    private String adverseReactions; //不良反应
+    private String indications;   //推理指标
+    private String hosCode;   //医院编码
+}

data-service/src/main/java/com/diagbot/vo/SysLogVo.java

@@ -1,21 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2018/8/6 10:16
- */
-@Getter
-@Setter
-public class SysLogVo {
-    private Date createDate;
-    private String ip;
-    private String method;
-    private String operation;
-    private String params;
-}

data-service/src/main/java/com/diagbot/web/CalculateController.java

@@ -0,0 +1,38 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.CalculateFacade;
+import com.diagbot.vo.CalculateVO;
+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 javax.validation.Valid;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/13 20:15
+ */
+@RestController
+@RequestMapping("/calc")
+@Api(value = "计算相关API", tags = { "数据服务模式-计算相关API" })
+public class CalculateController {
+    @Autowired
+    CalculateFacade calculateFacade;
+
+    @ApiOperation(value = "推理结果计算接口[by:zhaops]",
+            notes = "type： 1-量表，2-计算公式(必填)，Integer<br>" +
+                    "data：计算参数（量表或计算公式结构），String<br>")
+    @PostMapping("/calculate")
+    @SysLogger("calculate")
+    public RespDTO<Map<String, Object>> calculate(@RequestBody @Valid CalculateVO calculateVO) {
+        return RespDTO.onSuc(calculateFacade.calculate(calculateVO));
+    }
+}

data-service/src/main/java/com/diagbot/web/ConceptDetailController.java

@@ -0,0 +1,41 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.ConceptIntroduceDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.ConceptDetailFacade;
+import com.diagbot.vo.ConceptIntroduceVO;
+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 javax.validation.Valid;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/14 9:51
+ */
+@RestController
+@RequestMapping("/conceptDetail")
+@Api(value = "提示信息相关API", tags = { "数据服务模式-提示信息相关API" })
+public class ConceptDetailController {
+    @Autowired
+    private ConceptDetailFacade conceptDetailFacade;
+
+    @ApiOperation(value = "获取提示信息[by:zhaops]",
+            notes = "name: 标签名称，必填<br>" +
+                    "libType：标签类型，必填<br>" +
+                    "titles：提示信息标题列表<br>" +
+                    "position：展示位置（1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应，7-描述信息(智能分诊症状提示信息)）")
+    @PostMapping("/getConceptDetail")
+    @SysLogger("getConceptDetail")
+    public RespDTO<ConceptIntroduceDTO> getConceptDetail(@Valid @RequestBody ConceptIntroduceVO conceptIntroduceVO) {
+        ConceptIntroduceDTO data = conceptDetailFacade.getConceptDetail(conceptIntroduceVO);
+        return RespDTO.onSuc(data);
+    }
+}

data-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -0,0 +1,39 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DisclaimerInformationFacade;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * @author wangfeng
+ * @Description: 免责申明详情 前端控制器
+ * @date 2018年11月27日 下午3:35:57
+ */
+@RestController
+@RequestMapping("/disclaimerInformation")
+@Api(value = "免责申明详情API[by:wangfeng]", tags = { "知识库标准化-免责申明详情API" })
+@SuppressWarnings("unchecked")
+public class DisclaimerInformationController {
+
+    @Autowired
+    DisclaimerInformationFacade disclaimerInformationFacade;
+
+    @ApiOperation(value = "知识库标准化-获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
+    @PostMapping("/getDisclaimerInformations")
+    @SysLogger("getDisclaimerInformations")
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
+        List<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation();
+        return RespDTO.onSuc(data);
+    }
+}

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

@@ -0,0 +1,119 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.PushDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.PushFacade;
+import com.diagbot.vo.PushVO;
+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 javax.validation.Valid;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/13 18:00
+ */
+@RestController
+@RequestMapping("/push")
+@Api(value = "推理相关API", tags = { "数据服务模式-推理相关API" })
+public class PushController {
+    @Autowired
+    PushFacade pushFacade;
+
+    @ApiOperation(value = "数据服务模式-推理[by:zhaops]",
+            notes = "age： 年龄(必填)<br>" +
+                    "sex：性别(必填) 1：男，2：女<br>" +
+                    "symptom：症状,String<br>" +
+                    "other：其它史,String<br>" +
+                    "vital：查体,String<br>" +
+                    "lis：化验,Array<br>" +
+                    "lis：name：套餐名称(必填),String<br>" +
+                    "lis：detailName：化验项名称(必填),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>" +
+                    "lis：source：数据来源（必填）,Integer<br>" +
+                    "pacs：辅检,String<br>" +
+                    "diag：诊断,String<br>" +
+                    "featureType：类型(必填)，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断,22-指标,String<br>" +
+                    "diseaseName：取治疗方案的诊断,String<br>" +
+                    "scaleName：量表名称,String<br>" +
+                    "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
+                    "indications：指标结果,String<br>" +
+                    "adverseReactions：不良反应,String<br>")
+    @PostMapping("/push")
+    @SysLogger("push")
+    public RespDTO<PushDTO> push(@RequestBody @Valid PushVO pushVO) {
+        return RespDTO.onSuc(pushFacade.push(pushVO));
+    }
+
+    @ApiOperation(value = "数据服务模式-治疗方案[by:zhaops]",
+            notes = "age： 年龄(必填)<br>" +
+                    "sex：性别(必填)，1：男，2：女<br>" +
+                    "symptom：症状,String<br>" +
+                    "other：其它史,String<br>" +
+                    "vital：查体,String<br>" +
+                    "lis：化验,Array<br>" +
+                    "lis：name：套餐名称(必填),String<br>" +
+                    "lis：detailName：化验项名称(必填),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>" +
+                    "lis：source：数据来源（必填）,Integer<br>" +
+                    "pacs：辅检,String<br>" +
+                    "diag：诊断,String<br>" +
+                    "featureType：类型(必填)，8：治疗方案,String<br>" +
+                    "diseaeName：取治疗方案的诊断,String<br>" +
+                    "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
+                    "indications：指标结果,String<br>" +
+                    "adverseReactions：不良反应,String<br>")
+    @PostMapping("/pushTreatment")
+    @SysLogger("pushTreatment")
+    public RespDTO<Map<String, Object>> pushTreatment(@RequestBody @Valid PushVO pushVO) {
+        return RespDTO.onSuc(pushFacade.pushTreatment(pushVO));
+    }
+
+    @ApiOperation(value = "数据服务模式-量表[by:zhaops]",
+            notes = "age： 年龄(必填)<br>" +
+                    "sex：性别(必填)，1：男，2：女<br>" +
+                    "symptom：症状,String<br>" +
+                    "other：其它史,String<br>" +
+                    "vital：查体,String<br>" +
+                    "lis：化验,Array<br>" +
+                    "lis：name：套餐名称(必填),String<br>" +
+                    "lis：detailName：化验项名称(必填),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>" +
+                    "lis：source：数据来源（必填）,Integer<br>" +
+                    "pacs：辅检,String<br>" +
+                    "diag：诊断,String<br>" +
+                    "featureType：类型(必填)，21：量表,String<br>" +
+                    "diseaeName：取治疗方案的诊断,String<br>" +
+                    "scaleName：量表名称,String<br>" +
+                    "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
+                    "indications：指标结果,String<br>" +
+                    "adverseReactions：不良反应,String<br>")
+    @PostMapping("/pushScale")
+    @SysLogger("pushScale")
+    public RespDTO<Map<String, Object>> pushScale(@RequestBody @Valid PushVO pushVO) {
+        return RespDTO.onSuc(pushFacade.pushScale(pushVO));
+    }
+}

data-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -1,21 +0,0 @@
-package com.diagbot.web;
-
-
-import com.diagbot.facade.SysLogFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Description: 日志操作控制层
- * @author: gaodm
- * @time: 2018/8/30 10:12
- */
-@RestController
-@RequestMapping("/log")
-public class SysLogController {
-
-    @Autowired
-    private SysLogFacade sysLogFacade;
-}
-

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

@@ -14,6 +14,7 @@ import com.diagbot.dto.ConceptRetrievalDTO;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.dto.DisTypeDTO;
+import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.DiseaseIcdDTO;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.FeatureConceptDTO;
@@ -198,4 +199,8 @@ public interface AiptServiceClient {
      */
     @PostMapping(value = "/indexData/saveIndexDatas")
     RespDTO<Boolean> saveIndexDatas(@RequestBody IndexDataSaveVO indexDataSaveVO);
+
+    @PostMapping("/disclaimerInformation/getDisclaimerInformations")
+    RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations();
+
 }

icss-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -32,5 +32,5 @@ public class SearchData {
     private String indications; //指标结果
     private String adverseReactions; //不良反应
     private Integer disType;    //诊断类型
-    private List<AdverseReaction> adverseEvent;
+    private String adverseEvent;
 }

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

@@ -14,6 +14,7 @@ import com.diagbot.dto.ConceptRetrievalDTO;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.dto.DisTypeDTO;
+import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.DiseaseIcdDTO;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.FeatureConceptDTO;
@@ -260,4 +261,10 @@ public class AiptServiceHystrix implements AiptServiceClient {
         log.error("【hystrix】调用{}异常", "saveIndexDatas");
         return null;
     }
+
+    @Override
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(){
+        log.error("【hystrix】调用{}异常", "getDisclaimerInformations");
+        return null;
+    }
 }

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

@@ -1,14 +1,12 @@
 package com.diagbot.dto;
 
-import java.util.Date;
-
-import com.diagbot.entity.DisclaimerInformation;
-
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
- * 
+ *
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 下午4:23:48
@@ -16,24 +14,24 @@ import lombok.Setter;
 @Setter
 @Getter
 public class DisclaimerInformationDTO {
-	private Long id;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    
+    private Long id;
 
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 主表id
-     */
-    private Long versionId;
+    //    /**
+    //     * 记录创建时间
+    //     */
+    //    private Date gmtCreate;
+    //
+    //
+    //
+    //    /**
+    //     * 创建人，0表示无创建人值
+    //     */
+    //    private String creator;
+    //
+    //    /**
+    //     * 主表id
+    //     */
+    //    private Long versionId;
 
     /**
      * 标题
@@ -50,19 +48,19 @@ public class DisclaimerInformationDTO {
      */
     private String orderNo;
 
-    /**
-     * 1：启动，0：不启用
-     */
-    private String status;
+    //    /**
+    //     * 1：启动，0：不启用
+    //     */
+    //    private String status;
 
     /**
      * 免责申明编号
      */
     private String disclaimerCode;
 
-    /**
-     * 备注
-     */
-    private String remark;
+    //    /**
+    //     * 备注
+    //     */
+    //    private String remark;
 
 }

icss-service/src/main/java/com/diagbot/entity/ScaleContent.java

@@ -14,7 +14,6 @@ import java.io.Serializable;
  * @author zhoutg
  * @since 2019-03-11
  */
-@TableName("icss_scale_content")
 @Getter
 @Setter
 public class ScaleContent implements Serializable {

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

@@ -6,9 +6,7 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.LisResult;
-import com.diagbot.vo.LisResultVO;
 import com.diagbot.vo.PushVO;
-import net.bytebuddy.asm.Advice;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -65,19 +63,19 @@ public class AssembleFacade {
         if (ListUtil.isNotEmpty(pushVO.getLis())) {
             Map<String, Map<String, String>> lisConfigMap = lisMappingFacade.getLisMapping_NotEmptyItemName();
             Map<String, String> lisConfigWithEmptyItemNameMap = lisMappingFacade.getLisConfig_EmptyItemName();
-            for (LisResultVO lisResultVO : pushVO.getLis()) {
+            for (LisResult lisResult : pushVO.getLis()) {
                 //source=0 icss页面数据，source=1 外部导入数据，外部导入数据不处理
-                if (!lisResultVO.getSource().equals(LisSourceEnum.Inner.getKey())) {
+                if (!lisResult.getSource().equals(LisSourceEnum.Inner.getKey())) {
                     continue;
                 }
-                if (StringUtil.isNotBlank(lisResultVO.getName())) {
-                    if (StringUtil.isNotBlank(lisResultVO.getDetailName())) {
-                        Map<String, String> detailMap = lisConfigMap.get(lisResultVO.getName());
-                        if (null != detailMap && detailMap.size() > 0 && StringUtil.isNotBlank(detailMap.get(lisResultVO.getDetailName()))) {
-                            lisResultVO.setUniqueName(detailMap.get(lisResultVO.getDetailName()));
+                if (StringUtil.isNotBlank(lisResult.getName())) {
+                    if (StringUtil.isNotBlank(lisResult.getDetailName())) {
+                        Map<String, String> detailMap = lisConfigMap.get(lisResult.getName());
+                        if (null != detailMap && detailMap.size() > 0 && StringUtil.isNotBlank(detailMap.get(lisResult.getDetailName()))) {
+                            lisResult.setUniqueName(detailMap.get(lisResult.getDetailName()));
                         }
                     } else {
-                        lisResultVO.setUniqueName(lisConfigWithEmptyItemNameMap.get(lisResultVO.getName()));
+                        lisResult.setUniqueName(lisConfigWithEmptyItemNameMap.get(lisResult.getName()));
                     }
                 }
             }

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

@@ -3,7 +3,6 @@ package com.diagbot.facade;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.service.impl.DeptInfoServiceImpl;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.DeptInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +14,7 @@ import org.springframework.stereotype.Component;
  * @time: 2018/11/19 19:21
  */
 @Component
-public class DeptInfoFacade extends DeptInfoServiceImpl {
+public class DeptInfoFacade {
 
     @Autowired
     AiptServiceClient aiptServiceClient;

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

@@ -1,14 +1,8 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.DisTypeDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.DisType;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.QuestionTypeEnum;
-import com.diagbot.service.impl.DisTypeServiceImpl;
 import com.diagbot.util.RespDTOUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -19,9 +13,7 @@ import org.springframework.stereotype.Component;
  * @time: 2018/11/19 13:19
  */
 @Component
-public class DisTypeFacade extends DisTypeServiceImpl {
-    @Autowired
-    private QuestionFacade questionFacade;
+public class DisTypeFacade {
     @Autowired
     AiptServiceClient aiptServiceClient;
 
@@ -31,48 +23,8 @@ public class DisTypeFacade extends DisTypeServiceImpl {
      * @return
      */
     public DisTypeDTO getDisTypeFac() {
-        RespDTO<DisTypeDTO> res =  aiptServiceClient.getDisType();
+        RespDTO<DisTypeDTO> res = aiptServiceClient.getDisType();
         RespDTOUtil.respNGDeal(res, "远程调用诊断类型失败");
         return res.data;
     }
-
-    /**
-     * 根据诊断id判断类型
-     *
-     * @param diseaseId
-     * @param type
-     * @return
-     */
-    public Boolean judgeByDisId(Long diseaseId, Integer type) {
-        QueryWrapper<DisType> disTypeQueryWrapper = new QueryWrapper<>();
-        disTypeQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("dis_id", diseaseId)
-                .eq("type", type);
-        DisType disType = this.getOne(disTypeQueryWrapper);
-        if (disType == null) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * 根据诊断名称判断类型
-     *
-     * @param disName
-     * @param type
-     * @return
-     */
-    public Boolean judgeByDisName(String disName, Integer type) {
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("tag_name", disName)
-                .eq("type", QuestionTypeEnum.Disease.getKey());
-        QuestionInfo disease = questionFacade.getOne(questionInfoQueryWrapper);
-        if (disease == null) {
-            return false;
-        } else {
-            return judgeByDisId(disease.getId(), type);
-        }
-    }
 }

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

@@ -1,16 +1,13 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.util.RespDTOUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.DisclaimerInformationDTO;
-import com.diagbot.entity.DisclaimerInformation;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.StatusEnum;
-import com.diagbot.service.impl.DisclaimerInformationServiceImpl;
-import com.diagbot.util.BeanUtil;
+import java.util.List;
 
 /**
  * 
@@ -19,21 +16,18 @@ import com.diagbot.util.BeanUtil;
  * @date 2018年11月27日 下午3:36:14
  */
 @Component
-public class DisclaimerInformationFacade extends DisclaimerInformationServiceImpl {
+public class DisclaimerInformationFacade {
 
+	@Autowired
+	private AiptServiceClient aiptServiceClient;
 	/**
 	 * 
 	 * @return
 	 */
 	public List<DisclaimerInformationDTO> getDisclaimerInformation() {
-
-		QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
-		disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-				.orderByAsc("order_no");
-		List<DisclaimerInformation> data = list(disclaimerInformation);
-		// getDisclaimerInformationAll();
-		List<DisclaimerInformationDTO> datas = BeanUtil.listCopyTo(data, DisclaimerInformationDTO.class);
-		return datas;
+		RespDTO<List<DisclaimerInformationDTO>> res =  aiptServiceClient.getDisclaimerInformations();
+		RespDTOUtil.respNGDealCover(res, "获取免责声明失败");
+		return res.data;
 	}
 
 }

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

@@ -1,13 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.IntroduceDetailServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/16 9:28
- */
-@Component
-public class IntroduceDetailFacade extends IntroduceDetailServiceImpl {
-}

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

@@ -1,302 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.QuestionTypeEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.impl.IntroduceInfoServiceImpl;
-import com.diagbot.util.ArrayUtil;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.RespDTOUtil;
-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.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/16 9:27
- */
-@Component
-public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
-    @Autowired
-    IntroduceMapFacade introduceMapFacade;
-    @Autowired
-    IntroduceDetailFacade introduceDetailFacade;
-    @Autowired
-    QuestionFacade questionFacade;
-    @Autowired
-    TranServiceClient tranServiceClient;
-    @Autowired
-    LisMappingFacade lisMappingFacade;
-
-    /**
-     * 根据标签id获取提示信息
-     *
-     * @param introduceByQuestionVO
-     * @return
-     */
-    public IntroduceDTO getByQuestionId(IntroduceByQuestionVO introduceByQuestionVO) {
-        Long questionId = introduceByQuestionVO.getQuestionId();
-        if (questionId == null) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入标签id");
-        }
-        QuestionInfo questionInfo = questionFacade.getById(questionId);
-        if (questionInfo == null) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "未找到标签");
-        }
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("question_id", introduceByQuestionVO.getQuestionId()).
-                eq("type", introduceByQuestionVO.getType());
-        IntroduceMap introduceMap = introduceMapFacade.getOne(introduceMapQueryWrapper);
-        if (introduceMap == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息未维护");
-        }
-
-        IntroduceDTO introduceDTO = this.getRecordByIdAndPosition(introduceMap.getIntroduceId(), introduceByQuestionVO.getPosition());
-        introduceDTO.setTagName(questionInfo.getTagName());
-        return introduceDTO;
-    }
-
-    /**
-     * 根据标签名称获取提示信息
-     *
-     * @param introduceByQuestionVO
-     * @return
-     */
-    public IntroduceDTO getByQuestionName(IntroduceByQuestionVO introduceByQuestionVO) {
-        if (StringUtil.isBlank(introduceByQuestionVO.getTagName())) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入标签名称");
-        }
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("tag_name", introduceByQuestionVO.getTagName())
-                .eq("type", introduceByQuestionVO.getType());
-        QuestionInfo questionInfo = questionFacade.getOne(questionInfoQueryWrapper);
-        if (questionInfo == null) {
-            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", introduceByQuestionVO.getType());
-        IntroduceMap introduceMap = introduceMapFacade.getOne(introduceMapQueryWrapper);
-        if (introduceMap == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息未维护");
-        }
-
-        IntroduceDTO introduceDTO = this.getRecordByIdAndPosition(introduceMap.getIntroduceId(), introduceByQuestionVO.getPosition());
-        introduceDTO.setTagName(questionInfo.getTagName());
-        return introduceDTO;
-    }
-
-    /**
-     * 获取指定位置提示信息
-     *
-     * @param id
-     * @param position
-     * @return
-     */
-    public IntroduceDTO getRecordByIdAndPosition(Long id, Integer position) {
-        IntroduceDTO introduceDTO = new IntroduceDTO();
-        IntroduceInfo introduceInfo = this.getById(id);
-        if (introduceInfo == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息未维护");
-        } else if (introduceInfo.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息已删除");
-        }
-        BeanUtil.copyProperties(introduceInfo, introduceDTO);
-
-
-        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
-        //展示位置
-        if (position != null) {
-            introduceDetailQueryWrapper.apply("find_in_set({0},position)", position);
-        }
-        introduceDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("introduce_id", introduceInfo.getId()).
-                orderByAsc("order_no");
-        List<IntroduceDetail> introduceDetailList = introduceDetailFacade.list(introduceDetailQueryWrapper);
-        introduceDTO.setIntroduceDetailList(introduceDetailList);
-        return introduceDTO;
-    }
-
-    /**
-     * 根据id获取提示信息
-     *
-     * @param id
-     * @return
-     */
-    public IntroduceDTO getRecordById(Long id) {
-        return getRecordByIdAndPosition(id, null);
-    }
-
-    /**
-     * 获取电子病历评级提示信息
-     *
-     * @param emrIntroduceVO
-     * @return
-     */
-    public List<EMRIntroduceDetailDTO> getIntroduceByEMR(EMRIntroduceVO emrIntroduceVO) {
-        Boolean isDocking = tranServiceClient.isDocking().data;
-        //入参处理
-        HosCodeVO hosCodeVO = new HosCodeVO();
-        hosCodeVO.setHosCode(emrIntroduceVO.getHosCode());
-        //公表转换
-        String uniqueName = "";
-        Integer type = emrIntroduceVO.getType();
-        if (type.equals(QuestionTypeEnum.Lis.getKey())) {
-            if (StringUtil.isNotBlank(emrIntroduceVO.getName())) {
-                if (StringUtil.isNotBlank(emrIntroduceVO.getDetailName())) {
-                    Map<String, Map<String, String>> lisConfigMap = new LinkedHashMap<>();
-                    if (isDocking) {
-                        RespDTO<Map<String, Map<String, String>>> respLisConfigMap = tranServiceClient.getLisConfigByHosCode_NotEmptyItemName(hosCodeVO);
-                        RespDTOUtil.respNGDealCover(respLisConfigMap, CommonErrorCode.RPC_ERROR.getMsg());
-                        lisConfigMap = respLisConfigMap.data;
-                    } else {
-                        lisConfigMap = lisMappingFacade.getLisMapping_NotEmptyItemName();
-                    }
-
-                    uniqueName = lisConfigMap.get(emrIntroduceVO.getName()).get(emrIntroduceVO.getDetailName());
-                } else {
-                    Map<String, String> lisConfigMap_emptyItemName = new LinkedHashMap<>();
-                    if (isDocking) {
-                        RespDTO<Map<String, String>> respLisConfigMap_emptyItemName = tranServiceClient.getLisConfigByHosCode_EmptyItemName(hosCodeVO);
-                        RespDTOUtil.respNGDealCover(respLisConfigMap_emptyItemName, CommonErrorCode.RPC_ERROR.getMsg());
-                        lisConfigMap_emptyItemName = respLisConfigMap_emptyItemName.data;
-                    } else {
-                        lisConfigMap_emptyItemName = lisMappingFacade.getLisConfig_EmptyItemName();
-                    }
-                    uniqueName = lisConfigMap_emptyItemName.get(emrIntroduceVO.getName());
-                }
-            }
-        } else if (type.equals(QuestionTypeEnum.Pacs.getKey())) {
-            if (isDocking) {
-                RespDTO<Map<String, String>> respPacsConfigMap = tranServiceClient.getPacsConfigByHosCode(hosCodeVO);
-                RespDTOUtil.respNGDealCover(respPacsConfigMap, CommonErrorCode.RPC_ERROR.getMsg());
-                Map<String, String> pacsConfigMap = respPacsConfigMap.data;
-                uniqueName = pacsConfigMap.get(emrIntroduceVO.getName());
-            } else {
-                uniqueName = emrIntroduceVO.getName();
-            }
-        } else if (type.equals(QuestionTypeEnum.Disease.getKey())) {
-            if (isDocking) {
-                RespDTO<Map<String, String>> respDisMap = tranServiceClient.getDiseaseIcdByHosCode(hosCodeVO);
-                RespDTOUtil.respNGDealCover(respDisMap, CommonErrorCode.RPC_ERROR.getMsg());
-                Map<String, String> disMap = respDisMap.data;
-                uniqueName = disMap.get(emrIntroduceVO.getName());
-            } else {
-                uniqueName = emrIntroduceVO.getName();
-            }
-        }
-
-        //未找到映射标签名称
-        if (uniqueName == null || StringUtil.isBlank(uniqueName)) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "项目未找到");
-        }
-
-        String[] titles = emrIntroduceVO.getTitles();
-        //对接标题映射
-        Map<String, String> titleMapping = new LinkedHashMap<>();
-        List<String> uniqueTitleList = Lists.newLinkedList();
-        if (ArrayUtil.isNotEmpty(titles)) {
-            if (isDocking) {
-                RespDTO<Map<String, String>> respTitleMappingMap = tranServiceClient.getTitleMappingHosCode(hosCodeVO);
-                RespDTOUtil.respNGDealCover(respTitleMappingMap, CommonErrorCode.RPC_ERROR.getMsg());
-                Map<String, String> titleMappingMap = respTitleMappingMap.data;
-                for (String title : titles) {
-                    String uniqueTitle = titleMappingMap.get(title);
-                    titleMapping.put(title, uniqueTitle);
-                    if (StringUtil.isNotBlank(uniqueTitle)) {
-                        uniqueTitleList.add(uniqueTitle);
-                    }
-                }
-            } else {
-                uniqueTitleList = Arrays.asList(titles);
-            }
-        }
-
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("tag_name", uniqueName)
-                .eq("type", type);
-        QuestionInfo questionInfo = questionFacade.getOne(questionInfoQueryWrapper);
-        if (questionInfo == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "公表标签不存在");
-        }
-
-
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("type", type).
-                eq("question_id", questionInfo.getId());
-        IntroduceMap introduceMap = introduceMapFacade.getOne(introduceMapQueryWrapper);
-        if (introduceMap == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息未维护");
-        }
-
-        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
-        introduceDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("introduce_id", introduceMap.getIntroduceId()).
-                orderByAsc("order_no");
-        //如果标题列表未传，全部返回
-        if (ArrayUtil.isNotEmpty(emrIntroduceVO.getTitles())) {
-            if (ListUtil.isNotEmpty(uniqueTitleList)) {
-                introduceDetailQueryWrapper.in("title", uniqueTitleList);
-            } else {
-                //标题未匹配上，不返回数据,加一个不成立的条件
-                introduceDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.Y.getKey());
-            }
-        }
-        if (emrIntroduceVO.getPosition() != null) {
-            introduceDetailQueryWrapper.apply("find_in_set({0},position)", emrIntroduceVO.getPosition());
-        }
-
-        List<IntroduceDetail> introduceDetailList = introduceDetailFacade.list(introduceDetailQueryWrapper);
-        List<EMRIntroduceDetailDTO> retList = Lists.newLinkedList();
-        if (ArrayUtil.isNotEmpty(emrIntroduceVO.getTitles())) {
-            //对接模式，返回原标题
-            if (isDocking) {
-                for (Map.Entry<String, String> entry : titleMapping.entrySet()) {
-                    EMRIntroduceDetailDTO detailDTO = new EMRIntroduceDetailDTO();
-                    detailDTO.setTitle(entry.getKey());
-                    if (StringUtil.isNotBlank(entry.getValue())) {
-                        for (IntroduceDetail introduceDetail : introduceDetailList) {
-                            if (entry.getValue().equals(introduceDetail.getTitle())) {
-                                detailDTO.setText(introduceDetail.getText());
-                                detailDTO.setContent(introduceDetail.getContent());
-                            }
-                        }
-                    }
-                    retList.add(detailDTO);
-                }
-            } else {
-                retList = BeanUtil.listCopyTo(introduceDetailList, EMRIntroduceDetailDTO.class);
-            }
-        } else {
-            retList = BeanUtil.listCopyTo(introduceDetailList, EMRIntroduceDetailDTO.class);
-        }
-        return retList;
-    }
-}

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

@@ -1,56 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.IntroduceMap;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.IntroduceMapServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/16 9:28
- */
-@Component
-public class IntroduceMapFacade extends IntroduceMapServiceImpl {
-    @Autowired
-    QuestionFacade questionFacade;
-
-    /**
-     * 根据标签id和类型判断时候有关联静态知识
-     *
-     * @param questionId
-     * @param type
-     * @return
-     */
-    public Boolean hasIntroduceByQuestionId(Long questionId, Integer type) {
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("question_id", questionId).eq("type", type);
-        IntroduceMap introduceMap = this.getOne(introduceMapQueryWrapper);
-        if (introduceMap == null) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * 根据标签名称和类型判断时候有关联静态知识
-     *
-     * @param questionName
-     * @param type
-     * @return
-     */
-    public Boolean hasIntroduceByQuestionName(String questionName, Integer type) {
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("tag_name", questionName).eq("type", type);
-        QuestionInfo questionInfo = questionFacade.getOne(questionInfoQueryWrapper);
-        if (questionInfo == null) {
-            return false;
-        } else {
-            return hasIntroduceByQuestionId(questionInfo.getId(), type);
-        }
-    }
-}

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

@@ -7,7 +7,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.RetrievalServiceImpl;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
@@ -28,7 +27,7 @@ import java.util.stream.Collectors;
  * @time: 2018/11/27 14:54
  */
 @Component
-public class RetrievalFacade extends RetrievalServiceImpl {
+public class RetrievalFacade {
 
     @Autowired
     QuestionFacade questionFacade;
@@ -45,39 +44,39 @@ public class RetrievalFacade extends RetrievalServiceImpl {
         List<RetrievalDTO> retrievalDTOS = new ArrayList<>();
         //调用aipt-服务
         RespDTO<List<ConceptRetrievalDTO>> conceptInfos = aiptServiceClient.retrivelConceptInfo(retrievalVO);
-        RespDTOUtil.respNGDeal(conceptInfos,"获取检索信息失败");
+        RespDTOUtil.respNGDeal(conceptInfos, "获取检索信息失败");
         //获取questionId
         List<String> questionNames = new ArrayList<>();
-        if(ListUtil.isNotEmpty(conceptInfos.data)){
-            for (ConceptRetrievalDTO conceptRetrievalDTO: conceptInfos.data) {
-                if(!questionNames.contains(conceptRetrievalDTO.getSameName())){
-                        questionNames.add(conceptRetrievalDTO.getSelfName());
-                    }
-                    if(!questionNames.contains(conceptRetrievalDTO.getParentName())){
-                        questionNames.add(conceptRetrievalDTO.getParentName());
-                    }
+        if (ListUtil.isNotEmpty(conceptInfos.data)) {
+            for (ConceptRetrievalDTO conceptRetrievalDTO : conceptInfos.data) {
+                if (!questionNames.contains(conceptRetrievalDTO.getSameName())) {
+                    questionNames.add(conceptRetrievalDTO.getSelfName());
                 }
+                if (!questionNames.contains(conceptRetrievalDTO.getParentName())) {
+                    questionNames.add(conceptRetrievalDTO.getParentName());
+                }
+            }
             QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
             questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .in("tag_name",questionNames)
-                    .eq("type",retrievalVO.getType());
+                    .in("tag_name", questionNames)
+                    .eq("type", retrievalVO.getType());
             List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-            Map<String,QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getTagName,questionInfo -> questionInfo));
+            Map<String, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo));
             RetrievalDTO retrievalDTO = new RetrievalDTO();
             //封装
-            for (ConceptRetrievalDTO conceptRetrievalDTO: conceptInfos.data) {
+            for (ConceptRetrievalDTO conceptRetrievalDTO : conceptInfos.data) {
                 retrievalDTO = new RetrievalDTO();
                 retrievalDTO.setConceptId(conceptRetrievalDTO.getSelfId());
                 retrievalDTO.setName(conceptRetrievalDTO.getSelfName());
-                if(StringUtil.isNotEmpty(conceptRetrievalDTO.getParentName())){//parent不为空时说明有子项，返回父级id
+                if (StringUtil.isNotEmpty(conceptRetrievalDTO.getParentName())) {//parent不为空时说明有子项，返回父级id
                     retrievalDTO.setQuestionId(questionInfoMap.get(conceptRetrievalDTO.getParentName()).getId());
-                }else {//parent为空时说明没有子项返回本体id
+                } else {//parent为空时说明没有子项返回本体id
                     retrievalDTO.setQuestionId(questionInfoMap.get(conceptRetrievalDTO.getSelfName()).getId());
                 }
-                if(StringUtil.isNotEmpty(conceptRetrievalDTO.getSameName())){//同义词
+                if (StringUtil.isNotEmpty(conceptRetrievalDTO.getSameName())) {//同义词
                     retrievalDTO.setRetrievalName(conceptRetrievalDTO.getSameName());
                 }
-                if(StringUtil.isNotEmpty(conceptRetrievalDTO.getParentName())){//子项
+                if (StringUtil.isNotEmpty(conceptRetrievalDTO.getParentName())) {//子项
                     retrievalDTO.setRetrievalName(conceptRetrievalDTO.getParentName());
                 }
                 retrievalDTO.setShowType(conceptRetrievalDTO.getShowType());

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

@@ -1,13 +1,9 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ScaleContent;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.ScaleTypeEnum;
-import com.diagbot.service.impl.ScaleContentServiceImpl;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.PushVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,10 +17,7 @@ import java.util.List;
  * @time: 2018/11/19 13:19
  */
 @Component
-public class ScaleContentFacade extends ScaleContentServiceImpl {
-
-    @Autowired
-    PushFacade pushFacade;
+public class ScaleContentFacade {
     @Autowired
     AiptServiceClient aiptServiceClient;
     @Autowired
@@ -42,26 +35,4 @@ public class ScaleContentFacade extends ScaleContentServiceImpl {
         return res.data;
     }
 
-
-    /**
-     * 返回诊断量表列表
-     *
-     * @return
-     */
-    public List<ScaleContent> getContent(Long scaleId, String pushContent) {
-        //获取内容列表
-        List<ScaleContent> data = this.list(new QueryWrapper<ScaleContent>()
-                .eq("scale_id", scaleId)
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .orderByAsc("order_no"));
-
-        //看需是否要调用大数据
-        for (ScaleContent scaleContent : data) {
-            if (ScaleTypeEnum.PUSH.getKey() == scaleContent.getType()) {
-                scaleContent.setContent(pushContent);
-                break;
-            }
-        }
-        return data;
-    }
 }

icss-service/src/main/java/com/diagbot/mapper/DeptInfoMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.DeptInfo;
-
-/**
- * <p>
- * 科室信息表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2018-11-19
- */
-public interface DeptInfoMapper extends BaseMapper<DeptInfo> {
-
-}

icss-service/src/main/java/com/diagbot/mapper/DisTypeMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.DisType;
-
-/**
- * <p>
- * 诊断类型表 Mapper 接口
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-08
- */
-public interface DisTypeMapper extends BaseMapper<DisType> {
-
-}

icss-service/src/main/java/com/diagbot/mapper/IntroduceDetailMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.IntroduceDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 提示信息明细 Mapper 接口
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-public interface IntroduceDetailMapper extends BaseMapper<IntroduceDetail> {
-
-}

icss-service/src/main/java/com/diagbot/mapper/IntroduceInfoMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.IntroduceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 提示信息 Mapper 接口
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-public interface IntroduceInfoMapper extends BaseMapper<IntroduceInfo> {
-
-}

icss-service/src/main/java/com/diagbot/mapper/IntroduceMapMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.IntroduceMap;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 标签与提示信息映射表 Mapper 接口
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-public interface IntroduceMapMapper extends BaseMapper<IntroduceMap> {
-
-}

icss-service/src/main/java/com/diagbot/mapper/RetrievalMapper.java

@@ -1,26 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.dto.RetrievalDTO;
-import com.diagbot.entity.Retrieval;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.vo.RetrievalVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 检索表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2018-11-16
- */
-public interface RetrievalMapper extends BaseMapper<Retrieval> {
-
-    /**
-     * 获取主诉信息
-     * @param retrievalVO
-     * @return
-     */
-    public List<RetrievalDTO> getSymptopInfo(RetrievalVO retrievalVO);
-}

icss-service/src/main/java/com/diagbot/mapper/RetrievalMappingMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.RetrievalMapping;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 检索映射表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2018-11-16
- */
-public interface RetrievalMappingMapper extends BaseMapper<RetrievalMapping> {
-
-}

icss-service/src/main/java/com/diagbot/mapper/ScaleContentMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.ScaleContent;
-
-/**
- * <p>
- * 量表内容表 Mapper 接口
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-11
- */
-public interface ScaleContentMapper extends BaseMapper<ScaleContent> {
-
-}

icss-service/src/main/java/com/diagbot/service/DeptInfoService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.DeptInfo;
-
-/**
- * <p>
- * 科室信息表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2018-11-19
- */
-public interface DeptInfoService extends IService<DeptInfo> {
-
-}

icss-service/src/main/java/com/diagbot/service/DisTypeService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.DisType;
-
-/**
- * <p>
- * 诊断类型表 服务类
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-08
- */
-public interface DisTypeService extends IService<DisType> {
-
-}

icss-service/src/main/java/com/diagbot/service/IntroduceDetailService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.IntroduceDetail;
-
-/**
- * <p>
- * 提示信息明细 服务类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-public interface IntroduceDetailService extends IService<IntroduceDetail> {
-
-}

icss-service/src/main/java/com/diagbot/service/IntroduceInfoService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.IntroduceInfo;
-
-/**
- * <p>
- * 提示信息 服务类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-public interface IntroduceInfoService extends IService<IntroduceInfo> {
-
-}

icss-service/src/main/java/com/diagbot/service/IntroduceMapService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.IntroduceMap;
-
-/**
- * <p>
- * 标签与提示信息映射表 服务类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-public interface IntroduceMapService extends IService<IntroduceMap> {
-
-}

icss-service/src/main/java/com/diagbot/service/RetrievalMappingService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.RetrievalMapping;
-
-/**
- * <p>
- * 检索映射表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2018-11-16
- */
-public interface RetrievalMappingService extends IService<RetrievalMapping> {
-
-}

icss-service/src/main/java/com/diagbot/service/RetrievalService.java

@@ -1,27 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.RetrievalDTO;
-import com.diagbot.entity.Retrieval;
-import com.diagbot.vo.RetrievalVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 检索表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2018-11-16
- */
-public interface RetrievalService extends IService<Retrieval> {
-
-    /**
-     * 获取主诉信息
-     *
-     * @param retrievalVO
-     * @return
-     */
-    public List<RetrievalDTO> getSymptopInfo(RetrievalVO retrievalVO);
-}

icss-service/src/main/java/com/diagbot/service/ScaleContentService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.ScaleContent;
-
-/**
- * <p>
- * 量表内容表 服务类
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-11
- */
-public interface ScaleContentService extends IService<ScaleContent> {
-
-}

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

@@ -1,23 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.DeptInfoDTO;
-import com.diagbot.entity.DeptInfo;
-import com.diagbot.mapper.DeptInfoMapper;
-import com.diagbot.service.DeptInfoService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 科室信息表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2018-11-19
- */
-@Service
-public class DeptInfoServiceImpl extends ServiceImpl<DeptInfoMapper, DeptInfo> implements DeptInfoService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.DisType;
-import com.diagbot.mapper.DisTypeMapper;
-import com.diagbot.service.DisTypeService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 标签基础表 服务实现类
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-@Service
-public class DisTypeServiceImpl extends ServiceImpl<DisTypeMapper, DisType> implements DisTypeService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.IntroduceDetail;
-import com.diagbot.mapper.IntroduceDetailMapper;
-import com.diagbot.service.IntroduceDetailService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 提示信息明细 服务实现类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-@Service
-public class IntroduceDetailServiceImpl extends ServiceImpl<IntroduceDetailMapper, IntroduceDetail> implements IntroduceDetailService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.IntroduceInfo;
-import com.diagbot.mapper.IntroduceInfoMapper;
-import com.diagbot.service.IntroduceInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 提示信息 服务实现类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-@Service
-public class IntroduceInfoServiceImpl extends ServiceImpl<IntroduceInfoMapper, IntroduceInfo> implements IntroduceInfoService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.IntroduceMap;
-import com.diagbot.mapper.IntroduceMapMapper;
-import com.diagbot.service.IntroduceMapService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 标签与提示信息映射表 服务实现类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-@Service
-public class IntroduceMapServiceImpl extends ServiceImpl<IntroduceMapMapper, IntroduceMap> implements IntroduceMapService {
-
-}