管理评估 和指标配置

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

@@ -11,15 +11,19 @@ import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.dto.DisTypeDTO;
 import com.diagbot.dto.DiseaseIcdDTO;
+import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
+import com.diagbot.dto.IndexConfigDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.vo.ConceptIntroduceVO;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.DeptInfoVO;
 import com.diagbot.vo.DisScaleVO;
+import com.diagbot.vo.EvaluationdiseaseNameVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
+import com.diagbot.vo.IndexConfigdiseaseNameVO;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -87,4 +91,20 @@ public interface AiptServiceClient {
      */
     @PostMapping("/patientInfo/getTopPatientInfo")
     RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO);
+    
+    /**
+	 * 获取管理评估模板
+	 * @param evaluationdiseaseNameVO
+	 * @return
+	 */
+	@PostMapping("/evaluation/getEvaluationModules")
+	public RespDTO<List<EvaluationDTO>> getEvaluationModules(@RequestBody EvaluationdiseaseNameVO evaluationdiseaseNameVO);
+
+	/**
+	 * 获取指标配置
+	 * @param indexConfigdiseaseNameVO
+	 * @return
+	 */
+	@PostMapping("/indexConfig/getindexConfigs")
+	public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigdiseaseNameVO indexConfigdiseaseNameVO);
 }

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

@@ -20,15 +20,19 @@ import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.dto.DisTypeDTO;
 import com.diagbot.dto.DiseaseIcdDTO;
+import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
+import com.diagbot.dto.IndexConfigDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.vo.ConceptIntroduceVO;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.DeptInfoVO;
 import com.diagbot.vo.DisScaleVO;
+import com.diagbot.vo.EvaluationdiseaseNameVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
+import com.diagbot.vo.IndexConfigdiseaseNameVO;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -123,4 +127,15 @@ public class AiptServiceHystrix implements AiptServiceClient {
         log.error("【hystrix】调用{}异常", "getTopPatientInfo");
         return null;
     }
+    @Override
+	public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid EvaluationdiseaseNameVO evaluationdiseaseNameVO) {
+		log.error("【hystrix】调用{}异常", "getEvaluationModules");
+		return null;
+	}
+
+	@Override
+	public RespDTO<List<IndexConfigDTO>> getindexConfigs(IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
+		log.error("【hystrix】调用{}异常", "getindexConfigs");
+		return null;
+	}
 }

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

@@ -0,0 +1,22 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月6日 下午5:14:02
+ */
+@Getter
+@Setter
+public class EvaluationDTO {
+
+	private String diseaseName;// 对应术语疾病名
+	private Long conceptId;// 术语概念id
+	private String regionName; // 区域名
+	private String regionType; // 区域类型
+	private Integer orderNo; // 区域顺序
+	private Object data;
+}

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

@@ -1,13 +1,13 @@
 package com.diagbot.dto;
 
-import com.diagbot.client.bean.CalcResult;
+import java.util.List;
+import java.util.Map;
+
 import com.diagbot.entity.ScaleContent;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * @Description:
  * @Author:zhaops
@@ -26,5 +26,5 @@ public class PushDTO {
     private Map<String, Object> treat;
     private List<MedicalIndicationDTO> medicalIndications;
     private List<ScaleContent> scale;
-    private List<EvaluationModuleMappingDTO> evaluationModule;
+    private List<EvaluationDTO> evaluationModule;
 }

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

@@ -1,164 +0,0 @@
-package com.diagbot.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
- * <p>
- * 管理与评估模板表
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-11
- */
-@TableName("icss_evaluation_module_mapping")
-public class EvaluationModuleMapping implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    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 regionName;
-
-    /**
-     * 区域类型
-     */
-    private String regionType;
-
-    /**
-     * 区域顺序
-     */
-    private Integer orderNo;
-
-    /**
-     * 疾病id
-     */
-    private Long diseaseId;
-
-    private String remark;
-
-    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 getRegionName() {
-        return regionName;
-    }
-
-    public void setRegionName(String regionName) {
-        this.regionName = regionName;
-    }
-    public String getRegionType() {
-        return regionType;
-    }
-
-    public void setRegionType(String regionType) {
-        this.regionType = regionType;
-    }
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
-    public Long getDiseaseId() {
-        return diseaseId;
-    }
-
-    public void setDiseaseId(Long diseaseId) {
-        this.diseaseId = diseaseId;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "EvaluationModuleMapping{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", regionName=" + regionName +
-        ", regionType=" + regionType +
-        ", orderNo=" + orderNo +
-        ", diseaseId=" + diseaseId +
-        ", remark=" + remark +
-        "}";
-    }
-}

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

