Browse Source

管理与评估代码

wangfeng 6 years ago
parent
commit
421d10c6fa
31 changed files with 1613 additions and 0 deletions
  1. 17 0
      icss-service/src/main/java/com/diagbot/dto/EvaluationModuleAllDTO.java
  2. 62 0
      icss-service/src/main/java/com/diagbot/dto/EvaluationModuleMappingDTO.java
  3. 39 0
      icss-service/src/main/java/com/diagbot/dto/IndexConfigDTO.java
  4. 57 0
      icss-service/src/main/java/com/diagbot/dto/IndexDataDTO.java
  5. 26 0
      icss-service/src/main/java/com/diagbot/dto/ItemIndexDTO.java
  6. 164 0
      icss-service/src/main/java/com/diagbot/entity/EvaluationModuleMapping.java
  7. 166 0
      icss-service/src/main/java/com/diagbot/entity/IndexConfig.java
  8. 203 0
      icss-service/src/main/java/com/diagbot/entity/IndexData.java
  9. 62 0
      icss-service/src/main/java/com/diagbot/facade/EvaluationModuleMappingFacade.java
  10. 50 0
      icss-service/src/main/java/com/diagbot/facade/IndexConfigFacade.java
  11. 132 0
      icss-service/src/main/java/com/diagbot/facade/IndexDataFacade.java
  12. 16 0
      icss-service/src/main/java/com/diagbot/mapper/EvaluationModuleMappingMapper.java
  13. 16 0
      icss-service/src/main/java/com/diagbot/mapper/IndexConfigMapper.java
  14. 26 0
      icss-service/src/main/java/com/diagbot/mapper/IndexDataMapper.java
  15. 16 0
      icss-service/src/main/java/com/diagbot/service/EvaluationModuleMappingService.java
  16. 16 0
      icss-service/src/main/java/com/diagbot/service/IndexConfigService.java
  17. 24 0
      icss-service/src/main/java/com/diagbot/service/IndexDataService.java
  18. 20 0
      icss-service/src/main/java/com/diagbot/service/impl/EvaluationModuleMappingServiceImpl.java
  19. 20 0
      icss-service/src/main/java/com/diagbot/service/impl/IndexConfigServiceImpl.java
  20. 35 0
      icss-service/src/main/java/com/diagbot/service/impl/IndexDataServiceImpl.java
  21. 23 0
      icss-service/src/main/java/com/diagbot/vo/EvaluationDiseaseIdVO.java
  22. 21 0
      icss-service/src/main/java/com/diagbot/vo/IndexConfigDiseaseIdVO.java
  23. 35 0
      icss-service/src/main/java/com/diagbot/vo/IndexDataFindVO.java
  24. 40 0
      icss-service/src/main/java/com/diagbot/vo/IndexDataSaveVO.java
  25. 47 0
      icss-service/src/main/java/com/diagbot/vo/IndexDataVO.java
  26. 50 0
      icss-service/src/main/java/com/diagbot/web/EvaluationModuleMappingController.java
  27. 49 0
      icss-service/src/main/java/com/diagbot/web/IndexConfigController.java
  28. 66 0
      icss-service/src/main/java/com/diagbot/web/IndexDataController.java
  29. 20 0
      icss-service/src/main/resources/mapper/EvaluationModuleMappingMapper.xml
  30. 20 0
      icss-service/src/main/resources/mapper/IndexConfigMapper.xml
  31. 75 0
      icss-service/src/main/resources/mapper/IndexDataMapper.xml

+ 17 - 0
icss-service/src/main/java/com/diagbot/dto/EvaluationModuleAllDTO.java

@@ -0,0 +1,17 @@
+package com.diagbot.dto;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月11日 下午6:39:57
+ */
+public class EvaluationModuleAllDTO {
+
+	private  List<EvaluationModuleMappingDTO> evaluationModule;
+	private Map<String, String> Result = new HashMap<>();
+}

+ 62 - 0
icss-service/src/main/java/com/diagbot/dto/EvaluationModuleMappingDTO.java

