修改

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

@@ -26,7 +26,7 @@ import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.DeptInfoVO;
 import com.diagbot.vo.DisScaleVO;
-import com.diagbot.vo.EvaluationdiseaseNameVO;
+import com.diagbot.vo.EvaluationDiseaseNameVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.IndexConfigdiseaseNameVO;
@@ -108,7 +108,7 @@ public interface AiptServiceClient {
      * @return
      */
     @PostMapping("/evaluation/getEvaluationModules")
-    RespDTO<List<EvaluationDTO>> getEvaluationModules(@RequestBody EvaluationdiseaseNameVO evaluationdiseaseNameVO);
+    RespDTO<List<EvaluationDTO>> getEvaluationModules(@RequestBody EvaluationDiseaseNameVO evaluationdiseaseNameVO);
 
     /**
      * 获取指标配置

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

@@ -1,5 +1,14 @@
 package com.diagbot.client.hystrix;
 
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ConceptBaseVO;
@@ -26,19 +35,13 @@ import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.DeptInfoVO;
 import com.diagbot.vo.DisScaleVO;
-import com.diagbot.vo.EvaluationdiseaseNameVO;
+import com.diagbot.vo.EvaluationDiseaseNameVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.IndexConfigdiseaseNameVO;
 import com.diagbot.vo.RetrievalVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @Description:调用中间层服务
@@ -139,7 +142,7 @@ public class AiptServiceHystrix implements AiptServiceClient {
     }
 
     @Override
-    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid EvaluationdiseaseNameVO evaluationdiseaseNameVO) {
+    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid EvaluationDiseaseNameVO evaluationDiseaseNameVO) {
         log.error("【hystrix】调用{}异常", "getEvaluationModules");
         return null;
     }

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

@@ -10,12 +10,9 @@ import com.alibaba.fastjson.JSONObject;
 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;
+import com.diagbot.vo.EvaluationDiseaseNameVO;
 
 /**
  * 
@@ -40,33 +37,11 @@ public class EvaluationModuleMappingFacade  {
 	 * @param evaluationDiseaseIdVO
 	 * @return
 	 */
-	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);*/
-		EvaluationdiseaseNameVO evaluationdiseaseNameVO =new EvaluationdiseaseNameVO();
-		//TODO 联调需修改
-		evaluationdiseaseNameVO.setDiseaseName("糖尿病");
+	public List<EvaluationDTO> getEvaluationModule(EvaluationDiseaseNameVO evaluationdiseaseNameVO) {
 		RespDTO<List<EvaluationDTO>> evaluationList = aiptServiceClient.getEvaluationModules(evaluationdiseaseNameVO);
 		RespDTOUtil.respNGDeal(evaluationList, "获取管理与评估模板数据失败！");
 		List<EvaluationDTO> datas= evaluationList.data;
-		// 过滤
-		List<EvaluationDTO> data = BeanUtil.listCopyTo(datas, EvaluationDTO.class);
-		//获取大数据知识图谱推送数据
-		Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(evaluationDiseaseIdVO, null);
-		for (String key : jsonobject.keySet()) {
-			for (EvaluationDTO evaluadata : data) {
-				if (key.equals(evaluadata.getRegionName())) {
-					evaluadata.setData(jsonobject.get(key));
-
-				}
-			}
-
-		}
-		return data;
+		return datas;
 	}
 /*
 	*//**
@@ -77,7 +52,7 @@ public class EvaluationModuleMappingFacade  {
 	 * @return
 	 */
 	public List<EvaluationDTO> getEvaluationModule(Long diseaseId, Map<String, JSONObject> contentMap) {
-		EvaluationdiseaseNameVO evaluationdiseaseNameVO =new EvaluationdiseaseNameVO();
+		EvaluationDiseaseNameVO evaluationdiseaseNameVO =new EvaluationDiseaseNameVO();
 		evaluationdiseaseNameVO.setDiseaseName("糖尿病");
 		RespDTO<List<EvaluationDTO>> evaluationList = aiptServiceClient.getEvaluationModules(evaluationdiseaseNameVO);
 		List<EvaluationDTO> datas= evaluationList.data;

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

@@ -11,8 +11,8 @@ import lombok.Setter;
  */
 @Setter
 @Getter
-public class EvaluationdiseaseNameVO {
+public class EvaluationDiseaseNameVO extends PushVO{
 
-	private String diseaseName;
+	//private String diseaseName;
 	
 }

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

@@ -14,7 +14,7 @@ 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 com.diagbot.vo.EvaluationDiseaseNameVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,8 +39,8 @@ public class EvaluationModuleMappingController {
     @ApiOperation(value = "知识库标准化-获取管理与评估模板[by:wangfeng]", notes = "获取管理与评估模板")
     @PostMapping("/getEvaluationModules")
     @SysLogger("getEvaluationModules")
-    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid @RequestBody EvaluationDiseaseIdVO evaluationDiseaseIdVO) {
-        List<EvaluationDTO> data = evaluationModuleMappingFacade.getEvaluationModule(evaluationDiseaseIdVO);
+    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid @RequestBody EvaluationDiseaseNameVO evaluationDiseaseNameVO) {
+        List<EvaluationDTO> data = evaluationModuleMappingFacade.getEvaluationModule(evaluationDiseaseNameVO);
         return RespDTO.onSuc(data);
     }
 

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

@@ -17,7 +17,6 @@ import com.diagbot.vo.IndexConfigdiseaseNameVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * <p>
@@ -41,6 +40,6 @@ public class IndexConfigController {
     @SysLogger("getindexConfigs")
     public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
     	return indexConfigFacade.getindexConfig(indexConfigdiseaseNameVO);
-         
+     
     }
 }