xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.11_院后第二增量' into dev

Browse Source
This commit is contained in:
haown 2024-04-18 10:26:50 +08:00
commit 726bccb364
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/MobilePatientTaskDto.java
View File

@ -3,6 +3,7 @@ package com.xinelu.manage.dto.signpatientmanageroutenode;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.List; import java.util.List;
import javax.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
/** /**
@ -18,11 +19,14 @@ public class MobilePatientTaskDto {
* 居民信息表主键 * 居民信息表主键
*/ */
@ApiModelProperty("居民信息表主键") @ApiModelProperty("居民信息表主键")
@NotNull(message = "请输入患者信息")
private Long residentId; private Long residentId;
/** /**
* 任务类型列表 * 任务类型列表
*/ */
@ApiModelProperty("任务类型列表")
@NotNull(message = "数据传输有误")
private List<String> taskTypeList; private List<String> taskTypeList;
} }

6
postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java
View File

@ -250,12 +250,6 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage
@Override public List<MobileRouteNodeListVo> getMobileTaskList(MobilePatientTaskDto mobilePatientTaskDto) { @Override public List<MobileRouteNodeListVo> getMobileTaskList(MobilePatientTaskDto mobilePatientTaskDto) {
// 根据居民信息表主键查询患者信息 // 根据居民信息表主键查询患者信息
if (mobilePatientTaskDto.getResidentId() == null) {
throw new ServiceException("请输入患者信息!");
}
if (CollectionUtils.isEmpty(mobilePatientTaskDto.getTaskTypeList())) {
throw new ServiceException("数据传输有误!");
}
List<MobileRouteNodeListVo> retList = new ArrayList<>(); List<MobileRouteNodeListVo> retList = new ArrayList<>();
// 查询患者表信息 // 查询患者表信息
PatientInfoDto patientQuery = new PatientInfoDto(); PatientInfoDto patientQuery = new PatientInfoDto();

5
postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/appletsignpatienttask/AppletSignPatientTaskController.java
View File

@ -5,9 +5,11 @@ import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRout
import com.xinelu.manage.dto.signpatientmanageroutenode.MobilePatientTaskDto; import com.xinelu.manage.dto.signpatientmanageroutenode.MobilePatientTaskDto;
import com.xinelu.manage.service.signpatientmanageroutenode.ISignPatientManageRouteNodeService; import com.xinelu.manage.service.signpatientmanageroutenode.ISignPatientManageRouteNodeService;
import com.xinelu.manage.vo.signpatientmanageroutenode.MobileRouteNodeListVo; import com.xinelu.manage.vo.signpatientmanageroutenode.MobileRouteNodeListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import java.util.List; import java.util.List;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
* @author: haown * @author: haown
* @create: 2024-04-17 09:47 * @create: 2024-04-17 09:47
**/ **/
@Api(tags = "小程序-患者任务控制器")
@RestController @RestController
@RequestMapping("/postDischarge/signnode") @RequestMapping("/postDischarge/signnode")
public class AppletSignPatientTaskController { public class AppletSignPatientTaskController {
@ -29,7 +32,7 @@ public class AppletSignPatientTaskController {
*/ */
@ApiOperation("任务列表列表") @ApiOperation("任务列表列表")
@GetMapping("/getTaskList") @GetMapping("/getTaskList")
public R<List<MobileRouteNodeListVo>> getMobileTaskList(MobilePatientTaskDto mobilePatientTaskDto) { public R<List<MobileRouteNodeListVo>> getMobileTaskList(@Valid MobilePatientTaskDto mobilePatientTaskDto) {
List<MobileRouteNodeListVo> list = signNodeService.getMobileTaskList(mobilePatientTaskDto); List<MobileRouteNodeListVo> list = signNodeService.getMobileTaskList(mobilePatientTaskDto);
return R.ok(list); return R.ok(list);
} }