@@ -0,0 +1,62 @@
+package com.diagbot.dto;
+
+import java.time.LocalDateTime;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月11日 下午6:14:42
+ */
+@Setter
+@Getter
+public class EvaluationModuleMappingDTO {
+
+	private Long id;
+
+	/**
+	 * 记录创建时间
+	 */
+	private LocalDateTime gmtCreate;
+
+	/**
+	 * 记录修改时间,如果时间是1970年则表示纪录未修改
+	 */
+	private LocalDateTime gmtModified;
+
+	/**
+	 * 创建人,0表示无创建人值
+	 */
+	private String creator;
+
+	/**
+	 * 修改人,如果为0则表示纪录未修改
+	 */
+	private String modifier;
+
+	/**
+	 * 区域名
+	 */
+	private String regionName;
+
+	/**
+	 * 区域类型
+	 */
+	private String regionType;
+
+	/**
+	 * 区域顺序
+	 */
+	private Integer orderNo;
+
+	/**
+	 * 疾病id
+	 */
+	private Long diseaseId;
+	
+	
+	private Object data;
+}

+ 39 - 0
icss-service/src/main/java/com/diagbot/dto/IndexConfigDTO.java

@@ -0,0 +1,39 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月11日 下午6:56:16
+ */
+@Setter
+@Getter
+public class IndexConfigDTO {
+	private Long id;
+
+	/**
+	 * 指标公表名
+	 */
+	private String indexUnique;
+
+	/**
+	 * 疾病id
+	 */
+	private Long diseaseId;
+
+	private Long indexDesc;
+	/**
+	 * 显示顺序
+	 */
+	private Integer orderNo;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+	
+	
+}

+ 57 - 0
icss-service/src/main/java/com/diagbot/dto/IndexDataDTO.java

@@ -0,0 +1,57 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月11日 下午7:33:48
+ */
+@Setter
+@Getter
+public class IndexDataDTO {
+	private Long id;
+
+	/**
+	 * 指标公表名
+	 */
+	private String indexUnique;
+
+	/**
+	 * 指标值
+	 */
+	private String indexValue;
+
+	/**
+	 * 指标单位
+	 */
+	private String indexUnit;
+
+	/**
+	 * 是否异常
+	 */
+	private Integer isAbnormal;
+
+	/**
+	 * 化验时间
+	 */
+	private Date creatTime;
+
+	/**
+	 * 患者id
+	 */
+	private Long patientId;
+
+	/**
+	 * 就诊号
+	 */
+	private String inquiryCode;
+
+	private Long indexDesc;
+	
+	private String remark;
+}

+ 26 - 0
icss-service/src/main/java/com/diagbot/dto/ItemIndexDTO.java

@@ -0,0 +1,26 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月12日 上午10:24:05
+ */
+@Setter
+@Getter
+public class ItemIndexDTO {
+
+	private String itemName; // 指标名称
+	private List<String> indexUnit;//单位
+	private List<Integer> isAbnormal;//是否异常
+	private List<String> indexValue; 
+	private List<Date> creatTime;
+	//private Map<String, Object> data;
+	
+}

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

@@ -0,0 +1,164 @@
+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 +
+        "}";
+    }
+}

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

@@ -0,0 +1,166 @@
+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 +
+        "}";
+    }
+}

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

@@ -0,0 +1,203 @@
+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 +
+        "}";
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.diagbot.facade;
+
+import java.util.List;
+import java.util.Map;
+
+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.util.BeanUtil;
+import com.diagbot.vo.EvaluationDiseaseIdVO;
+
+/**
+ * 
+ * @author wangfeng
+ * 
+ * @Description: TODO
+ * @date 2019年3月11日 下午4:19:09
+ */
+@Component
+public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServiceImpl {
+
+	/*@Autowired
+	IndexConfigFacade indexConfigFacade;
+	*/
+	@Autowired
+	PushFacade pushFacade;
+
+	/**
+	 * 获取管理与评估模板接口
+	 * @param evaluationDiseaseIdVO
+	 * @return
+	 */
+	public List<EvaluationModuleMappingDTO> 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<EvaluationModuleMappingDTO> data = BeanUtil.listCopyTo(datas, EvaluationModuleMappingDTO.class);
+		//获取大数据知识图谱推送数据
+		Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(evaluationDiseaseIdVO, null);
+		for (String key : jsonobject.keySet()) {
+			for (EvaluationModuleMappingDTO evaluadata : data) {
+				if (key.equals(evaluadata.getRegionName())) {
+					evaluadata.setData(jsonobject.get(key));
+
+				}
+			}
+
+		}
+		return data;
+	}
+
+}

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

