Просмотр исходного кода

生成核查任务列表修改

rengb 4 лет назад
Родитель
Сommit
2decbd8c6c

+ 2 - 2
src/main/java/com/diagbot/enums/CheckJobTypeEnum.java

@@ -10,8 +10,8 @@ import lombok.Setter;
  */
 public enum CheckJobTypeEnum implements KeyedNamed {
     DEPT_SUPERVISOR(0, "科室任务"),
-    HOSP_SUPERVISOR(1, "院级"),
-    QUAT_SUPERVISOR(2, "质控科");
+    QUAT_SUPERVISOR(1, "质控科"),
+    HOSP_SUPERVISOR(2, "院级");
 
     @Setter
     private int key;

+ 2 - 1
src/main/java/com/diagbot/facade/MedCheckWorkFacade.java

@@ -9,6 +9,7 @@ import com.diagbot.entity.MedBehospitalType;
 import com.diagbot.entity.MedCheckInfo;
 import com.diagbot.entity.SysTaskCron;
 import com.diagbot.entity.SysUser;
+import com.diagbot.enums.CheckJobTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -280,7 +281,7 @@ public class MedCheckWorkFacade {
         }
         checkWorkPageVO.setHospitalId(Long.parseLong(SysUserUtils.getCurrentHospitalID()));
 
-        if (StringUtil.isNotBlank(checkWorkPageVO.getJobType()) && checkWorkPageVO.getJobType().equals("0")) {
+        if (StringUtil.isNotBlank(checkWorkPageVO.getJobType()) && (CheckJobTypeEnum.DEPT_SUPERVISOR.getKey() + "").equals(checkWorkPageVO.getJobType())) {
             SysUserBaseVO sysUserBaseVO = new SysUserBaseVO();
             sysUserBaseVO.setUserId(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
             checkWorkPageVO.setDepartments(sysUserFacade.getUserDepts(sysUserBaseVO).getSelDepts().stream().map(i -> i.getDeptId()).collect(Collectors.toList()));

+ 1 - 1
src/main/java/com/diagbot/vo/CheckWorkPageVO.java

@@ -40,7 +40,7 @@ public class CheckWorkPageVO extends Page implements Serializable {
     private String creatStatus="0";
 
     /**
-     * 核查任务类型(0-科室任务 1-院级 1-质控科)
+     * 核查任务类型(0-科室任务 2-院级 1-质控科)
      */
     private String jobType;
 

+ 1 - 1
src/main/java/com/diagbot/web/MedCheckWorkController.java

@@ -47,7 +47,7 @@ public class MedCheckWorkController {
             notes = "startDate:出院开始时间 【必填】<br>" +
                     "endDate:出院结束时间 【必填】<br>" +
                     "creatStatus:生成状态(0-未生成 1-已生成) 【必填】<br>" +
-                    "jobType:核查任务类型(0-科室任务 1-院级 1-质控科) <br>" +
+                    "jobType:核查任务类型(0-科室任务 1-质控科 2-院级) <br>" +
                     "hospitalId: 医院ID<br>" +
                     "behospitalCode:病人住院序号<br>" +
                     "departments:科室<br>" +