diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 1343df5..c674851 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -185,9 +185,9 @@ public class AntenatalExaminationController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/antexmanageSign") @ResponseBody @TokenRequired - public BaseResponse addOneAntenatalExaminationSign(String patientSign, String id, HttpServletRequest request) { + public BaseResponse addOneAntenatalExaminationSign(@Valid @RequestBody PatientSignRequest patientSignRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - BaseResponse baseResponse = antenatalExaminationFacade.antexmanageSign(patientSign, id); + BaseResponse baseResponse = antenatalExaminationFacade.antexmanageSign(patientSignRequest.getPatientSign(), patientSignRequest.getId()); return baseResponse; } @@ -221,9 +221,9 @@ public class AntenatalExaminationController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/antexSign") @ResponseBody @TokenRequired - public BaseResponse antexSign(String patientSign, String id, HttpServletRequest request) { + public BaseResponse antexSign(@Valid @RequestBody PatientSignRequest patientSignRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - BaseResponse baseResponse = antenatalExaminationFacade.antexSign(patientSign, id); + BaseResponse baseResponse = antenatalExaminationFacade.antexSign(patientSignRequest.getPatientSign(), patientSignRequest.getId()); return baseResponse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index a536cb2..c7e70d3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -71,8 +71,8 @@ public class BabyCheckController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/babyCheckSign") @ResponseBody @TokenRequired - public BaseResponse babyCheckSign(String patientSign, String id, HttpServletRequest request) { - BaseResponse baseResponse = babyCheckFacade.babyCheckSign(patientSign, id); + public BaseResponse babyCheckSign(@Valid @RequestBody PatientSignRequest patientSignRequest, HttpServletRequest request) { + BaseResponse baseResponse = babyCheckFacade.babyCheckSign(patientSignRequest.getPatientSign(), patientSignRequest.getId()); return baseResponse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java index 322af0c..9e40dc7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java @@ -4,6 +4,7 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.request.PatientSignRequest; import com.lyms.platform.operate.web.service.BabyEyeCheckService; import com.lyms.platform.pojo.BabyEyeCheck; import com.lyms.platform.pojo.BabyEyePatient; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.util.Date; /** @@ -50,8 +52,8 @@ public class BabyEyeCheckController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/babyEyeCheckSign") @ResponseBody @TokenRequired - public BaseResponse babyEyeCheckSign(String patientSign, String id, HttpServletRequest request) { - return babyEyeCheckService.babyEyeCheckSign(patientSign, id); + public BaseResponse babyEyeCheckSign(@Valid @RequestBody PatientSignRequest patientSignRequest, HttpServletRequest request) { + return babyEyeCheckService.babyEyeCheckSign(patientSignRequest.getPatientSign(), patientSignRequest.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index 70c4351..9aacda6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -110,8 +110,8 @@ public class MatDeliverController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/matdelSign") @ResponseBody @TokenRequired - public BaseResponse matdelSign(String patientSign, String id, HttpServletRequest request) { - BaseResponse baseResponse = matDeliverFacade.matdelSign(patientSign, id); + public BaseResponse matdelSign(@Valid @RequestBody PatientSignRequest patientSignRequest, HttpServletRequest request) { + BaseResponse baseResponse = matDeliverFacade.matdelSign(patientSignRequest.getPatientSign(), patientSignRequest.getId()); return baseResponse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientSignRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientSignRequest.java new file mode 100644 index 0000000..e01de81 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientSignRequest.java @@ -0,0 +1,40 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.common.core.annotation.form.Form; + + +@Form +public class PatientSignRequest{ + private String id; + + + //医生签名 + private String doctorSign; + + //患者签名 + private String patientSign; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getDoctorSign() { + return doctorSign; + } + + public void setDoctorSign(String doctorSign) { + this.doctorSign = doctorSign; + } + + public String getPatientSign() { + return patientSign; + } + + public void setPatientSign(String patientSign) { + this.patientSign = patientSign; + } +}