Merge branch '20210512_yw_check' into test

src/main/java/com/diagbot/dto/CheckJobDTO.java

@@ -23,6 +23,8 @@ public class CheckJobDTO {
     private String attendingDoctor;
     //出院日期
     private String leaveHospitalDate;
+    //核查任务生成时间
+    private String jobCreateTime;
     //任务分配人员id
     private Long jobDistributor;
     //任务分配人员名称

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;
@@ -1035,13 +1036,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);

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -121,7 +121,8 @@
         a.`name`,
         b.`value`,
         a.id,
-        a.beh_dept_id behospitalDeptId
+        a.beh_dept_id behospitalDeptId,
+        a.job_create_time jobCreateTime
         from
         (select
             a.behospital_code,
@@ -131,6 +132,7 @@
             a.leave_hospital_date,
             a.hospital_id,
             a.beh_dept_id,
+            b.job_create_time,
             b.id
             from
             med_behospital_info a ,med_check_info b