From b66255af0c47208835a3383572feb99f896df86b Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Thu, 18 Apr 2024 10:24:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../signpatientmanageroutenode/MobilePatientTaskDto.java | 4 ++++ .../impl/SignPatientManageRouteNodeServiceImpl.java | 6 ------ .../AppletSignPatientTaskController.java | 5 ++++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/MobilePatientTaskDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/MobilePatientTaskDto.java index 71b92afc..257cae38 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/MobilePatientTaskDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/MobilePatientTaskDto.java @@ -3,6 +3,7 @@ package com.xinelu.manage.dto.signpatientmanageroutenode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.List; +import javax.validation.constraints.NotNull; import lombok.Data; /** @@ -18,11 +19,14 @@ public class MobilePatientTaskDto { * 居民信息表主键 */ @ApiModelProperty("居民信息表主键") + @NotNull(message = "请输入患者信息") private Long residentId; /** * 任务类型列表 */ + @ApiModelProperty("任务类型列表") + @NotNull(message = "数据传输有误") private List taskTypeList; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java index ac77942a..dd0971f9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java @@ -250,12 +250,6 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage @Override public List getMobileTaskList(MobilePatientTaskDto mobilePatientTaskDto) { // 根据居民信息表主键查询患者信息 - if (mobilePatientTaskDto.getResidentId() == null) { - throw new ServiceException("请输入患者信息!"); - } - if (CollectionUtils.isEmpty(mobilePatientTaskDto.getTaskTypeList())) { - throw new ServiceException("数据传输有误!"); - } List retList = new ArrayList<>(); // 查询患者表信息 PatientInfoDto patientQuery = new PatientInfoDto(); diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/appletsignpatienttask/AppletSignPatientTaskController.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/appletsignpatienttask/AppletSignPatientTaskController.java index ac0be653..2a579643 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/appletsignpatienttask/AppletSignPatientTaskController.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/appletsignpatienttask/AppletSignPatientTaskController.java @@ -5,9 +5,11 @@ import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRout import com.xinelu.manage.dto.signpatientmanageroutenode.MobilePatientTaskDto; import com.xinelu.manage.service.signpatientmanageroutenode.ISignPatientManageRouteNodeService; import com.xinelu.manage.vo.signpatientmanageroutenode.MobileRouteNodeListVo; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.List; import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController; * @author: haown * @create: 2024-04-17 09:47 **/ +@Api(tags = "小程序-患者任务控制器") @RestController @RequestMapping("/postDischarge/signnode") public class AppletSignPatientTaskController { @@ -29,7 +32,7 @@ public class AppletSignPatientTaskController { */ @ApiOperation("任务列表列表") @GetMapping("/getTaskList") - public R> getMobileTaskList(MobilePatientTaskDto mobilePatientTaskDto) { + public R> getMobileTaskList(@Valid MobilePatientTaskDto mobilePatientTaskDto) { List list = signNodeService.getMobileTaskList(mobilePatientTaskDto); return R.ok(list); }