代码优化格式化

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

@@ -12,7 +12,6 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月27日 下午3:36:14
@@ -20,19 +19,19 @@ import java.util.List;
 @Component
 public class DisclaimerInformationFacade extends DisclaimerInformationServiceImpl {
 
-	/**
-	 * 
-	 * @return
-	 */
-	public List<DisclaimerInformationDTO> getDisclaimerInformation() {
+    /**
+     * @return
+     */
+    public List<DisclaimerInformationDTO> getDisclaimerInformation() {
 
-		QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
-		disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-				.orderByAsc("order_no");
-		List<DisclaimerInformation> data = list(disclaimerInformation);
-		// getDisclaimerInformationAll();
-		List<DisclaimerInformationDTO> datas = BeanUtil.listCopyTo(data, DisclaimerInformationDTO.class);
-		return datas;
-	}
+        QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
+        disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("STATUS", StatusEnum.Enable.getKey())
+                .orderByAsc("order_no");
+        List<DisclaimerInformation> data = list(disclaimerInformation);
+        // getDisclaimerInformationAll();
+        List<DisclaimerInformationDTO> datas = BeanUtil.listCopyTo(data, DisclaimerInformationDTO.class);
+        return datas;
+    }
 
 }

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

@@ -46,7 +46,10 @@ public class DiseaseIcdFacade {
         List<DiseaseIcdDTO> res = new ArrayList<>();
 
         List<String> disNames
-                = getDiseaseIcdsList.data.stream().map(g -> g.getConceptDisName()).distinct().collect(Collectors.toList());
+                = getDiseaseIcdsList.data.stream()
+                .map(g -> g.getConceptDisName())
+                .distinct()
+                .collect(Collectors.toList());
         if (ListUtil.isEmpty(disNames)) {
             return res;
         }
@@ -59,7 +62,8 @@ public class DiseaseIcdFacade {
         List<Concept> conceptDisNames = conceptFacade.list(queryWrapper);
 
         Map<String, Long> map
-                = conceptDisNames.stream().collect(Collectors.toMap(c -> c.getLibName(), c -> c.getId()));
+                = conceptDisNames.stream()
+                .collect(Collectors.toMap(c -> c.getLibName(), c -> c.getId()));
         if (null != map) {
             DiseaseIcdDTO diseaseIcdDTO = null;
             for (GetDiseaseIcdDTO getDiseaseIcdDTO : getDiseaseIcdsList.data) {

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

@@ -2,13 +2,11 @@ package com.diagbot.facade;
 
 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;
@@ -17,32 +15,29 @@ import java.util.Map;
 @Component
 public class EvaluationFacade extends EvaluationServiceImpl {
 
-	@Autowired
-	PushFacade pushFacade;
-	@Autowired
-	@Qualifier("evaluationServiceImpl")
-	EvaluationService evaluationService;
+    @Autowired
+    PushFacade pushFacade;
 
-	/**
-	 * 获取管理与评估模板接口
-	 *
-	 * @param searchVo
-	 * @return
-	 */
-	public List<EvaluationDTO> getEvaluationModule(SearchVo searchVo) {
+    /**
+     * 获取管理与评估模板接口
+     *
+     * @param searchVo
+     * @return
+     */
+    public List<EvaluationDTO> getEvaluationModule(SearchVo searchVo) {
 
-		EvaluationDiseaseNameVO evaluationdiseaseNameVO = new EvaluationDiseaseNameVO();
-		BeanUtil.copyProperties(searchVo, evaluationdiseaseNameVO);
-		List<EvaluationDTO> evaluationList = evaluationService.getEvaluationModule(evaluationdiseaseNameVO);
+        EvaluationDiseaseNameVO evaluationdiseaseNameVO = new EvaluationDiseaseNameVO();
+        BeanUtil.copyProperties(searchVo, evaluationdiseaseNameVO);
+        List<EvaluationDTO> evaluationList = this.getEvaluationModule(evaluationdiseaseNameVO);
 
-		Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(searchVo);
-		for (String key : jsonobject.keySet()) {
-			for (EvaluationDTO evaluadata : evaluationList) {
-				if (key.equals(evaluadata.getRegionName())) {
-					evaluadata.setData(jsonobject.get(key));
-				}
-			}
-		}
-		return evaluationList;
-	}
+        Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(searchVo);
+        for (String key : jsonobject.keySet()) {
+            for (EvaluationDTO evaluadata : evaluationList) {
+                if (key.equals(evaluadata.getRegionName())) {
+                    evaluadata.setData(jsonobject.get(key));
+                }
+            }
+        }
+        return evaluationList;
+    }
 }

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

@@ -16,7 +16,6 @@ import java.util.Map;
 @Component
 public class IndexConfigFacade extends IndexConfigServiceImpl {
 
-
     public List<IndexConfigDTO> getIndexConfig(String diseaseName) {
         Map<String, Object> indexConfigMap = new HashMap<>();
         indexConfigMap.put("diseaseName", diseaseName);

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

@@ -1,15 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.IndexConfigAndDataDTO;
 import com.diagbot.dto.IndexConfigDTO;
@@ -26,9 +16,17 @@ import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.IndexDataVO;
 import com.diagbot.vo.IndexDataiIds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
- * 
  * @author wangfeng
  * @Description: 指标数据相关接口
  * @date 2019年5月6日 下午8:04:09
@@ -36,108 +34,110 @@ import com.diagbot.vo.IndexDataiIds;
 @Component
 public class IndexDataFacade {
 
-	@Autowired
-	TranServiceClient tranServiceClient;
-	@Autowired
-	IndexConfigFacade indexConfigFacade;
+    @Autowired
+    TranServiceClient tranServiceClient;
+    @Autowired
+    IndexConfigFacade indexConfigFacade;
 
-	/**
-	 * 获取指标数据接口
-	 * @param indexDataFindVO
-	 * @return 
-	 */
-	public IndexConfigAndDataDTO getIndexDataAll(IndexDataFindVO indexDataFindVO) {
+    /**
+     * 获取指标数据接口
+     *
+     * @param indexDataFindVO
+     * @return
+     */
+    public IndexConfigAndDataDTO getIndexDataAll(IndexDataFindVO indexDataFindVO) {
 
-		Map<String, Object> indexDataMap = new HashMap<>();
-		indexDataMap.put("diseaseName", indexDataFindVO.getDiseaseName());
-		indexDataMap.put("patientId", indexDataFindVO.getPatientId());
-		indexDataMap.put("startTime", indexDataFindVO.getStartTime());
-		indexDataMap.put("endTime", indexDataFindVO.getEndTime());
-		List<Long> ids = new ArrayList<Long>();
-		// 获取所有需要记录的指标项
-		List<IndexConfigDTO> indexConfigdata = indexConfigFacade.getIndexConfig(indexDataFindVO.getDiseaseName());
-		for (IndexConfigDTO indexconfig : indexConfigdata) {
-			ids.add(indexconfig.getUniqueId());
-		}
-		IndexDataiIds indexDataiIds= new IndexDataiIds();
-		BeanUtil.copyProperties(indexDataFindVO,indexDataiIds);
-		indexDataiIds.setIds(ids);
-		// 获取慢病指标数据
-		RespDTO<List<IndexDataDTO>> dataAll = tranServiceClient.getIndexDatas(indexDataiIds);
-		 if (dataAll == null || !"0".equals(dataAll.code)) {
-	            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-	                    "获取指标数据失败");
-	        }
-		List<IndexDataDTO> data = dataAll.data;
-		List<IndexDTO> list = new ArrayList<IndexDTO>();
-		// 根据公表名分组
-    	//Map<String, List<IndexDataDTO>> dataMap =datas.stream().collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
-		 // 根据公表名分组
+        Map<String, Object> indexDataMap = new HashMap<>();
+        indexDataMap.put("diseaseName", indexDataFindVO.getDiseaseName());
+        indexDataMap.put("patientId", indexDataFindVO.getPatientId());
+        indexDataMap.put("startTime", indexDataFindVO.getStartTime());
+        indexDataMap.put("endTime", indexDataFindVO.getEndTime());
+        List<Long> ids = new ArrayList<Long>();
+        // 获取所有需要记录的指标项
+        List<IndexConfigDTO> indexConfigdata = indexConfigFacade.getIndexConfig(indexDataFindVO.getDiseaseName());
+        for (IndexConfigDTO indexconfig : indexConfigdata) {
+            ids.add(indexconfig.getUniqueId());
+        }
+        IndexDataiIds indexDataiIds = new IndexDataiIds();
+        BeanUtil.copyProperties(indexDataFindVO, indexDataiIds);
+        indexDataiIds.setIds(ids);
+        // 获取慢病指标数据
+        RespDTO<List<IndexDataDTO>> dataAll = tranServiceClient.getIndexDatas(indexDataiIds);
+        if (dataAll == null || !"0".equals(dataAll.code)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "获取指标数据失败");
+        }
+        List<IndexDataDTO> data = dataAll.data;
+        List<IndexDTO> list = new ArrayList<IndexDTO>();
+        // 根据公表名分组
+        //Map<String, List<IndexDataDTO>> dataMap =datas.stream().collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
+        // 根据公表名分组
         Map<String, List<IndexDataDTO>> dataMap = data.stream().collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
-		for (String key : dataMap.keySet()) {
-			IndexDTO itemIndexDTO = new IndexDTO();
-			itemIndexDTO.setItemName(key);
-			List<String> indexUnits = new ArrayList<String>();
-			List<String> indexValues = new ArrayList<String>();
-			List<Integer> isAbnormals = new ArrayList<Integer>();
-			List<Date> creatTimes = new ArrayList<Date>();
-			List<IndexDataDTO> indexDatas = dataMap.get(key);
-			for (IndexDataDTO indexDataDTO : indexDatas) {
-				indexUnits.add(indexDataDTO.getIndexUnit());
-				indexValues.add(indexDataDTO.getIndexValue());
-				isAbnormals.add(indexDataDTO.getIsAbnormal());
-				creatTimes.add(indexDataDTO.getCreatTime());
-			}
+        for (String key : dataMap.keySet()) {
+            IndexDTO itemIndexDTO = new IndexDTO();
+            itemIndexDTO.setItemName(key);
+            List<String> indexUnits = new ArrayList<String>();
+            List<String> indexValues = new ArrayList<String>();
+            List<Integer> isAbnormals = new ArrayList<Integer>();
+            List<Date> creatTimes = new ArrayList<Date>();
+            List<IndexDataDTO> indexDatas = dataMap.get(key);
+            for (IndexDataDTO indexDataDTO : indexDatas) {
+                indexUnits.add(indexDataDTO.getIndexUnit());
+                indexValues.add(indexDataDTO.getIndexValue());
+                isAbnormals.add(indexDataDTO.getIsAbnormal());
+                creatTimes.add(indexDataDTO.getCreatTime());
+            }
+
+            itemIndexDTO.setIndexUnit(indexUnits);
+            itemIndexDTO.setIndexValue(indexValues);
+            itemIndexDTO.setIsAbnormal(isAbnormals);
+            itemIndexDTO.setCreatTime(creatTimes);
+            list.add(itemIndexDTO);
 
-			itemIndexDTO.setIndexUnit(indexUnits);
-			itemIndexDTO.setIndexValue(indexValues);
-			itemIndexDTO.setIsAbnormal(isAbnormals);
-			itemIndexDTO.setCreatTime(creatTimes);
-			list.add(itemIndexDTO);
+        }
+        IndexConfigAndDataDTO indexsData = new IndexConfigAndDataDTO();
+        indexsData.setIndexConfigData(indexConfigFacade.getIndexConfig(indexDataFindVO.getDiseaseName()));
+        indexsData.setIndexData(list);
+        return indexsData;
 
-		}
-		IndexConfigAndDataDTO indexsData = new IndexConfigAndDataDTO();
-		indexsData.setIndexConfigData(indexConfigFacade.getIndexConfig(indexDataFindVO.getDiseaseName()));
-		indexsData.setIndexData(list);
-		return indexsData;
+    }
 
-	}
+    /**
+     * 保存指标数据接口
+     *
+     * @param indexDataSaveVO
+     * @return
+     */
+    public boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
+        boolean res = false;
+        if (null != indexDataSaveVO && ListUtil.isNotEmpty(indexDataSaveVO.getIndexData())) {
+            // 获取所有需要记录的指标项
+            List<IndexConfigDTO> data = indexConfigFacade.getIndexConfig("");
+            // 遍历数据进行保存
+            List<IndexDataVO> indexDataList = new ArrayList<IndexDataVO>();
+            //过滤化验数据
+            List<IndexDataVO> indexDatas = indexDataSaveVO.getIndexData();
+            for (IndexConfigDTO configData : data) {
+                for (IndexDataVO indexDataNew : indexDatas) {
+                    if (configData.getIndexUnique().equals(indexDataNew.getIndexUnique())) {
+                        IndexDataAllVO indexData = new IndexDataAllVO();
+                        indexData.setIndexId(configData.getUniqueId());
+                        indexData.setIndexUnique(configData.getIndexUnique());
+                        indexData.setCreatTime(indexDataNew.getCreatTime());
+                        indexData.setIndexUnit(indexDataNew.getIndexUnit());
+                        indexData.setIndexValue(indexDataNew.getIndexValue());
+                        indexData.setIsAbnormal(indexDataNew.getIsAbnormal());
+                        indexDataList.add(indexData);
+                    }
+                }
+            }
+            indexDataSaveVO.setIndexData(indexDataList);
+            RespDTO<Boolean> resData = tranServiceClient.saveIndexDatas(indexDataSaveVO);
+            RespDTOUtil.respNGDeal(resData, resData.msg);
+            res = resData.data;
+        }
 
-	/**
-	 * 保存指标数据接口
-	 * @param indexDataSaveVO
-	 * @return
-	 */
-	public boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
-		boolean res = false;
-		if (null != indexDataSaveVO && ListUtil.isNotEmpty(indexDataSaveVO.getIndexData())) {
-			// 获取所有需要记录的指标项
-			List<IndexConfigDTO> data = indexConfigFacade.getIndexConfig("");
-			// 遍历数据进行保存
-			List<IndexDataVO> indexDataList = new ArrayList<IndexDataVO>();
-			//过滤化验数据
-			List<IndexDataVO> indexDatas = indexDataSaveVO.getIndexData();
-			for (IndexConfigDTO configData : data) {
-				for (IndexDataVO indexDataNew : indexDatas) {
-					if (configData.getIndexUnique().equals(indexDataNew.getIndexUnique())) {
-						IndexDataAllVO indexData = new IndexDataAllVO();
-						indexData.setIndexId(configData.getUniqueId());
-						indexData.setIndexUnique(configData.getIndexUnique());
-						indexData.setCreatTime(indexDataNew.getCreatTime());
-						indexData.setIndexUnit(indexDataNew.getIndexUnit());
-						indexData.setIndexValue(indexDataNew.getIndexValue());
-						indexData.setIsAbnormal(indexDataNew.getIsAbnormal());
-						indexDataList.add(indexData);
-					}
-				}
-			}
-			indexDataSaveVO.setIndexData(indexDataList);
-	        RespDTO<Boolean> resData = tranServiceClient.saveIndexDatas(indexDataSaveVO);
-	        RespDTOUtil.respNGDeal(resData, resData.msg);
-	        res = resData.data;
-		}
-		
-		return res;
-	}
+        return res;
+    }
 
 }

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

@@ -1,13 +0,0 @@
-package com.diagbot.facade;
-
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/5/9 13:39
- */
-@Component
-public class RelationFacade {
-
-}