Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

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/java/com/diagbot/vo/EvaluationdiseaseNameVO.java

@@ -11,7 +11,7 @@ import lombok.Setter;
  */
 @Setter
 @Getter
-public class EvaluationdiseaseNameVO {
+public class EvaluationdiseaseNameVO extends SearchVo{
 
 	private String diseaseName;
 	

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}

knowledgeman-service/src/main/resources/mapper/ConceptMapper.xml

@@ -20,34 +20,33 @@
     		conceptName
     	FROM
     	((SELECT
-		b.`name` as conceptName
-		FROM kl_concept a JOIN kl_library_info b ON a.lib_id=b.id
-		WHERE a.is_deleted='N' AND b.type='化验套餐'
-		ORDER BY a.gmt_modified DESC)
+		lib_name as conceptName
+		FROM kl_concept
+		WHERE is_deleted='N' AND lib_type=12
+		ORDER BY gmt_modified DESC)
 		UNION
 		(SELECT
-		conceptName
-		FROM
-		(SELECT
 		CONCAT(t1.conceptName,'-',t3.conceptName) as conceptName
 		FROM
 		(SELECT
-		a.id as conceptId,
-		b.`name` as conceptName
-		FROM kl_concept a JOIN kl_library_info b ON a.lib_id=b.id
-		WHERE a.is_deleted='N' AND b.type='化验套餐') t1
+		id as conceptId,
+		lib_name as conceptName
+		FROM kl_concept
+		WHERE is_deleted='N' AND lib_type=12) t1
 		JOIN
 		kl_relation t2 
 		ON t1.conceptId=t2.end_id 
 		JOIN
 		(SELECT
-		a.id as conceptId,
-		b.`name` as conceptName
-		FROM kl_concept a JOIN kl_library_info b ON a.lib_id=b.id
-		WHERE a.is_deleted='N' AND b.type='化验明细') t3
+		id as conceptId,
+		lib_name as conceptName
+		FROM kl_concept
+		WHERE is_deleted='N' AND lib_type=13) t3
 		ON t2.start_id=t3.conceptId
+		LEFT JOIN kl_relation_order t4
+		ON t2.id=t4.t_relation_id
 		WHERE t2.is_deleted='N' AND t2.relation_id=3
-		ORDER BY t2.gmt_modified DESC) t)) t
+		ORDER BY t4.order_no DESC)) t
 		WHERE 1=1
 		<if test="conceptName!=null and conceptName!=''">
 			and (conceptName LIKE CONCAT('%',#{conceptName},'%'))