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

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

@@ -1,5 +1,15 @@
 package com.diagbot.client;
 
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ConceptBaseVO;
 import com.diagbot.client.bean.ConceptExistVO;
@@ -17,7 +27,9 @@ import com.diagbot.dto.DisTypeDTO;
 import com.diagbot.dto.DiseaseIcdDTO;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
+import com.diagbot.dto.IndexConfigAndDataDTO;
 import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ScaleContent;
@@ -26,19 +38,12 @@ 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.IndexDataFindVO;
+import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.RetrievalVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-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:调用中间层服务
@@ -104,11 +109,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);
 
     /**
      * 获取指标配置
@@ -181,4 +186,19 @@ public interface AiptServiceClient {
      */
     @PostMapping("/concept/retrivelConceptInfo")
     RespDTO<List<ConceptRetrievalDTO>> retrivelConceptInfo(@RequestBody @Valid RetrievalVO retrievalVO);
+    /**
+     * 
+     * @param indexDataFindVO
+     * @return
+     */
+    @PostMapping(value = "/indexData/getIndexDatas")
+	RespDTO<List<IndexConfigAndDataDTO>> getIndexDatas(@RequestBody IndexDataFindVO indexDataFindVO);
+	 
+    /**
+     * 
+     * @param indexDataSaveVO
+     * @return
+     */
+	@PostMapping(value = "/indexData/saveIndexDatas")
+    RespDTO<Boolean> saveIndexDatas(@RequestBody IndexDataSaveVO indexDataSaveVO);
 }

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

@@ -26,6 +26,7 @@ import com.diagbot.dto.DisTypeDTO;
 import com.diagbot.dto.DiseaseIcdDTO;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
+import com.diagbot.dto.IndexConfigAndDataDTO;
 import com.diagbot.dto.IndexConfigDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
@@ -35,10 +36,11 @@ 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.IndexDataFindVO;
+import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.RetrievalVO;
 
 import lombok.extern.slf4j.Slf4j;
@@ -142,7 +144,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;
     }
@@ -236,4 +238,25 @@ public class AiptServiceHystrix implements AiptServiceClient {
         log.error("【hystrix】调用{}异常", "retrivelConceptInfo");
         return null;
     }
+    /**
+     * 指标获取
+     * @param indexDataFindVO
+     * @return
+     */
+    @Override
+	public RespDTO<List<IndexConfigAndDataDTO>> getIndexDatas(@Valid IndexDataFindVO indexDataFindVO) {
+		log.error("【hystrix】调用{}异常", "getIndexDatas");
+		return null;
+	}
+
+    /**
+     * 指标保存
+     * @param indexDataSaveVO
+     * @return
+     */
+	@Override
+	public RespDTO<Boolean> saveIndexDatas(@Valid IndexDataSaveVO indexDataSaveVO) {
+		log.error("【hystrix】调用{}异常", "saveIndexDatas");
+		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");

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -47,6 +47,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.LibraryInfoService;
 import com.diagbot.service.impl.ConceptServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.Cn2SpellUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.IntegerUtil;
@@ -312,6 +313,10 @@ public class ConceptFacade extends ConceptServiceImpl {
                 throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "无法输入纯数字或者纯字符，请输入正确数据！");
             }
         }
+        
+        if(addConceptInfoVO.getMaxAge()<addConceptInfoVO.getMinAge()){
+        	throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "症状发生的最小年龄大于症状发生的最大年龄！");
+        }
 
         if (addConceptInfoVO.getDetailList().stream().distinct().count() != addConceptInfoVO.getDetailList().size()) {
             throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "存在重复数据！");
@@ -357,6 +362,8 @@ public class ConceptFacade extends ConceptServiceImpl {
             libraryInfoMain.setTypeId(lexicon.getId());
             libraryinfoFacade.save(libraryInfoMain);
             concept.setLibId(libraryInfoMain.getId());
+            concept.setLibName(addConceptInfoDetailVOMain.getName());
+            concept.setLibType(lexicon.getId());
             concept.setGmtCreate(now);
             concept.setCreator(currentUser);
             concept.setId(addConceptInfoVO.getConceptId());
@@ -404,10 +411,7 @@ public class ConceptFacade extends ConceptServiceImpl {
                 continue;
             }
 
-            libraryInfo.setGmtModified(now);
-            libraryInfo.setModifier(currentUser);
             libraryInfo.setName(i.getName());
-            libraryInfo.setIsConcept(0);
             libraryInfo.setRemark(i.getRemark());
             saveOrUpdateLibraryInfoList.add(libraryInfo);
         }
@@ -419,11 +423,16 @@ public class ConceptFacade extends ConceptServiceImpl {
 
         for (LibraryInfo i : saveOrUpdateLibraryInfoList) {
             i.setId(null);
+            i.setSpell(Cn2SpellUtil.converterToFirstSpell(i.getName()));
             i.setConceptId(conceptId);
             i.setTypeId(lexicon.getId());
+            i.setIsConcept(0);
+            i.setGmtModified(now);
+            i.setModifier(currentUser);
         }
         libraryInfoMain.setIsConcept(1);
         libraryInfoMain.setRemark(addConceptInfoDetailVOMain.getRemark());
+        libraryInfoMain.setSpell(Cn2SpellUtil.converterToFirstSpell(libraryInfoMain.getName()));
         libraryInfoMain.setConceptId(conceptId);
         libraryInfoMain.setGmtModified(now);
         libraryInfoMain.setModifier(currentUser);
@@ -433,6 +442,8 @@ public class ConceptFacade extends ConceptServiceImpl {
 
         concept.setId(conceptId);
         concept.setLibId(libraryInfoMain.getId());
+        concept.setLibName(libraryInfoMain.getName());
+        concept.setLibType(libraryInfoMain.getTypeId());
         concept.setGmtModified(now);
         concept.setModifier(currentUser);
         updateById(concept);

knowledgeman-service/src/main/java/com/diagbot/vo/AddConceptInfoVO.java

@@ -5,6 +5,8 @@ import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 
+import org.hibernate.validator.constraints.Range;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -49,19 +51,22 @@ public class AddConceptInfoVO {
      * 性别：1:男, 2:女, 3:通用
      */
 	@ApiModelProperty(value="性别：1:男, 2:女, 3:通用")
-    private Integer sexType = 3;
+	@Range(min=1,max=3,message="性别须是1-3")
+    private Integer sexType=3;
 
     /**
      * 症状发生的最小年龄
      */
 	@ApiModelProperty(value="症状发生的最小年龄")
-    private Integer minAge;
+	@Range(min=0,max=200,message="年龄须是0-200")
+    private Integer minAge=0;
 
     /**
      * 症状发生的最大年龄
      */
 	@ApiModelProperty(value="症状发生的最大年龄")
-    private Integer maxAge;
+	@Range(min=0,max=200,message="年龄须是0-200")
+    private Integer maxAge=200;
 	
 	private Integer lineNum;