소스 검색

核查接口与核查任务数接口修改

songxinlu 3 년 전
부모
커밋
227cf41889
2개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 4 0
      src/main/java/com/diagbot/facade/RecordCheckFacade.java
  2. 1 1
      src/main/resources/mapper/MedCheckInfoMapper.xml

+ 4 - 0
src/main/java/com/diagbot/facade/RecordCheckFacade.java

@@ -204,6 +204,10 @@ public class RecordCheckFacade {
             insertCheckInfo.setCheckType(CheckTypeEnum.ALL.getKey());
             insertCheckInfo.setHospitalId(hospitalId);
             insertCheckInfo.setStatus(1);
+            //有科室核查人员角色就讲任务定义为科室核查任务(只针对七院科室核查)
+            if(checkRoleIds.contains(CheckerRoleEnum.DEPT_GENERAL.getKey()*1l)){
+                insertCheckInfo.setCheckType(0);
+            }
             insertCheckInfo.setCheckTime(DateUtil.now());
             return medCheckInfoFacade.save(insertCheckInfo);
 

+ 1 - 1
src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -110,7 +110,7 @@
         AND u.is_deleted = 'N'
         LEFT JOIN bas_doctor_info doctor ON u.username = doctor.doctor_id
         AND doctor.is_deleted = 'N'
-        where b.is_deleted = 'N' and a.is_deleted = 'N' and b.job_distribution_name is not null  and b.`status` is not null
+        where b.is_deleted = 'N' and a.is_deleted = 'N'   and b.`status` is not null
         <if test="jobType != null ">
             and b.job_type = #{jobType}
         </if>