修改2

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

@@ -1,8 +1,67 @@
 package com.diagbot.facade;
 
-import com.diagbot.service.impl.EvaluationServiceImpl;
+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.impl.EvaluationServiceImpl;
+import com.diagbot.vo.EvaluationdiseaseNameVO;
+
 @Component
 public class EvaluationFacade extends EvaluationServiceImpl {
+	
+	@Autowired
+	PushFacade pushFacade;
+	/**
+	 * 获取管理与评估模板接口
+	 *
+	 * @param evaluationDiseaseIdVO
+	 * @return
+	 */
+	public List<EvaluationDTO> getEvaluationModule(EvaluationdiseaseNameVO evaluationdiseaseNameVO) {
+
+		List<EvaluationDTO> evaluationList = getEvaluationModule(evaluationdiseaseNameVO);
+		
+		Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(evaluationdiseaseNameVO);
+		for (String key : jsonobject.keySet()) {
+			for (EvaluationDTO evaluadata : evaluationList) {
+				if (key.equals(evaluadata.getRegionName())) {
+					evaluadata.setData(jsonobject.get(key));
+
+				}
+			}
+
+		}
+		return evaluationList;
+	}
+/*
+	*//**
+	 * 获取管理与评估模板接口
+	 *
+	 * @param diseaseId
+	 * @param contentMap
+	 * @return
+	 */
+	public List<EvaluationDTO> getEvaluationModule(Long diseaseId, Map<String, JSONObject> contentMap) {
+		EvaluationdiseaseNameVO evaluationdiseaseNameVO =new EvaluationdiseaseNameVO();
+		evaluationdiseaseNameVO.setDiseaseName("糖尿病");
+		List<EvaluationDTO> evaluationList = getEvaluationModule(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 : evaluationList) {
+					if (key.equals(evaluadata.getRegionName())) {
+						evaluadata.setData(contentMap.get(key));
+					}
+				}
+			}
+		}
+		return evaluationList;
+	}
 }

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

@@ -28,7 +28,6 @@
 		LEFT JOIN kl_concept b ON a.concept_id = b.id and  b.is_deleted ="N"
 		LEFT JOIN kl_concept c ON a.disease_id = c.id and  c.is_deleted ="N"
 		WHERE a.is_deleted ="N"
-		and b.lib_type = 46
 		and c.lib_type = 18
 		<if test="indexConfig.diseaseName != ''">
 		AND c.lib_name =  #{indexConfig.diseaseName}