1.疾病标签接口2.指标保存修改3.指标数据接口

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

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年4月10日 上午9:23:31
+ */
+@Setter
+@Getter
+public class IndexConfigAndDataDTO {
+
+	private List<ItemIndexDTO> ItemIndexData;
+	private List<IndexConfigDTO> IndexConfigData;
+}

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

@@ -9,11 +9,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.diagbot.dto.IndexConfigDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 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;
@@ -44,7 +45,7 @@ public class IndexDataFacade extends IndexDataServiceImpl {
      * @param indexDataFindVO
      * @return
      */
-    public List<ItemIndexDTO> getIndexDataAll(IndexDataFindVO indexDataFindVO) {
+    public IndexConfigAndDataDTO getIndexDataAll(IndexDataFindVO indexDataFindVO) {
 
         Map<String, Object> indexDataMap = new HashMap<>();
         indexDataMap.put("diseaseId", indexDataFindVO.getDiseaseId());
@@ -79,7 +80,10 @@ public class IndexDataFacade extends IndexDataServiceImpl {
             list.add(itemIndexDTO);
 
         }
-        return list;
+        IndexConfigAndDataDTO indexsData = new IndexConfigAndDataDTO();
+        indexsData.setIndexConfigData(indexConfigFacade.getindexConfig(indexDataFindVO.getDiseaseId()));
+        indexsData.setItemIndexData(list);
+        return indexsData;
     }
 
     /**
@@ -130,10 +134,11 @@ public class IndexDataFacade extends IndexDataServiceImpl {
 					IndexDataList.add(indexData);
 				}
 			}
-
-			res = insertIndexDataList(IndexDataList);
+			if(ListUtil.isNotEmpty(IndexDataList)){
+			   res = insertIndexDataList(IndexDataList);
+			}
+			
 		}
-
 		return res;
 	}
 

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

@@ -1,24 +1,25 @@
 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.ItemIndexDTO;
+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;
-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 springfox.documentation.annotations.ApiIgnore;
 
-import javax.validation.Valid;
-import java.util.List;
-
 /**
  * <p>
  * 指标数据表 前端控制器
@@ -40,9 +41,9 @@ public class IndexDataController {
     @ApiOperation(value = "2期-根据疾病Id获取指标配置[by:wangfeng]", notes = "diseaseId：疾病Id 必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
     @PostMapping("/getIndexDatas")
     @SysLogger("getIndexDatas")
-    public RespDTO<List<ItemIndexDTO>> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
+    public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
 
-        List<ItemIndexDTO> data = indexDataFacade.getIndexDataAll(indexDataFindVO);
+    	IndexConfigAndDataDTO data = indexDataFacade.getIndexDataAll(indexDataFindVO);
 
         return RespDTO.onSuc(data);
     }
@@ -51,7 +52,6 @@ public class IndexDataController {
     @PostMapping("/saveIndexDatas")
     @SysLogger("saveIndexDatas")
     @Transactional
-    @ApiIgnore
     public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
 
         boolean res = indexDataFacade.saveIndexDatas(indexDataSaveVO);

icssman-service/src/main/java/com/diagbot/dto/DiseaseInfoDTO.java

@@ -0,0 +1,24 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年4月9日 下午4:38:05
+ */
+@Setter
+@Getter
+public class DiseaseInfoDTO {
+	/**
+	 * 疾病id
+	 */
+	private Long diseaseId;
+
+	/**
+	 * 疾病id
+	 */
+	private String diseaseName;
+}

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

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.DiseaseInfoDTO;
 import com.diagbot.dto.EvaluationModuleAllDTO;
 import com.diagbot.dto.EvaluationModuleMappingDTO;
 import com.diagbot.dto.RespDTO;
@@ -29,6 +30,7 @@ import com.diagbot.service.impl.EvaluationModuleMappingServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DiseaseNameVO;
 import com.diagbot.vo.EvaluationModuleDiseaseIdVO;
 import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
 import com.diagbot.vo.EvaluationModuleListVO;
@@ -183,4 +185,9 @@ public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServic
 		return update(new EvaluationModuleMapping(), evaluaNew);
 	}
 
+	public List<DiseaseInfoDTO> queryEvaluationDiseaseName(DiseaseNameVO diseaseNameVO) {
+		// TODO Auto-generated method stub
+		return evaluationModuleMappingService.queryEvaluationDiseaseName(diseaseNameVO);
+	}
+
 }

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

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.DiseaseInfoDTO;
 import com.diagbot.dto.IndexConfigAllDTO;
 import com.diagbot.dto.IndexConfigDTO;
 import com.diagbot.dto.RespDTO;
@@ -27,6 +28,7 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DiseaseNameVO;
 import com.diagbot.vo.IndexConfigDiseaseIdVO;
 import com.diagbot.vo.IndexConfigDiseaseNameVO;
 import com.diagbot.vo.IndexConfigListVO;
