diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ModifyPrimaryDiseaseInfoReqVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ModifyPrimaryDiseaseInfoReqVO.java index 4b22d353..04f82450 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ModifyPrimaryDiseaseInfoReqVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ModifyPrimaryDiseaseInfoReqVO.java @@ -2,9 +2,12 @@ package com.supervision.vo.ask; import lombok.Data; +import javax.validation.constraints.NotBlank; + @Data public class ModifyPrimaryDiseaseInfoReqVO { + @NotBlank(message = "初步诊断ID不能为空") private String id; private String patientDiseaseInfo; diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java index ba25f10a..290d228d 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java @@ -16,12 +16,15 @@ import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; import java.util.List; @Api(tags = "初步诊断") +@Validated @RestController @RequestMapping("askPrimary") @RequiredArgsConstructor @@ -31,7 +34,7 @@ public class AskPrimaryController { @ApiOperation("查询初步诊断列表") @GetMapping("queryAskPrimaryList") - public List queryAskPrimaryList(String processId) { + public List queryAskPrimaryList(@NotBlank(message = "流程ID不能为空") String processId) { return askPrimaryService.queryAskPrimaryList(processId); } @@ -43,13 +46,13 @@ public class AskPrimaryController { @ApiOperation("修改初步诊断病情依据") @PostMapping("modifyPrimaryDiseaseInfo") - public void modifyPrimaryDiseaseInfo(@RequestBody ModifyPrimaryDiseaseInfoReqVO reqVO) { + public void modifyPrimaryDiseaseInfo(@RequestBody @Validated ModifyPrimaryDiseaseInfoReqVO reqVO) { askPrimaryService.modifyPrimaryDiseaseInfo(reqVO); } @ApiOperation("新增初步诊断") @PostMapping("savePrimary") - public void savePrimary(@RequestBody SaveDiagnosisPrimaryReqVO reqVO) { + public void savePrimary(@RequestBody @Validated SaveDiagnosisPrimaryReqVO reqVO) { askPrimaryService.savePrimary(reqVO); } @@ -61,7 +64,7 @@ public class AskPrimaryController { @ApiOperation("删除初步诊断") @GetMapping("deletePrimary") - public void deletePrimary(String id) { + public void deletePrimary(@NotBlank(message = "初步诊断ID不能为空") String id) { askPrimaryService.deletePrimary(id); } @@ -74,7 +77,7 @@ public class AskPrimaryController { @ApiOperation("确认诊断页面,保存初步诊断以及鉴别依据") @PostMapping("confirmPrimaryByAskEnd") - public void confirmPrimaryByAskEnd(@RequestBody List reqVOList) { + public void confirmPrimaryByAskEnd(@RequestBody @Valid List reqVOList) { askPrimaryService.confirmPrimaryByAskEnd(reqVOList); } } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java index e8a20e37..aa32e468 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java @@ -3,14 +3,17 @@ package com.supervision.pojo.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.util.List; @Data public class PrimaryConfirmReqVO { @ApiModelProperty("初步诊断ID") + @NotBlank(message = "初步诊断ID不能为空") private String primaryId; + @NotBlank(message = "流程ID不能为空") private String processId; diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java index bc907fd0..63ee0dff 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; import java.util.List; @Data @@ -19,12 +20,14 @@ public class SaveDiagnosisPrimaryReqVO { * 诊断流程ID */ @ApiModelProperty("诊断流程ID") + @NotBlank(message = "诊断流程ID不能为空") private String processId; /** * 初步诊断疾病,关联disease表ID */ @ApiModelProperty("初步诊断疾病ID,关联disease表ID") + @NotBlank(message = "初步诊断疾病ID不能为空") private String primaryDiagnosisId; @ApiModelProperty("患者病情(初步诊断填写)")