代码格式化优化

icss-service/src/main/java/com/diagbot/facade/BuriedSomeStatisticalFacade.java

@@ -24,6 +24,7 @@ public class BuriedSomeStatisticalFacade extends BuriedSomeStatisticalServiceImp
     @Autowired
     @Qualifier("buriedSomeStatisticalServiceImpl")
     private BuriedSomeStatisticalService buriedSomeStatisticalService;
+
     /**
      * 批量保存
      *

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

@@ -10,7 +10,6 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月27日 下午3:36:14
@@ -18,16 +17,16 @@ import java.util.List;
 @Component
 public class DisclaimerInformationFacade {
 
-	@Autowired
-	private AiptServiceClient aiptServiceClient;
-	/**
-	 * 
-	 * @return
-	 */
-	public List<DisclaimerInformationDTO> getDisclaimerInformation() {
-		RespDTO<List<DisclaimerInformationDTO>> res =  aiptServiceClient.getDisclaimerInformations();
-		RespDTOUtil.respNGDealCover(res, "获取免责声明失败");
-		return res.data;
-	}
+    @Autowired
+    private AiptServiceClient aiptServiceClient;
+
+    /**
+     * @return
+     */
+    public List<DisclaimerInformationDTO> getDisclaimerInformation() {
+        RespDTO<List<DisclaimerInformationDTO>> res = aiptServiceClient.getDisclaimerInformations();
+        RespDTOUtil.respNGDealCover(res, "获取免责声明失败");
+        return res.data;
+    }
 
 }

icss-service/src/main/java/com/diagbot/facade/DoctorPageModeFacade.java

@@ -1,18 +1,8 @@
 package com.diagbot.facade;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.Valid;
-
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.DoctorPageModeDTO;
-import com.diagbot.dto.TemplateInfoDTO;
 import com.diagbot.entity.DoctorPageMode;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.DoctorPageModeServiceImpl;
@@ -20,6 +10,12 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.vo.DoctorIdVO;
 import com.diagbot.vo.DoctorPageModeVO;