@@ -0,0 +1,50 @@
+package com.diagbot.facade;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Component;
+
+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;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月11日 下午4:20:09
+ */
+@Component
+public class IndexConfigFacade extends IndexConfigServiceImpl{
+
+	/**
+	 * 根据疾病Id获取指标配置
+	 * @param indexConfigDiseaseIdVO
+	 * @return 
+	 */
+	public List<IndexConfigDTO> getindexConfig(Long diseaseId) {
+		QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        if(diseaseId!=null){
+        	mapAll.put("disease_id", diseaseId);
+        }
+        
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        IndexConfigQuery.allEq(mapAll);
+        List<IndexConfigDTO> data = new ArrayList<IndexConfigDTO>();
+        List<IndexConfig> datas = list(IndexConfigQuery);
+        
+		//过滤
+        data = BeanUtil.listCopyTo(datas, IndexConfigDTO.class);
+		return data;
+	}
+
+	
+
+}

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

@@ -0,0 +1,132 @@
+package com.diagbot.facade;
+
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+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.IndexDataService;
+import com.diagbot.service.impl.IndexDataServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.vo.IndexDataFindVO;
+import com.diagbot.vo.IndexDataSaveVO;
+import com.diagbot.vo.IndexDataVO;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月11日 下午4:20:33
+ */
+@Component
+public class IndexDataFacade extends IndexDataServiceImpl {
+
+	@Autowired
+	IndexDataService indexDataService;
+	@Autowired
+	IndexConfigFacade indexConfigFacade;
+
+	/**
+	 * 根据疾病id和用户id,开始时间和结束时间 查询用户指标数据
+	 * 
+	 * @param indexDataAllVO
+	 * @return
+	 */
+	public List<ItemIndexDTO> getIndexDataAll(IndexDataFindVO indexDataFindVO) {
+
+		Map<String, Object> indexDataMap = new HashMap<>();
+		indexDataMap.put("diseaseId", indexDataFindVO.getDiseaseId());
+		indexDataMap.put("patientId", indexDataFindVO.getPatientId());
+		indexDataMap.put("startTime", indexDataFindVO.getStartTime());
+		indexDataMap.put("endTime", indexDataFindVO.getEndTime());
+		//获取慢病指标数据
+		List<IndexDataDTO> data = indexDataService.getIndexDataAll(indexDataMap);
+		List<ItemIndexDTO> list = new ArrayList<ItemIndexDTO>();
+		// 根据公表名分组
+		Map<String, List<IndexDataDTO>> dataMap = data.stream()
+				.collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
+
+		for (String key : dataMap.keySet()) {
+			ItemIndexDTO itemIndexDTO = new ItemIndexDTO();
+			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);
+
+		}
+		return list;
+	}
+
+	/**
+	 * 保存指标数据
+	 * 
+	 * @param indexDataSaveVO
+	 * @return
+	 */
+	public boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
+		// 先查询该用户相同就诊号所保留的数据,将其删除
+		UpdateWrapper<IndexData> IndexDataUpdate = new UpdateWrapper<>();
+		Map<String, Object> mapAll = new HashMap<>();
+		mapAll.put("inquiry_code", indexDataSaveVO.getInquiryCode());
+		mapAll.put("patient_id", indexDataSaveVO.getPatientId());
+		IndexDataUpdate.allEq(mapAll).eq("is_deleted", IsDeleteEnum.N.getKey())
+				.set("is_deleted", IsDeleteEnum.Y.getKey())
+				// .set("modifier",UserUtils.getCurrentPrincipleID())
+				.set("gmt_modified", DateUtil.now());
+		boolean res = update(new IndexData(), IndexDataUpdate);
+
+		// 遍历数据进行保存
+		List<IndexData> IndexDataList = new ArrayList<IndexData>();
+		List<IndexDataVO> indexDatas = indexDataSaveVO.getIndexData();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		for (IndexDataVO indexDataNew : indexDatas) {
+			IndexData indexData = new IndexData();
+			indexData.setCreator(indexDataSaveVO.getDoctorId().toString());
+			indexData.setGmtCreate(DateUtil.now());
+			indexData.setIndexUnique(indexDataNew.getIndexUnique());
+			try {
+				indexData.setCreatTime(sdf.parse(indexDataNew.getCreatTime()));
+			} catch (ParseException e) {
+				throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
+			}
+			indexData.setIndexUnit(indexDataNew.getIndexUnit());
+			indexData.setIndexValue(indexDataNew.getIndexValue());
+			indexData.setInquiryCode(indexDataSaveVO.getInquiryCode());
+			indexData.setIsAbnormal(indexDataNew.getIsAbnormal());
+			indexData.setPatientId(indexDataSaveVO.getPatientId());
+			IndexDataList.add(indexData);
+		}
+
+		res = insertIndexDataList(IndexDataList);
+		
+		return res;
+	}
+
+}

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