@@ -1,166 +0,0 @@
-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;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-11
- */
-@TableName("icss_index_config")
-public class IndexConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    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 indexUnique;
-
-    /**
-     * 疾病id
-     */
-    private Long diseaseId;
-    
-    private Long indexDesc;
-    /**
-     * 显示顺序
-     */
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getIndexDesc() {
-		return indexDesc;
-	}
-
-	public void setIndexDesc(Long indexDesc) {
-		this.indexDesc = indexDesc;
-	}
-
-	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 getIndexUnique() {
-        return indexUnique;
-    }
-
-    public void setIndexUnique(String indexUnique) {
-        this.indexUnique = indexUnique;
-    }
-    public Long getDiseaseId() {
-        return diseaseId;
-    }
-
-    public void setDiseaseId(Long diseaseId) {
-        this.diseaseId = diseaseId;
-    }
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "IndexConfig{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", indexUnique=" + indexUnique +
-        ", diseaseId=" + diseaseId +
-        ", orderNo=" + orderNo +
-        ", remark=" + remark +
-        "}";
-    }
-}

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

@@ -1,203 +0,0 @@
-package com.diagbot.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
- * <p>
- * 指标数据表
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-11
- */
-@TableName("icss_index_data")
-public class IndexData implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    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 indexUnique;
-
-    /**
-     * 指标值
-     */
-    private String indexValue;
-
-    /**
-     * 指标单位
-     */
-    private String indexUnit;
-
-    /**
-     * 是否异常
-     */
-    private Integer isAbnormal;
-
-    /**
-     * 化验时间
-     */
-    private Date creatTime;
-
-    /**
-     * 患者id
-     */
-    private Long patientId;
-
-    /**
-     * 就诊号
-     */
-    private String inquiryCode;
-
-    private String remark;
-
-    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 getIndexUnique() {
-        return indexUnique;
-    }
-
-    public void setIndexUnique(String indexUnique) {
-        this.indexUnique = indexUnique;
-    }
-    public String getIndexValue() {
-        return indexValue;
-    }
-
-    public void setIndexValue(String indexValue) {
-        this.indexValue = indexValue;
-    }
-    public String getIndexUnit() {
-        return indexUnit;
-    }
-
-    public void setIndexUnit(String indexUnit) {
-        this.indexUnit = indexUnit;
-    }
-    public Integer getIsAbnormal() {
-        return isAbnormal;
-    }
-
-    public void setIsAbnormal(Integer isAbnormal) {
-        this.isAbnormal = isAbnormal;
-    }
-    public Date getCreatTime() {
-        return creatTime;
-    }
-
-    public void setCreatTime(Date creatTime) {
-        this.creatTime = creatTime;
-    }
-    public Long getPatientId() {
-        return patientId;
-    }
-
-    public void setPatientId(Long patientId) {
-        this.patientId = patientId;
-    }
-    public String getInquiryCode() {
-        return inquiryCode;
-    }
-
-    public void setInquiryCode(String inquiryCode) {
-        this.inquiryCode = inquiryCode;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "IndexData{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", indexUnique=" + indexUnique +
-        ", indexValue=" + indexValue +
-        ", indexUnit=" + indexUnit +
-        ", isAbnormal=" + isAbnormal +
-        ", creatTime=" + creatTime +
-        ", patientId=" + patientId +
-        ", inquiryCode=" + inquiryCode +
-        ", remark=" + remark +
-        "}";
-    }
-}

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

@@ -7,13 +7,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.EvaluationModuleMappingDTO;
-import com.diagbot.entity.EvaluationModuleMapping;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.EvaluationModuleMappingServiceImpl;
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.EvaluationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.EvaluationDiseaseIdVO;
+import com.diagbot.vo.EvaluationdiseaseNameVO;
 
 /**
  * 
@@ -23,33 +25,40 @@ import com.diagbot.vo.EvaluationDiseaseIdVO;
  * @date 2019年3月11日 下午4:19:09
  */
 @Component
