管理评估推理

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

@@ -1,16 +1,18 @@
 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.diagbot.dto.EvaluationDTO;
 import com.diagbot.service.EvaluationService;
 import com.diagbot.service.impl.EvaluationServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.vo.EvaluationDiseaseNameVO;
+import com.diagbot.vo.SearchVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
 
 @Component
 public class EvaluationFacade extends EvaluationServiceImpl {
@@ -18,19 +20,22 @@ public class EvaluationFacade extends EvaluationServiceImpl {
 	@Autowired
 	PushFacade pushFacade;
 	@Autowired
+	@Qualifier("evaluationServiceImpl")
 	EvaluationService evaluationService;
 
 	/**
 	 * 获取管理与评估模板接口
 	 *
-	 * @param evaluationdiseaseNameVO
+	 * @param searchVo
 	 * @return
 	 */
-	public List<EvaluationDTO> getEvaluationModule(EvaluationDiseaseNameVO evaluationdiseaseNameVO) {
+	public List<EvaluationDTO> getEvaluationModule(SearchVo searchVo) {
 
+		EvaluationDiseaseNameVO evaluationdiseaseNameVO = new EvaluationDiseaseNameVO();
+		BeanUtil.copyProperties(searchVo, evaluationdiseaseNameVO);
 		List<EvaluationDTO> evaluationList = evaluationService.getEvaluationModule(evaluationdiseaseNameVO);
 
-		Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(evaluationdiseaseNameVO);
+		Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(searchVo);
 		for (String key : jsonobject.keySet()) {
 			for (EvaluationDTO evaluadata : evaluationList) {
 				if (key.equals(evaluadata.getRegionName())) {
@@ -40,4 +45,4 @@ public class EvaluationFacade extends EvaluationServiceImpl {
 		}
 		return evaluationList;
 	}
-}
+}

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

@@ -4,7 +4,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.EvaluationFacade;
-import com.diagbot.vo.EvaluationDiseaseNameVO;
+import com.diagbot.vo.SearchVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,9 +36,8 @@ public class EvaluationController {
     @ApiOperation(value = "获取管理与评估模板[by:wangfeng]", notes = "获取管理与评估模板")
     @PostMapping("/getEvaluationModules")
     @SysLogger("getEvaluationModules")
-    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid @RequestBody EvaluationDiseaseNameVO evaluationdiseaseNameVO) {
-        List<EvaluationDTO> data = evaluationFacade.getEvaluationModule(evaluationdiseaseNameVO);
+    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid @RequestBody SearchVo searchVo) {
+        List<EvaluationDTO> data = evaluationFacade.getEvaluationModule(searchVo);
         return RespDTO.onSuc(data);
     }
-
 }

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

@@ -26,7 +26,6 @@ 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.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.IndexConfigdiseaseNameVO;
@@ -104,11 +103,11 @@ public interface AiptServiceClient {
     /**
      * 获取管理评估模板
      *
-     * @param evaluationdiseaseNameVO
+     * @param searchData
      * @return
      */
     @PostMapping("/evaluation/getEvaluationModules")
-    RespDTO<List<EvaluationDTO>> getEvaluationModules(@RequestBody EvaluationDiseaseNameVO evaluationdiseaseNameVO);
+    RespDTO<List<EvaluationDTO>> getEvaluationModules(@RequestBody SearchData searchData);
 
     /**
      * 获取指标配置

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

@@ -1,14 +1,5 @@
 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;
@@ -35,13 +26,18 @@ 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.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;
 
 /**
  * @Description:调用中间层服务
@@ -142,7 +138,7 @@ public class AiptServiceHystrix implements AiptServiceClient {
     }
 
     @Override
-    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid EvaluationDiseaseNameVO evaluationDiseaseNameVO) {
+    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid SearchData searchData) {
         log.error("【hystrix】调用{}异常", "getEvaluationModules");
         return null;
     }

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

@@ -1,18 +1,15 @@
 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.diagbot.client.AiptServiceClient;
+import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.EvaluationDiseaseNameVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * 
@@ -22,51 +19,29 @@ import com.diagbot.vo.EvaluationDiseaseNameVO;
  * @date 2019年3月11日 下午4:19:09
  */
 @Component
-public class EvaluationModuleMappingFacade  {
+public class EvaluationModuleMappingFacade {
 
 	/*@Autowired
 	IndexConfigFacade indexConfigFacade;
 	*/
 	@Autowired
 	PushFacade pushFacade;
-	@Autowired 
+	@Autowired
 	AiptServiceClient aiptServiceClient;
+	@Autowired
+	AssembleFacade assembleFacade;
+
 	/**
 	 * 获取管理与评估模板接口
 	 *
-	 * @param evaluationDiseaseIdVO
+	 * @param evaluationdiseaseNameVO
 	 * @return
 	 */
 	public List<EvaluationDTO> getEvaluationModule(EvaluationDiseaseNameVO evaluationdiseaseNameVO) {
-		RespDTO<List<EvaluationDTO>> evaluationList = aiptServiceClient.getEvaluationModules(evaluationdiseaseNameVO);
+		SearchData searchData = assembleFacade.assembleData(evaluationdiseaseNameVO);
+		RespDTO<List<EvaluationDTO>> evaluationList = aiptServiceClient.getEvaluationModules(searchData);
 		RespDTOUtil.respNGDeal(evaluationList, "获取管理与评估模板数据失败！");
-		List<EvaluationDTO> datas= evaluationList.data;
+		List<EvaluationDTO> datas = evaluationList.data;
 		return datas;
 	}
-/*
-	*//**
-	 * 获取管理与评估模板接口
-	 *
-	 * @param diseaseId
-	 * @param contentMap
-	 * @return
-	 */
-	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<EvaluationDTO> data = BeanUtil.listCopyTo(datas, EvaluationDTO.class);
-		if (contentMap != null && contentMap.size() > 0) {
-			for (String key : contentMap.keySet()) {
-				for (EvaluationDTO evaluadata : data) {
-					if (key.equals(evaluadata.getRegionName())) {
-						evaluadata.setData(contentMap.get(key));
-					}
-				}
-			}
-		}
-		return data;
-	}
-}
+}

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

@@ -579,7 +579,7 @@ public class PushFacade {
     public List<ConceptPushDTO> addQuestionId(List<ConceptPushDTO> concepts, Integer type) {
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         List<String> nameList = concepts.stream().map(concept -> concept.getName()).collect(Collectors.toList());
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).in("tagName", nameList).eq("type", type);
+        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).in("tag_name", nameList).eq("type", type);
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
         if (ListUtil.isNotEmpty(questionInfoList)) {
             Map<String, QuestionInfo> questionInfoMap = EntityUtil.makeEntityMap(questionInfoList, "tagName");