@@ -182,4 +184,13 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
 	    .set("gmt_modified", DateUtil.now());
 		return update(new IndexConfig(), IndexConfigNew);
 	}
+	/**
+	 * 
+	 * @param diseaseNameVO
+	 * @return
+	 */
+	public List<DiseaseInfoDTO> queryIndexConfigDiseaseName(DiseaseNameVO diseaseNameVO) {
+		// TODO Auto-generated method stub
+		return indexConfigService.queryIndexConfigDiseaseName(diseaseNameVO);
+	}
 }

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

@@ -2,9 +2,14 @@ package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DiseaseInfoDTO;
 import com.diagbot.dto.EvaluationModuleMappingDTO;
 import com.diagbot.entity.EvaluationModuleMapping;
+import com.diagbot.vo.DiseaseNameVO;
 import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
+
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
 
@@ -20,4 +25,6 @@ public interface EvaluationModuleMappingMapper extends BaseMapper<EvaluationModu
 
     IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(@Param("evaluationModule") EvaluationModuleDiseaseNameVO evaluationModule);
 
+	List<DiseaseInfoDTO> queryEvaluationDiseaseName(@Param("diseaseNameVO") DiseaseNameVO diseaseNameVO);
+
 }

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

@@ -1,12 +1,16 @@
 package com.diagbot.mapper;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.dto.DiseaseInfoDTO;
 import com.diagbot.dto.IndexConfigDTO;
 import com.diagbot.entity.IndexConfig;
+import com.diagbot.vo.DiseaseNameVO;
 import com.diagbot.vo.IndexConfigDiseaseNameVO;
 
 /**
@@ -21,4 +25,7 @@ public interface IndexConfigMapper extends BaseMapper<IndexConfig> {
 
 	IPage<IndexConfigDTO> queryIndexConfigPageAlls(@Param("indexConfigVO")IndexConfigDiseaseNameVO indexConfigVO);
 
+	List<DiseaseInfoDTO> queryIndexConfigDiseaseName(@Param("diseaseNameVO") DiseaseNameVO diseaseNameVO);
+
+
 }

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

@@ -1,9 +1,13 @@
 package com.diagbot.service;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.DiseaseInfoDTO;
 import com.diagbot.dto.EvaluationModuleMappingDTO;
 import com.diagbot.entity.EvaluationModuleMapping;
+import com.diagbot.vo.DiseaseNameVO;
 import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
 
 /**
@@ -18,4 +22,6 @@ public interface EvaluationModuleMappingService extends IService<EvaluationModul
 
     IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(EvaluationModuleDiseaseNameVO evaluationModuleDiseaseNameVO);
 
+	List<DiseaseInfoDTO> queryEvaluationDiseaseName(DiseaseNameVO diseaseNameVO);
+
 }

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

@@ -1,10 +1,14 @@
 package com.diagbot.service;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.DiseaseInfoDTO;
 import com.diagbot.dto.IndexConfigDTO;
 import com.diagbot.entity.IndexConfig;
+import com.diagbot.vo.DiseaseNameVO;
 import com.diagbot.vo.IndexConfigDiseaseNameVO;
 
 /**
@@ -19,4 +23,6 @@ public interface IndexConfigService extends IService<IndexConfig> {
 
 	public IPage<IndexConfigDTO> queryIndexConfigPageAlls(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO);
 
+	public List<DiseaseInfoDTO> queryIndexConfigDiseaseName(DiseaseNameVO diseaseNameVO);
+
 }

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

@@ -2,11 +2,16 @@ package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.DiseaseInfoDTO;
 import com.diagbot.dto.EvaluationModuleMappingDTO;
 import com.diagbot.entity.EvaluationModuleMapping;
 import com.diagbot.mapper.EvaluationModuleMappingMapper;
 import com.diagbot.service.EvaluationModuleMappingService;
+import com.diagbot.vo.DiseaseNameVO;
 import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
+
+import java.util.List;
+
 import org.springframework.stereotype.Service;
 
 /**
@@ -26,5 +31,11 @@ public class EvaluationModuleMappingServiceImpl extends ServiceImpl<EvaluationMo
 
     }
 
+	@Override
+	public List<DiseaseInfoDTO> queryEvaluationDiseaseName(DiseaseNameVO diseaseNameVO) {
+		// TODO Auto-generated method stub
+		return baseMapper.queryEvaluationDiseaseName(diseaseNameVO);
+	}
+
 
 }

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

@@ -1,14 +1,18 @@
 package com.diagbot.service.impl;
 
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.DiseaseInfoDTO;
 import com.diagbot.dto.IndexConfigDTO;
 import com.diagbot.entity.IndexConfig;
 import com.diagbot.mapper.IndexConfigMapper;
 import com.diagbot.service.IndexConfigService;
+import com.diagbot.vo.DiseaseNameVO;
 import com.diagbot.vo.IndexConfigDiseaseNameVO;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 
 /**
  * <p>
@@ -26,4 +30,9 @@ public class IndexConfigServiceImpl extends ServiceImpl<IndexConfigMapper, Index
 		return baseMapper.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
 	}
 
+	public List<DiseaseInfoDTO> queryIndexConfigDiseaseName(DiseaseNameVO diseaseNameVO) {
+		// TODO Auto-generated method stub
+		return baseMapper.queryIndexConfigDiseaseName(diseaseNameVO);
+	}
+
 }

icssman-service/src/main/java/com/diagbot/vo/DiseaseNameVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年4月9日 下午4:42:06
+ */
+@Setter
+@Getter
+public class DiseaseNameVO {
+
+	private String  diseaseName;
+}

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

