Переглянути джерело

Merge remote-tracking branch 'origin/20210512_yw_check' into 20210512_yw_check

zhanghang 4 роки тому
батько
коміт
c54697c4e7

+ 5 - 5
src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.AuthServiceClient;
 import com.diagbot.dto.*;
 import com.diagbot.entity.*;
+import com.diagbot.enums.CheckStatusEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -1034,13 +1035,12 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         QueryVo  queryVo = dealCommonData(hospitalId, analyzeVO);
         queryVo.setUseCrfCache(analyzeVO.isUseCrfCache());
         //已核查抛出以评分
-        int status = medCheckInfoFacade.getOne(new QueryWrapper<MedCheckInfo>()
+        List<MedCheckInfo> medCheckInfos = medCheckInfoFacade.list(new QueryWrapper<MedCheckInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", analyzeVO.getHospitalId())
-                .eq("behospital_code", analyzeVO.getBehospitalCode())).getStatus();
-        if(1==status&&analyzeVO.getCheckFlag())
-        {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,"该病例已经核查无需评分!");
+                .eq("behospital_code", analyzeVO.getBehospitalCode()));
+        if (medCheckInfos.size() == 1 && medCheckInfos.get(0).getStatus().equals((CheckStatusEnum.Enable.getKey() + "")) && analyzeVO.getCheckFlag()) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该病例已经核查无需评分!");
         }
         //  调用质控接口
         Response<OutputInfo> response = qcServiceClient.extract(queryVo);