代码优化

tran-service/src/main/java/com/diagbot/facade/DataServiceFacade.java

@@ -10,8 +10,6 @@ import com.diagbot.vo.HosCodeVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.management.Query;
-
 /**
  * @Description:
  * @Author:zhaops
@@ -33,7 +31,8 @@ public class DataServiceFacade {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入医院编码");
         }
         QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("code", hosCodeVO.getHosCode());
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("code", hosCodeVO.getHosCode());
         HospitalInfo hospitalInfo = hospitalInfoFacade.getOne(queryWrapper);
         if (hospitalInfo == null) {
             return false;

tran-service/src/main/java/com/diagbot/facade/DoctorInfoFacade.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.diagbot.enums.IsDeleteEnum;
 import org.springframework.stereotype.Component;
 
 import com.diagbot.dto.DoctorInfoDTO;
@@ -36,7 +37,10 @@ public class DoctorInfoFacade extends DoctorInfoServiceImpl {
      * @return 医生信息
      */
     public Map<Long, DoctorInfo> doctorInfoMapByIds(List<Long> ids) {
-    	Map<Long, DoctorInfo> doctorInfoMap = this.listByIds(ids).stream().filter(i -> i.getIsDeleted().equals("N")).collect(Collectors.toMap(DoctorInfo::getId, i -> i));
+    	Map<Long, DoctorInfo> doctorInfoMap
+                = this.listByIds(ids).stream()
+                .filter(i -> i.getIsDeleted().equals(IsDeleteEnum.N.getKey()))
+                .collect(Collectors.toMap(DoctorInfo::getId, i -> i));
         return doctorInfoMap;
     }
 }

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

@@ -1,29 +1,25 @@
 package com.diagbot.facade;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.entity.IndexData;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.service.IndexDataService;
 import com.diagbot.service.impl.IndexDataServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.IndexDataAllVO;
 import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
-import com.diagbot.vo.IndexDataVO;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 
@@ -34,8 +30,6 @@ import com.diagbot.vo.IndexDataVO;
 @Component
 public class IndexDataFacade extends IndexDataServiceImpl {
 
-	@Autowired 
-	IndexDataService indexDataService;
 	/**
 	 * 
 	 * @param indexDataFindVO
@@ -48,7 +42,7 @@ public class IndexDataFacade extends IndexDataServiceImpl {
         indexDataMap.put("startTime", indexDataFindVO.getStartTime());
         indexDataMap.put("endTime", indexDataFindVO.getEndTime());
         //获取慢病指标数据
-         return indexDataService.quisitionIndexDataAll(indexDataFindVO.getIds(),indexDataMap);
+         return this.quisitionIndexDataAll(indexDataFindVO.getIds(),indexDataMap);
          
 	}
 
@@ -92,7 +86,7 @@ public class IndexDataFacade extends IndexDataServiceImpl {
 	                }
 	           
 	            if (ListUtil.isNotEmpty(IndexDataList)) {
-	                res = indexDataService.insertIndexDataList(IndexDataList);
+	                res = this.insertIndexDataList(IndexDataList);
 	            }
 	}
 	        return res;

tran-service/src/main/java/com/diagbot/web/DataServiceController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/dataService")
 @Api(value = "数据服务对外接口相关API", tags = { "数据服务对外接口相关API" })
+@SuppressWarnings("unchecked")
 public class DataServiceController {
 
     @Autowired

tran-service/src/main/java/com/diagbot/web/IntroduceTitleConfigController.java

@@ -22,6 +22,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/introduceTitleConfig")
 @Api(value = "提示信息标题映射相关API", tags = { "提示信息标题映射相关API" })
+@SuppressWarnings("unchecked")
 public class IntroduceTitleConfigController {
     @Autowired
     IntroduceTitleConfigFacade introduceTitleConfigFacade;

tran-service/src/main/java/com/diagbot/web/PacsConfigController.java

@@ -23,6 +23,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/pacsConfig")
 @Api(value = "辅检公表映射配置相关API", tags = { "辅检公表映射配置相关API" })
+@SuppressWarnings("unchecked")
 public class PacsConfigController {
 
     @Autowired