优化代码3

src/main/java/com/diagbot/facade/MedCheckInfoFacade.java

@@ -6,12 +6,10 @@ import com.diagbot.entity.MedCheckInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.service.MedCheckInfoService;
 import com.diagbot.service.impl.MedCheckInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.MedCheckInfoAddVO;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -26,9 +24,6 @@ import java.util.Map;
 @Component
 public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
 
-    @Autowired
-    MedCheckInfoService medCheckInfoService;
-
     /**
      * @param medCheckInfoAddVO
      * @return
@@ -46,21 +41,13 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
         mapAll.put("hospital_id", hospitalId);
         QueryWrapper<MedCheckInfo> medCheckInfoQuerys = new QueryWrapper<>();
         medCheckInfoQuerys.allEq(mapAll);
-        MedCheckInfo data = medCheckInfoService.getOne(medCheckInfoQuerys, false);
+        MedCheckInfo data = this.getOne(medCheckInfoQuerys, false);
         if (data != null) {
-            if (data.getStatus() == 1) {
-                //检验核查人是否是本人
-                if (data.getCheckId().equals(principleId)) {
-                    //是本人且该数据已核查，不能改为未核查
-                    if (medCheckInfoAddVO.getCheckStatus() == 0) {
-                        throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据已核查，不能改成未核查！");
-                    }
-                    res = saveNew(mapAll, now, hospitalId, principleId, principleName, medCheckInfoAddVO);
-                } else {
-                    throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据已被人核查，您暂无权限！");
-                }
-            } else {
+            //检验核查人是否是本人
+            if (data.getCheckId().equals(principleId)) {
                 res = saveNew(mapAll, now, hospitalId, principleId, principleName, medCheckInfoAddVO);
+            } else {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据已被人核查，您暂无权限！");
             }
         } else {
             //该病历没有核查的时候， 就添加核查记录
@@ -73,7 +60,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
             medCheckInfo.setCheckTime(now);
             medCheckInfo.setStatus(medCheckInfoAddVO.getCheckStatus());
             medCheckInfo.setBehospitalCode(medCheckInfoAddVO.getBehospitalCode());
-            res = medCheckInfoService.save(medCheckInfo);
+            res = this.save(medCheckInfo);
         }
 
         return res;
@@ -92,7 +79,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
         boolean res = false;
         UpdateWrapper<MedCheckInfo> medCheckInfoUpdate = new UpdateWrapper<>();
         medCheckInfoUpdate.allEq(mapAll).set("is_deleted", IsDeleteEnum.Y.getKey()).set("gmt_modified", now);
-        res = medCheckInfoService.update(medCheckInfoUpdate);
+        res = this.update(medCheckInfoUpdate);
         //删除原来的成功后， 再新建一条核查数据
         if (res) {
             MedCheckInfo medCheckInfo = new MedCheckInfo();
@@ -104,7 +91,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
             medCheckInfo.setCheckTime(now);
             medCheckInfo.setStatus(medCheckInfoAddVO.getCheckStatus());
             medCheckInfo.setBehospitalCode(medCheckInfoAddVO.getBehospitalCode());
-            res = medCheckInfoService.save(medCheckInfo);
+            res = this.save(medCheckInfo);
         }
         return res;
     }