@@ -3,10 +3,12 @@ package com.diagbot.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DiseaseInfoDTO;
 import com.diagbot.dto.EvaluationModuleAllDTO;
 import com.diagbot.dto.EvaluationModuleMappingDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.EvaluationModuleMappingFacade;
+import com.diagbot.vo.DiseaseNameVO;
 import com.diagbot.vo.EvaluationModuleDiseaseIdVO;
 import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
 import com.diagbot.vo.EvaluationModuleListVO;
@@ -102,4 +104,15 @@ public class EvaluationModuleMappingController {
 
         return RespDTO.onSuc(res);
     }
+    
+    @ApiOperation(value = "慢病疾病标签查询[by:wangfeng]", notes = "请输 ：diseaseId;")
+	@PostMapping("/queryEvaluationDiseaseNames")
+	@SysLogger("queryEvaluationDiseaseNames")
+	@Transactional
+	public RespDTO<List<DiseaseInfoDTO>> queryEvaluationDiseaseNames(@RequestBody DiseaseNameVO diseaseNameVO) {
+
+		List<DiseaseInfoDTO> data = evaluationModuleMappingFacade.queryEvaluationDiseaseName(diseaseNameVO);
+
+		return RespDTO.onSuc(data);
+	}
 }

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

@@ -11,10 +11,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DiseaseInfoDTO;
 import com.diagbot.dto.IndexConfigAllDTO;
 import com.diagbot.dto.IndexConfigDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.IndexConfigFacade;
+import com.diagbot.vo.DiseaseNameVO;
 import com.diagbot.vo.IndexConfigDiseaseIdVO;
 import com.diagbot.vo.IndexConfigDiseaseNameVO;
 import com.diagbot.vo.IndexConfigListVO;
@@ -94,4 +96,15 @@ public class IndexConfigController {
 
 		return RespDTO.onSuc(res);
 	}
+	
+	@ApiOperation(value = "慢病指标疾病标签查询[by:wangfeng]", notes = "请输 ：diseaseId;")
+	@PostMapping("/queryIndexConfigDiseaseNames")
+	@SysLogger("queryIndexConfigDiseaseNames")
+	@Transactional
+	public RespDTO<List<DiseaseInfoDTO>> queryIndexConfigDiseaseNames(@RequestBody DiseaseNameVO diseaseNameVO) {
+
+		List<DiseaseInfoDTO> data = indexConfigFacade.queryIndexConfigDiseaseName(diseaseNameVO);
+
+		return RespDTO.onSuc(data);
+	}
 }

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

@@ -39,4 +39,22 @@
 	GROUP BY a.disease_id
 	ORDER BY a.gmt_create DESC
 </select>
+<select id="queryEvaluationDiseaseName" resultType="com.diagbot.dto.DiseaseInfoDTO">
+	SELECT
+	a.dis_id AS diseaseId,
+	b.tag_name AS diseaseName
+	FROM
+	icss_dis_type a
+	LEFT JOIN icss_evaluation_module_mapping c
+	ON a.dis_id = c.disease_id
+	JOIN icss_question_info b
+	ON a.dis_id = b.id
+	WHERE c.disease_id IS NULL
+	AND a.is_deleted = "N"
+	<if test="diseaseNameVO.diseaseName != null">
+	AND b.tag_name LIKE CONCAT('%', #{diseaseNameVO.diseaseName}, '%')
+	</if>
+	ORDER BY b.tag_name DESC
+</select>
+
 </mapper>

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

@@ -35,4 +35,21 @@
 	GROUP BY a.disease_id
 	ORDER BY a.gmt_create DESC
 </select>
+<select id="queryIndexConfigDiseaseName" resultType="com.diagbot.dto.DiseaseInfoDTO">
+	SELECT
+	a.dis_id AS diseaseId,
+	b.tag_name AS diseaseName
+	FROM
+	icss_dis_type a
+	LEFT JOIN icss_index_config c
+	ON a.dis_id = c.disease_id
+	JOIN icss_question_info b
+	ON a.dis_id = b.id
+	WHERE c.disease_id IS NULL
+	AND a.is_deleted = "N"
+	<if test="diseaseNameVO.diseaseName != null">
+	AND b.tag_name LIKE CONCAT('%', #{diseaseNameVO.diseaseName}, '%')
+	</if>
+	ORDER BY b.tag_name DESC
+</select>
 </mapper>