+import org.springframework.stereotype.Component;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author wangfeng
@@ -46,7 +42,7 @@ public class DoctorPageModeFacade extends DoctorPageModeServiceImpl {
         boolean res = false;
         if (datas != null) {
             UpdateWrapper<DoctorPageMode> doctorPageModeUpdate = new UpdateWrapper<>();
-            doctorPageModeUpdate.eq("id",datas.getId())
+            doctorPageModeUpdate.eq("id", datas.getId())
                     .set("mode_classify", doctorPageModeVO.getModeClassify())
                     .set("mode_value", doctorPageModeVO.getModeValue())
                     .set("modifier", doctorPageModeVO.getDoctorId().toString())
@@ -79,7 +75,7 @@ public class DoctorPageModeFacade extends DoctorPageModeServiceImpl {
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
         doctorPageModeWrapper.allEq(mapAll);
         List<DoctorPageMode> doctorPageModeData = list(doctorPageModeWrapper);
-        List<DoctorPageModeDTO> data =  BeanUtil.listCopyTo(doctorPageModeData, DoctorPageModeDTO.class);
+        List<DoctorPageModeDTO> data = BeanUtil.listCopyTo(doctorPageModeData, DoctorPageModeDTO.class);
         return data;
     }
 

icss-service/src/main/java/com/diagbot/facade/EvaluationModuleMappingFacade.java

@@ -12,36 +12,31 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 /**
- * 
  * @author wangfeng
- * 
  * @Description: TODO
  * @date 2019年3月11日 下午4:19:09
  */
 @Component
 public class EvaluationModuleMappingFacade {
 
-	/*@Autowired
-	IndexConfigFacade indexConfigFacade;
-	*/
-	@Autowired
-	PushFacade pushFacade;
-	@Autowired
-	AiptServiceClient aiptServiceClient;
-	@Autowired
-	AssembleFacade assembleFacade;
+    @Autowired
+    PushFacade pushFacade;
+    @Autowired
+    AiptServiceClient aiptServiceClient;
+    @Autowired
+    AssembleFacade assembleFacade;
 
-	/**
-	 * 获取管理与评估模板接口
-	 *
-	 * @param evaluationdiseaseNameVO
-	 * @return
-	 */
-	public List<EvaluationDTO> getEvaluationModule(EvaluationDiseaseNameVO evaluationdiseaseNameVO) {
-		SearchData searchData = assembleFacade.assembleData(evaluationdiseaseNameVO);
-		RespDTO<List<EvaluationDTO>> evaluationList = aiptServiceClient.getEvaluationModules(searchData);
-		RespDTOUtil.respNGDeal(evaluationList, "获取管理与评估模板数据失败！");
-		List<EvaluationDTO> datas = evaluationList.data;
-		return datas;
-	}
+    /**
+     * 获取管理与评估模板接口
+     *
+     * @param evaluationdiseaseNameVO
+     * @return
+     */
+    public List<EvaluationDTO> getEvaluationModule(EvaluationDiseaseNameVO evaluationdiseaseNameVO) {
+        SearchData searchData = assembleFacade.assembleData(evaluationdiseaseNameVO);
+        RespDTO<List<EvaluationDTO>> evaluationList = aiptServiceClient.getEvaluationModules(searchData);
+        RespDTOUtil.respNGDeal(evaluationList, "获取管理与评估模板数据失败！");
+        List<EvaluationDTO> datas = evaluationList.data;
+        return datas;
+    }
 }

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

@@ -1,15 +1,14 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.IndexConfigDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.IndexConfigdiseaseNameVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * @author wangfeng
@@ -19,8 +18,9 @@ import com.diagbot.vo.IndexConfigdiseaseNameVO;
 @Component
 public class IndexConfigFacade {
 
-	@Autowired 
-	AiptServiceClient aiptServiceClient;
+    @Autowired
+    AiptServiceClient aiptServiceClient;
+
     /**
      * 根据疾病Id获取指标配置
      *
@@ -28,8 +28,9 @@ public class IndexConfigFacade {
      * @return
      */
     public List<IndexConfigDTO> getindexConfig(IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
-    	RespDTO<List<IndexConfigDTO>> indexConfigList = aiptServiceClient.getindexConfigs(indexConfigdiseaseNameVO);
-    	RespDTOUtil.respNGDeal(indexConfigList, "获取指标配置数据失败！");
+        RespDTO<List<IndexConfigDTO>> indexConfigList
+                = aiptServiceClient.getindexConfigs(indexConfigdiseaseNameVO);
+        RespDTOUtil.respNGDeal(indexConfigList, "获取指标配置数据失败！");
         return indexConfigList.data;
     }
 

icss-service/src/main/java/com/diagbot/facade/InquiryDetailFacade.java

@@ -2,6 +2,7 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.entity.InquiryDetail;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.InquiryDetailServiceImpl;
 import com.diagbot.util.ListUtil;
 import org.springframework.stereotype.Component;
@@ -48,7 +49,7 @@ public class InquiryDetailFacade extends InquiryDetailServiceImpl {
      */
     public List<InquiryDetail> getListByInquryId(Long inquiryId) {
         QueryWrapper<InquiryDetail> queryWrapper = new QueryWrapper<InquiryDetail>();
-        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.eq("inquiry_id", inquiryId);
         return this.list(queryWrapper);
     }
@@ -61,7 +62,8 @@ public class InquiryDetailFacade extends InquiryDetailServiceImpl {
      */
     public Map<Long, List<InquiryDetail>> getDetailsByInquryIds(List<Long> inquiryIds) {
         QueryWrapper<InquiryDetail> queryWrapper = new QueryWrapper<InquiryDetail>();
-        queryWrapper.eq("is_deleted", "N").in("inquiry_id", inquiryIds);
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .in("inquiry_id", inquiryIds);
         List<InquiryDetail> inquiryDetails = this.list(queryWrapper);
         return inquiryDetails.stream().collect(Collectors.groupingBy(InquiryDetail::getInquiryId));
     }

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -191,7 +191,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         }
 
         saveInquiryDTO.setInquiryId(inquiryId_);
-        
+
         SaveInquiryToHisVO saveInquiryToHisVO = new SaveInquiryToHisVO();
         BeanUtil.copyProperties(saveInquiryVO, saveInquiryToHisVO);
         tranServiceClient.saveInquiryToHis(saveInquiryToHisVO);
@@ -228,11 +228,11 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
             List<ReadInquiryDrugDTO> drugList = BeanUtil.listCopyTo(inquiryDrugList, ReadInquiryDrugDTO.class);
             readInquiryDTO.setDrugList(drugList);
-            
+
             QueryWrapper<InquiryEvaluation> inquiryEvaluationQe = new QueryWrapper<>();
             inquiryEvaluationQe.eq("inquiry_id", inquiryInfo.getId());
             readInquiryDTO.setInquiryEvaluation(inquiryEvaluationFacade.getOne(inquiryEvaluationQe));
-            
+
             QueryWrapper<InquiryScale> inquiryScaleQe = new QueryWrapper<>();
             inquiryScaleQe.eq("inquiry_id", inquiryInfo.getId());
             readInquiryDTO.setInquiryScaleList(inquiryScaleFacade.list(inquiryScaleQe));

icss-service/src/main/java/com/diagbot/facade/QuestionCacheFacade.java

@@ -52,7 +52,7 @@ public class QuestionCacheFacade extends QuestionInfoServiceImpl {
         QuestionDTO res = new QuestionDTO();
         BeanUtil.copyProperties(questionInfo, res);
 
-        if (questionInfo.getTagType().equals(1)){
+        if (questionInfo.getTagType().equals(1)) {
             //获取明细项
             List<QuestionDetail> questionDetailList = questionDetailFacade.getByQuestionId(questionVO.getId());
             res.setQuestionDetailList(questionDetailList);

icss-service/src/main/java/com/diagbot/facade/TemplateInfoFacade.java

@@ -8,7 +8,6 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.TemplateInfoServiceImpl;
-import com.diagbot.util.ArrayUtil;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.GsonUtil;
@@ -23,7 +22,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @author wangfeng
@@ -38,8 +36,8 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
      * @return 医生病历模板信息
      */
     public List<TemplateInfoDTO> findByDoctorIdTemplates(TemplateInfoVO templateInfoVO) {
-		//根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
-		
+        //根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
+
         QueryWrapper<TemplateInfo> templateInfoQuery = new QueryWrapper<>();
         Map<String, Object> mapAll = new HashMap<>();
         mapAll.put("hospital_dept_id", templateInfoVO.getHospitalDeptId());
@@ -47,14 +45,14 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         mapAll.put("hospital_id", templateInfoVO.getHospitalId());
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
         mapAll.put("type", templateInfoVO.getType());
-        if(templateInfoVO.getSex()!=null){
-        	templateInfoQuery.allEq(mapAll).in("sex", 3,templateInfoVO.getSex()).orderByDesc("gmt_create");
-        }else {
-        	templateInfoQuery.allEq(mapAll).orderByDesc("gmt_create");
-		} 
+        if (templateInfoVO.getSex() != null) {
+            templateInfoQuery.allEq(mapAll).in("sex", 3, templateInfoVO.getSex()).orderByDesc("gmt_create");
+        } else {
+            templateInfoQuery.allEq(mapAll).orderByDesc("gmt_create");
+        }
         List<TemplateInfoDTO> data = new ArrayList<TemplateInfoDTO>();
         List<TemplateInfo> datas = list(templateInfoQuery);
-		//过滤
+        //过滤
         data = BeanUtil.listCopyTo(datas, TemplateInfoDTO.class);
 
         return data;
@@ -119,7 +117,7 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
         mapAll.put("name", templateInfosVO.getModeName());
         mapAll.put("type", templateInfosVO.getModeType());
-        
+
         templateInfoFand.allEq(mapAll);
         int sum = count(templateInfoFand);
         if (sum != 0) {