-public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServiceImpl {
+public class EvaluationModuleMappingFacade  {
 
 	/*@Autowired
 	IndexConfigFacade indexConfigFacade;
 	*/
 	@Autowired
 	PushFacade pushFacade;
-
+	@Autowired 
+	AiptServiceClient aiptServiceClient;
 	/**
 	 * 获取管理与评估模板接口
 	 *
 	 * @param evaluationDiseaseIdVO
 	 * @return
 	 */
-	public List<EvaluationModuleMappingDTO> getEvaluationModule(EvaluationDiseaseIdVO evaluationDiseaseIdVO) {
-		//根据慢病id获取模板信息
+	public List<EvaluationDTO> getEvaluationModule(EvaluationDiseaseIdVO evaluationDiseaseIdVO) {
+/*		//根据慢病id获取模板信息
 		QueryWrapper<EvaluationModuleMapping> evaluationModuleQuery = new QueryWrapper<>();
 		evaluationModuleQuery.eq("disease_id", evaluationDiseaseIdVO.getDiseaseId()).eq("is_deleted",
 				IsDeleteEnum.N.getKey());
 
-		List<EvaluationModuleMapping> datas = list(evaluationModuleQuery);
+		List<EvaluationModuleMapping> datas = list(evaluationModuleQuery);*/
+		EvaluationdiseaseNameVO evaluationdiseaseNameVO =new EvaluationdiseaseNameVO();
+		//TODO 联调需修改
+		evaluationdiseaseNameVO.setDiseaseName("糖尿病");
+		RespDTO<List<EvaluationDTO>> evaluationList = aiptServiceClient.getEvaluationModules(evaluationdiseaseNameVO);
+		RespDTOUtil.respNGDeal(evaluationList, "获取管理与评估模板数据失败！");
+		List<EvaluationDTO> datas= evaluationList.data;
 		// 过滤
-		List<EvaluationModuleMappingDTO> data = BeanUtil.listCopyTo(datas, EvaluationModuleMappingDTO.class);
+		List<EvaluationDTO> data = BeanUtil.listCopyTo(datas, EvaluationDTO.class);
 		//获取大数据知识图谱推送数据
 		Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(evaluationDiseaseIdVO, null);
 		for (String key : jsonobject.keySet()) {
-			for (EvaluationModuleMappingDTO evaluadata : data) {
+			for (EvaluationDTO evaluadata : data) {
 				if (key.equals(evaluadata.getRegionName())) {
 					evaluadata.setData(jsonobject.get(key));
 
@@ -59,26 +68,24 @@ public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServic
 		}
 		return data;
 	}
-
-	/**
+/*
+	*//**
 	 * 获取管理与评估模板接口
 	 *
 	 * @param diseaseId
 	 * @param contentMap
 	 * @return
 	 */
-	public List<EvaluationModuleMappingDTO> getEvaluationModule(Long diseaseId, Map<String, JSONObject> contentMap) {
-		//根据慢病id获取模板信息
-		QueryWrapper<EvaluationModuleMapping> evaluationModuleQuery = new QueryWrapper<>();
-		evaluationModuleQuery.eq("disease_id", diseaseId).eq("is_deleted",
-				IsDeleteEnum.N.getKey());
-
-		List<EvaluationModuleMapping> datas = list(evaluationModuleQuery);
+	public List<EvaluationDTO> getEvaluationModule(Long diseaseId, Map<String, JSONObject> contentMap) {
+		EvaluationdiseaseNameVO evaluationdiseaseNameVO =new EvaluationdiseaseNameVO();
+		evaluationdiseaseNameVO.setDiseaseName("糖尿病");
+		RespDTO<List<EvaluationDTO>> evaluationList = aiptServiceClient.getEvaluationModules(evaluationdiseaseNameVO);
+		List<EvaluationDTO> datas= evaluationList.data;
 		// 过滤
-		List<EvaluationModuleMappingDTO> data = BeanUtil.listCopyTo(datas, EvaluationModuleMappingDTO.class);
+		List<EvaluationDTO> data = BeanUtil.listCopyTo(datas, EvaluationDTO.class);
 		if (contentMap != null && contentMap.size() > 0) {
 			for (String key : contentMap.keySet()) {
-				for (EvaluationModuleMappingDTO evaluadata : data) {
+				for (EvaluationDTO evaluadata : data) {
 					if (key.equals(evaluadata.getRegionName())) {
 						evaluadata.setData(contentMap.get(key));
 					}

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

@@ -1,14 +1,14 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.IndexConfigDTO;
-import com.diagbot.entity.IndexConfig;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.IndexConfigServiceImpl;
-import com.diagbot.util.BeanUtil;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.vo.IndexConfigdiseaseNameVO;
 
 /**
  * @author wangfeng
@@ -16,26 +16,19 @@ import java.util.List;
  * @date 2019年3月11日 下午4:20:09
  */
 @Component
-public class IndexConfigFacade extends IndexConfigServiceImpl {
+public class IndexConfigFacade {
 
+	@Autowired 
+	AiptServiceClient aiptServiceClient;
     /**
      * 根据疾病Id获取指标配置
      *
      * @param diseaseId 疾病标签id
      * @return
      */
-    public List<IndexConfigDTO> getindexConfig(Long diseaseId) {
-        QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<>();
-        if (null != diseaseId) {
-            IndexConfigQuery.eq("disease_id", diseaseId);
-        }
-
-        IndexConfigQuery.eq("is_deleted", IsDeleteEnum.N.getKey());
-        List<IndexConfig> datas = list(IndexConfigQuery);
-
-        //过滤
-        List<IndexConfigDTO> data = BeanUtil.listCopyTo(datas, IndexConfigDTO.class);
-        return data;
+    public RespDTO<List<IndexConfigDTO>> getindexConfig(IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
+    	RespDTO<List<IndexConfigDTO>> indexConfigList = aiptServiceClient.getindexConfigs(indexConfigdiseaseNameVO);
+        return indexConfigList;
     }
 
 

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

@@ -1,31 +1,11 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.dto.IndexConfigAndDataDTO;
-import com.diagbot.dto.IndexConfigDTO;
-import com.diagbot.dto.IndexDataDTO;
-import com.diagbot.dto.ItemIndexDTO;
-import com.diagbot.entity.IndexData;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.impl.IndexDataServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.vo.IndexDataFindVO;
-import com.diagbot.vo.IndexDataSaveVO;
-import com.diagbot.vo.IndexDataVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-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 com.diagbot.dto.IndexConfigAndDataDTO;
+import com.diagbot.vo.IndexDataFindVO;
+import com.diagbot.vo.IndexDataSaveVO;
 
 /**
  * @author wangfeng
@@ -33,7 +13,7 @@ import java.util.stream.Collectors;
  * @date 2019年3月11日 下午4:20:33
  */
 @Component
-public class IndexDataFacade extends IndexDataServiceImpl {
+public class IndexDataFacade {
 
     @Autowired
     private IndexConfigFacade indexConfigFacade;
@@ -46,7 +26,7 @@ public class IndexDataFacade extends IndexDataServiceImpl {
      */
     public IndexConfigAndDataDTO getIndexDataAll(IndexDataFindVO indexDataFindVO) {
 
-        Map<String, Object> indexDataMap = new HashMap<>();
+      /*  Map<String, Object> indexDataMap = new HashMap<>();
         indexDataMap.put("diseaseId", indexDataFindVO.getDiseaseId());
         indexDataMap.put("patientId", indexDataFindVO.getPatientId());
         indexDataMap.put("startTime", indexDataFindVO.getStartTime());
@@ -81,8 +61,8 @@ public class IndexDataFacade extends IndexDataServiceImpl {
         }
         IndexConfigAndDataDTO indexsData = new IndexConfigAndDataDTO();
         indexsData.setIndexConfigData(indexConfigFacade.getindexConfig(indexDataFindVO.getDiseaseId()));
-        indexsData.setItemIndexData(list);
-        return indexsData;
+        indexsData.setItemIndexData(list);*/
+        return null;
     }
 
     /**
@@ -92,10 +72,11 @@ public class IndexDataFacade extends IndexDataServiceImpl {
      * @return
      */
     public boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
-        boolean res = false;
+      /*  boolean res = false;
         if (null != indexDataSaveVO && ListUtil.isNotEmpty(indexDataSaveVO.getIndexData())) {
+        	IndexConfigdiseaseNameVO IndexConfigdiseaseNameVO = new IndexConfigdiseaseNameVO();
             //获取所有需要记录的指标项
-            List<IndexConfigDTO> data = indexConfigFacade.getindexConfig(null);
+           List<IndexConfigDTO> data = indexConfigFacade.getindexConfig(IndexConfigdiseaseNameVO);
             List<String> indexUniquelist
                     = data.stream().map(i -> i.getIndexUnique()).collect(Collectors.toList());
 
@@ -137,8 +118,7 @@ public class IndexDataFacade extends IndexDataServiceImpl {
                 res = insertIndexDataList(IndexDataList);
             }
 
-        }
-        return res;
+        }*/
+        return false;
+    }
     }
-
-}

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

@@ -1,5 +1,17 @@
 package com.diagbot.facade;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,7 +24,7 @@ import com.diagbot.client.bean.MedicalIndicationDetail;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.EMRQuestionDTO;
-import com.diagbot.dto.EvaluationModuleMappingDTO;
+import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.MedicalIndicationDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.PushEMRDTO;
@@ -47,17 +59,6 @@ import com.diagbot.vo.PushKYJVO;
 import com.diagbot.vo.PushVO;
 import com.diagbot.vo.QuestionVO;
 import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -353,7 +354,7 @@ public class PushFacade {
                     managementEvaluation.put("糖尿病分级管理", JSONObject.parseObject("{ \"rows\":[ { \"name\":\"血压控制情况\", \"controltype\":0, \"details\":[ { \"detailName\":\"常规管理\", \"state\":1 }, { \"detailName\":\"强化管理\", \"state\":0 } ] } ] }"));
                 }*/
                 /***********************正式流程********************************/
-                List<EvaluationModuleMappingDTO> evaluationModule = evaluationModuleMappingFacade.getEvaluationModule(pushVO.getDiseaseId(), managementEvaluation);
+                List<EvaluationDTO> evaluationModule = evaluationModuleMappingFacade.getEvaluationModule(pushVO.getDiseaseId(), managementEvaluation);
                 pushDTO.setEvaluationModule(evaluationModule);
             }
         }

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

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.EvaluationModuleMapping;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 管理与评估模板表 Mapper 接口
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-11
- */
-public interface EvaluationModuleMappingMapper extends BaseMapper<EvaluationModuleMapping> {
-
-}

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

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.IndexConfig;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-11
- */
-public interface IndexConfigMapper extends BaseMapper<IndexConfig> {
-
-}

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

@@ -1,26 +0,0 @@
-package com.diagbot.mapper;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.IndexDataDTO;
-import com.diagbot.entity.IndexData;
-
-/**
- * <p>
- * 指标数据表 Mapper 接口
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-11
- */
-public interface IndexDataMapper extends BaseMapper<IndexData> {
-
-	List<IndexDataDTO> getIndexDataAll( @Param("indexDataMap") Map<String, Object> indexDataMap);
-
-	boolean insertIndexDataList(List<IndexData> indexDataList);
-
-}

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

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.EvaluationModuleMapping;
-
-/**
- * <p>
- * 管理与评估模板表 服务类
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-11
- */
-public interface EvaluationModuleMappingService extends IService<EvaluationModuleMapping> {
-
-}

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

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.IndexConfig;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-11
- */
-public interface IndexConfigService extends IService<IndexConfig> {
-
-}

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

@@ -1,24 +0,0 @@
-package com.diagbot.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.IndexDataDTO;
-import com.diagbot.entity.IndexData;
-
-/**
- * <p>
- * 指标数据表 服务类
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-11
- */
-public interface IndexDataService extends IService<IndexData> {
-
-	List<IndexDataDTO> getIndexDataAll(Map<String, Object> indexDataMap);
-
-	boolean insertIndexDataList(List<IndexData> IndexDataList);
-
-}

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

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.entity.EvaluationModuleMapping;
-import com.diagbot.mapper.EvaluationModuleMappingMapper;
-import com.diagbot.service.EvaluationModuleMappingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 管理与评估模板表 服务实现类
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-11
- */
-@Service
-public class EvaluationModuleMappingServiceImpl extends ServiceImpl<EvaluationModuleMappingMapper, EvaluationModuleMapping> implements EvaluationModuleMappingService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.entity.IndexConfig;
-import com.diagbot.mapper.IndexConfigMapper;
-import com.diagbot.service.IndexConfigService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-11
- */
-@Service
-public class IndexConfigServiceImpl extends ServiceImpl<IndexConfigMapper, IndexConfig> implements IndexConfigService {
-
-}

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

@@ -1,35 +0,0 @@
-package com.diagbot.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.IndexDataDTO;
-import com.diagbot.entity.IndexData;
-import com.diagbot.mapper.IndexDataMapper;
-import com.diagbot.service.IndexDataService;
-
-/**
- * <p>
- * 指标数据表 服务实现类
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-11
- */
-@Service
-public class IndexDataServiceImpl extends ServiceImpl<IndexDataMapper, IndexData> implements IndexDataService {
-
-	@Override
-	public List<IndexDataDTO> getIndexDataAll(Map<String, Object> indexDataMap) {
-		return baseMapper.getIndexDataAll(indexDataMap);
-	}
-	
-	@Override
-	public boolean insertIndexDataList(List<IndexData> IndexDataList){
-		return baseMapper.insertIndexDataList(IndexDataList);
-	}
-
-}

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

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月6日 下午5:11:54
+ */
+@Setter
+@Getter
+public class EvaluationdiseaseNameVO {
+
+	private String diseaseName;
+	
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月6日 下午6:41:38
+ */
+@Setter
+@Getter
+public class IndexConfigdiseaseNameVO {
+	private String diseaseName;
+}

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

@@ -1,20 +1,23 @@
 package com.diagbot.web;
 
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.EvaluationModuleMappingDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.EvaluationModuleMappingFacade;
-import com.diagbot.vo.EvaluationDiseaseIdVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import java.util.List;
+
+import javax.validation.Valid;
+
 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.List;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.EvaluationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.EvaluationModuleMappingFacade;
+import com.diagbot.vo.EvaluationDiseaseIdVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * <p>
@@ -26,18 +29,18 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/evaluationModuleMapping")
-@Api(value = "管理与评估模板API[by:wangfeng]", tags = { "WF-2期-管理与评估模板API" })
+@Api(value = "知识库标准化-管理与评估模板API[by:wangfeng]", tags = { "知识库标准化-管理与评估模板API" })
 @SuppressWarnings("unchecked")
 public class EvaluationModuleMappingController {
 
     @Autowired
     EvaluationModuleMappingFacade evaluationModuleMappingFacade;
 
-    @ApiOperation(value = "2期-获取管理与评估模板[by:wangfeng]", notes = "获取管理与评估模板")
+    @ApiOperation(value = "知识库标准化-获取管理与评估模板[by:wangfeng]", notes = "获取管理与评估模板")
     @PostMapping("/getEvaluationModules")
     @SysLogger("getEvaluationModules")
-    public RespDTO<List<EvaluationModuleMappingDTO>> getEvaluationModules(@Valid @RequestBody EvaluationDiseaseIdVO evaluationDiseaseIdVO) {
-        List<EvaluationModuleMappingDTO> data = evaluationModuleMappingFacade.getEvaluationModule(evaluationDiseaseIdVO);
+    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid @RequestBody EvaluationDiseaseIdVO evaluationDiseaseIdVO) {
+        List<EvaluationDTO> data = evaluationModuleMappingFacade.getEvaluationModule(evaluationDiseaseIdVO);
         return RespDTO.onSuc(data);
     }
 

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

@@ -1,22 +1,24 @@
 package com.diagbot.web;
 
 
+import java.util.List;
+
+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 com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.IndexConfigDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.IndexConfigFacade;
-import com.diagbot.vo.IndexConfigDiseaseIdVO;
+import com.diagbot.vo.IndexConfigdiseaseNameVO;
+
 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 springfox.documentation.annotations.ApiIgnore;
 
-import java.util.List;
-
 /**
  * <p>
  * 前端控制器
@@ -29,17 +31,16 @@ import java.util.List;
 @RequestMapping("/indexConfig")
 @Api(value = "指标配置API[by:wangfeng]", tags = { "知识库标准化-指标配置API" })
 @SuppressWarnings("unchecked")
-@ApiIgnore
 public class IndexConfigController {
 
     @Autowired
     IndexConfigFacade indexConfigFacade;
 
-    @ApiOperation(value = "知识库标准化-根据疾病Id获取指标配置[by:wangfeng]", notes = "根据疾病Id获取指标配置")
+    @ApiOperation(value = "知识库标准化-根据疾病获取指标配置[by:wangfeng]", notes = "根据疾病获取指标配置")
     @PostMapping("/getindexConfigs")
     @SysLogger("getindexConfigs")
-    public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
-        List<IndexConfigDTO> data = indexConfigFacade.getindexConfig(indexConfigDiseaseIdVO.getDiseaseId());
-        return RespDTO.onSuc(data);
+    public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
+    	return indexConfigFacade.getindexConfig(indexConfigdiseaseNameVO);
+         
     }
 }

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

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.EvaluationModuleMappingMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.EvaluationModuleMapping">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="region_name" property="regionName" />
-        <result column="region_type" property="regionType" />
-        <result column="order_no" property="orderNo" />
-        <result column="disease_id" property="diseaseId" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-</mapper>

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

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.IndexConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.IndexConfig">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="index_unique" property="indexUnique" />
-        <result column="disease_id" property="diseaseId" />
-        <result column="index_desc" property="indexDesc" />
-        <result column="order_no" property="orderNo" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-</mapper>

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

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.IndexDataMapper">
-
-	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.diagbot.entity.IndexData">
-		<id column="id" property="id" />
-		<result column="is_deleted" property="isDeleted" />
-		<result column="gmt_create" property="gmtCreate" />
-		<result column="gmt_modified" property="gmtModified" />
-		<result column="creator" property="creator" />
-		<result column="modifier" property="modifier" />
-		<result column="index_unique" property="indexUnique" />
-		<result column="index_value" property="indexValue" />
-		<result column="index_unit" property="indexUnit" />
-		<result column="is_abnormal" property="isAbnormal" />
-		<result column="creat_time" property="creatTime" />
-		<result column="patient_id" property="patientId" />
-		<result column="inquiry_code" property="inquiryCode" />
-		<result column="remark" property="remark" />
-	</resultMap>
-
-	<select id="getIndexDataAll" resultType="com.diagbot.dto.IndexDataDTO">
-		SELECT
-		a.id as id,
-		a.index_unique as indexUnique,
-		a.index_value as
-		indexValue,
-		a.index_unit as indexUnit,
-		b.index_desc as indexDesc,
-		a.is_abnormal as isAbnormal,
-		a.creat_time as creatTime,
-		a.patient_id as patientId,
-		a.inquiry_code as
-		inquiryCode
-		FROM
-		icss_index_data a
-		JOIN icss_index_config b
-		WHERE
-		a.is_deleted = "N"
-		AND b.is_deleted = "N"
-		AND b.index_unique =
-		a.index_unique
-		<if test="indexDataMap.diseaseId != null">
-			AND b.disease_id = #{indexDataMap.diseaseId}
-		</if>
-		<if test="indexDataMap.startTime != null and indexDataMap.endTime != null">
-			AND a.creat_time BETWEEN #{indexDataMap.startTime} AND
-			#{indexDataMap.endTime}
-		</if>
-		AND a.patient_id = #{indexDataMap.patientId}
-
-	</select>
-	<insert id="insertIndexDataList" parameterType="java.util.List">
-		insert into icss_index_data
-		(gmt_create , creator ,
-		index_unique,index_value,index_unit,is_abnormal,creat_time,patient_id,inquiry_code
-		)
-		values
-		<foreach collection="list" item="IndexDataList" index="index"
-			separator=",">
-			(
-			#{IndexDataList.gmtCreate},
-			#{IndexDataList.creator},
-			#{IndexDataList.indexUnique},
-			#{IndexDataList.indexValue},
-			#{IndexDataList.indexUnit},
-			#{IndexDataList.isAbnormal},
-			#{IndexDataList.creatTime},
-			#{IndexDataList.patientId},
-			#{IndexDataList.inquiryCode}
-			)
-		</foreach>
-	</insert>
-</mapper>