@@ -0,0 +1,16 @@
+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> {
+
+}

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

@@ -0,0 +1,16 @@
+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> {
+
+}

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

@@ -0,0 +1,26 @@
+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);
+
+	public boolean insertIndexDataList(List<IndexData> indexDataList);
+
+}

+ 16 - 0
icss-service/src/main/java/com/diagbot/service/EvaluationModuleMappingService.java

@@ -0,0 +1,16 @@
+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> {
+
+}

+ 16 - 0
icss-service/src/main/java/com/diagbot/service/IndexConfigService.java

@@ -0,0 +1,16 @@
+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> {
+
+}

+ 24 - 0
icss-service/src/main/java/com/diagbot/service/IndexDataService.java

@@ -0,0 +1,24 @@
+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);
+
+	public boolean insertIndexDataList(List<IndexData> IndexDataList);
+
+}

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

@@ -0,0 +1,20 @@
+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 {
+
+}

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

@@ -0,0 +1,20 @@
+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 {
+
+}

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

@@ -0,0 +1,35 @@
+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);
+	}
+
+}

+ 23 - 0
icss-service/src/main/java/com/diagbot/vo/EvaluationDiseaseIdVO.java

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月11日 下午6:12:02
+ */
+@Setter
+@Getter
+public class EvaluationDiseaseIdVO extends PushVO{
+
+	/**
+	 * 疾病ID
+	 */
+	//@NotNull(message = "请输入疾病id")
+	//private Long diseaseId; 
+}

+ 21 - 0
icss-service/src/main/java/com/diagbot/vo/IndexConfigDiseaseIdVO.java

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月11日 下午6:47:34
+ */
+@Setter
+@Getter
+public class IndexConfigDiseaseIdVO {
+	/**
+	 * 疾病ID
+	 */
+	private Long diseaseId; 
+}

+ 35 - 0
icss-service/src/main/java/com/diagbot/vo/IndexDataFindVO.java

@@ -0,0 +1,35 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月11日 下午7:42:35
+ */
+@Setter
+@Getter
+public class IndexDataFindVO {
+
+	/**
+	 * 疾病ID
+	 */
+	@NotNull(message = "请输入疾病id")
+	private Long diseaseId;
+	/**
+	 * 患者id
+	 */
+	@NotNull(message = "请输入患者id")
+	private Long patientId;
+
+	@NotBlank(message = "请输入开始时间")
+	private String startTime;
+
+	@NotBlank(message = "请输入结束时间")
+	private String endTime;
+}

+ 40 - 0
icss-service/src/main/java/com/diagbot/vo/IndexDataSaveVO.java

@@ -0,0 +1,40 @@
+package com.diagbot.vo;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 指标保存接口参数
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月12日 下午1:38:23
+ */
+@Setter
+@Getter
+public class IndexDataSaveVO {
+	 /**
+     * 患者id
+     */
+	@NotNull(message = "请输入患者id")
+    private Long patientId;
+
+    /**
+     * 就诊号
+     */
+	@NotBlank(message = "请输入就诊号")
+    private String inquiryCode;
+	 /**
+     * 医生id
+     */
+	@NotNull(message = "请输入医生id")
+    private Long doctorId;
+    /**
+     * 指标值
+     */
+	private List<IndexDataVO> IndexData;
+}

+ 47 - 0
icss-service/src/main/java/com/diagbot/vo/IndexDataVO.java

@@ -0,0 +1,47 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月12日 下午1:44:01
+ */
+@Setter
+@Getter
+public class IndexDataVO {
+    /**
+     * 指标公表名
+     */
+	@NotBlank(message = "请输入指标公表名")
+    private String indexUnique;
+
+    /**
+     * 指标值
+     */
+	@NotBlank(message = "指标值")
+    private String indexValue;
+
+    /**
+     * 指标单位
+     */
+    private String indexUnit;
+
+    /**
+     * 是否异常
+     */
+    private Integer isAbnormal;
+
+    /**
+     * 化验时间
+     */
+    @NotBlank(message = "请输入化验时间")
+    private String creatTime;
+
+   
+
+}

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

