代码优化

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

@@ -1,15 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import com.diagbot.util.EntityUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.GetInquiryDetailImgDTO;
@@ -29,12 +19,21 @@ import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.service.impl.InquiryReportServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.RecordCheckVO;
 import com.diagbot.vo.SaveInquiryVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author: zhoutg
@@ -124,11 +123,11 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @param recordCheckVO
      * @return
      */
-    public RecordCheckDTO recordCheck(RecordCheckVO recordCheckVO){
-    	RecordCheckDTO recordCheckDTO = new RecordCheckDTO();
-    	int type = 1;
+    public RecordCheckDTO recordCheck(RecordCheckVO recordCheckVO) {
+        RecordCheckDTO recordCheckDTO = new RecordCheckDTO();
+        int type = 1;
 
-    	QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
+        QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
         inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
         inquiryInfoQe.eq("hospital_id", recordCheckVO.getHospitalId());
         inquiryInfoQe.eq("hospital_dept_id", recordCheckVO.getHospitalDeptId());
@@ -137,22 +136,22 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryInfoQe.eq("inquiry_code", recordCheckVO.getInquiryCode());
         InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe);
 
-        if(inquiryInfo!=null){
-        	QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
+        if (inquiryInfo != null) {
+            QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
             inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
-            if(inquiryDetailFacade.count(inquiryDetailQe)>0){
-            	type = type + 2;
+            if (inquiryDetailFacade.count(inquiryDetailQe) > 0) {
+                type = type + 2;
             }
 
             QueryWrapper<InquiryEvaluator> inquiryEvaluatorQe = new QueryWrapper<>();
             inquiryEvaluatorQe.eq("inquiry_id", inquiryInfo.getId());
-            if(inquiryEvaluatorFacade.count(inquiryEvaluatorQe)>0){
-            	type = type + 3;
+            if (inquiryEvaluatorFacade.count(inquiryEvaluatorQe) > 0) {
+                type = type + 3;
             }
         }
 
         recordCheckDTO.setType(type);
-    	return recordCheckDTO;
+        return recordCheckDTO;
     }
 
     /**
@@ -237,8 +236,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryInfoQe.eq("inquiry_code", getInquiryDetailVO.getInquiryCode());
 
         InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe);
-        if(inquiryInfo==null){
-        	throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病历不存在！");
+        if (inquiryInfo == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病历不存在！");
         }
 
         QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
@@ -264,30 +263,30 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         getInquiryDetailDTO.setInquiryTime(inquiryInfo.getGmtModified());
         getInquiryDetailDTO.setPatientAge(DateUtil.yearCompare(inquiryInfo.getPatientBirthday(), DateUtil.now()));
 
-        if (ListUtil.isNotEmpty(inquiryDetailList)){
-            Map<Integer ,InquiryDetail> inquiryDetailMap
+        if (ListUtil.isNotEmpty(inquiryDetailList)) {
+            Map<Integer, InquiryDetail> inquiryDetailMap
                     = EntityUtil.makeEntityMap(inquiryDetailList, "type");
-            if (null != inquiryDetailMap.get(1)){
+            if (null != inquiryDetailMap.get(1)) {
                 getInquiryDetailDTO.setChiefComplaint(inquiryDetailMap.get(1).getContentValue());
             }
-            if (null != inquiryDetailMap.get(2)){
+            if (null != inquiryDetailMap.get(2)) {
                 getInquiryDetailDTO.setXbs(inquiryDetailMap.get(2).getContentValue());
             }
-            if (null != inquiryDetailMap.get(3)){
+            if (null != inquiryDetailMap.get(3)) {
                 getInquiryDetailDTO.setQts(inquiryDetailMap.get(3).getContentValue());
             }
-            if (null != inquiryDetailMap.get(4)){
+            if (null != inquiryDetailMap.get(4)) {
                 getInquiryDetailDTO.setSupplement(inquiryDetailMap.get(4).getContentValue());
             }
         }
         getInquiryDetailDTO.setPhysicalRes(ListUtil.isNotEmpty(inquiryEvaluatorList) ? inquiryEvaluatorList.get(0).getPhysicalRes() : null);
-        if (ListUtil.isNotEmpty(inquiryReportList)){
-            for (InquiryReport inquiryReport : inquiryReportList){
-                if (StringUtil.isNotBlank(inquiryReport.getOriginalImage())){
+        if (ListUtil.isNotEmpty(inquiryReportList)) {
+            for (InquiryReport inquiryReport : inquiryReportList) {
+                if (StringUtil.isNotBlank(inquiryReport.getOriginalImage())) {
                     inquiryReport.setOriginalImage(imageUrlPrefix + inquiryReport.getOriginalImage());
                 }
 
-                if (StringUtil.isNotBlank(inquiryReport.getNarrowImage())){
+                if (StringUtil.isNotBlank(inquiryReport.getNarrowImage())) {
                     inquiryReport.setNarrowImage(imageUrlPrefix + inquiryReport.getNarrowImage());
                 }
             }