@@ -0,0 +1,50 @@
+package com.diagbot.web;
+
+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 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 com.diagbot.vo.PushVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <p>
+ * 管理与评估模板表 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-03-11
+ */
+@RestController
+@RequestMapping("/evaluationModuleMapping")
+@Api(value = "管理与评估模板API[by:wangfeng]", tags = { "WF-2期-管理与评估模板API" })
+@SuppressWarnings("unchecked")
+public class EvaluationModuleMappingController {
+
+	@Autowired
+	EvaluationModuleMappingFacade evaluationModuleMappingFacade;
+
+	@ApiOperation(value = "获取管理与评估模板[by:wangfeng]", notes = "获取管理与评估模板")
+	@PostMapping("/getEvaluationModules")
+	@SysLogger("getEvaluationModules")
+	public RespDTO<List<EvaluationModuleMappingDTO>> getEvaluationModules(@Valid @RequestBody EvaluationDiseaseIdVO evaluationDiseaseIdVO) {
+
+		List<EvaluationModuleMappingDTO> data = evaluationModuleMappingFacade.getEvaluationModule(evaluationDiseaseIdVO);
+
+		return RespDTO.onSuc(data);
+	}
+
+}

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

@@ -0,0 +1,49 @@
+package com.diagbot.web;
+
+
+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 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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-03-11
+ */
+@RestController
+@RequestMapping("/indexConfig")
+@Api(value = "指标配置API[by:wangfeng]", tags = { "WF-2期-指标配置API" })
+@SuppressWarnings("unchecked")
+public class IndexConfigController {
+
+	@Autowired
+	IndexConfigFacade indexConfigFacade;
+	
+	@ApiOperation(value = "根据疾病Id获取指标配置[by:wangfeng]", notes = "根据疾病Id获取指标配置")
+	@PostMapping("/getindexConfigs")
+	@SysLogger("getindexConfigs")
+	public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+
+		List<IndexConfigDTO> data = indexConfigFacade.getindexConfig(indexConfigDiseaseIdVO.getDiseaseId());
+
+		return RespDTO.onSuc(data);
+	}
+}

+ 66 - 0
icss-service/src/main/java/com/diagbot/web/IndexDataController.java

@@ -0,0 +1,66 @@
+package com.diagbot.web;
+
+
+import java.util.List;
+
+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.ItemIndexDTO;
+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-03-11
+ */
+
+@RestController
+@RequestMapping("/indexData")
+@Api(value = "指标数据API[by:wangfeng]", tags = { "WF-2期-指标数据API" })
+@SuppressWarnings("unchecked")
+public class IndexDataController {
+	
+	@Autowired
+	IndexDataFacade indexDataFacade;
+	
+	@ApiOperation(value = "根据疾病Id获取指标配置[by:wangfeng]", notes = "根据疾病Id获取指标配置")
+	@PostMapping("/getIndexDatas")
+	@SysLogger("getIndexDatas")
+	@Transactional
+	public RespDTO<List<ItemIndexDTO>> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
+
+		List<ItemIndexDTO> data = indexDataFacade.getIndexDataAll(indexDataFindVO);
+
+		return RespDTO.onSuc(data);
+	}
+	
+	@ApiOperation(value = "保存指标数据[by:wangfeng]", notes = "根据疾病Id获取指标配置")
+	@PostMapping("/saveIndexDatas")
+	@SysLogger("saveIndexDatas")
+	@Transactional
+	public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
+
+		boolean res = indexDataFacade.saveIndexDatas(indexDataSaveVO);
+
+		return RespDTO.onSuc(res);
+	}
+	
+}

+ 20 - 0
icss-service/src/main/resources/mapper/EvaluationModuleMappingMapper.xml

@@ -0,0 +1,20 @@
+<?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>

+ 20 - 0
icss-service/src/main/resources/mapper/IndexConfigMapper.xml

@@ -0,0 +1,20 @@
+<?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>

+ 75 - 0
icss-service/src/main/resources/mapper/IndexDataMapper.xml

@@ -0,0 +1,75 @@
+<?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>