Commit 4991bda8c6ff0af5a6a8ac1fc93118e9ba3376ee
1 parent
8a511aebd9
Exists in
master
and in
6 other branches
update
Showing 5 changed files with 52 additions and 10 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientSignRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
View file @
4991bda
| ... | ... | @@ -185,9 +185,9 @@ |
| 185 | 185 | @RequestMapping(method = RequestMethod.POST, value = "/antexmanageSign") |
| 186 | 186 | @ResponseBody |
| 187 | 187 | @TokenRequired |
| 188 | - public BaseResponse addOneAntenatalExaminationSign(String patientSign, String id, HttpServletRequest request) { | |
| 188 | + public BaseResponse addOneAntenatalExaminationSign(@Valid @RequestBody PatientSignRequest patientSignRequest, HttpServletRequest request) { | |
| 189 | 189 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 190 | - BaseResponse baseResponse = antenatalExaminationFacade.antexmanageSign(patientSign, id); | |
| 190 | + BaseResponse baseResponse = antenatalExaminationFacade.antexmanageSign(patientSignRequest.getPatientSign(), patientSignRequest.getId()); | |
| 191 | 191 | return baseResponse; |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | |
| ... | ... | @@ -221,9 +221,9 @@ |
| 221 | 221 | @RequestMapping(method = RequestMethod.POST, value = "/antexSign") |
| 222 | 222 | @ResponseBody |
| 223 | 223 | @TokenRequired |
| 224 | - public BaseResponse antexSign(String patientSign, String id, HttpServletRequest request) { | |
| 224 | + public BaseResponse antexSign(@Valid @RequestBody PatientSignRequest patientSignRequest, HttpServletRequest request) { | |
| 225 | 225 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 226 | - BaseResponse baseResponse = antenatalExaminationFacade.antexSign(patientSign, id); | |
| 226 | + BaseResponse baseResponse = antenatalExaminationFacade.antexSign(patientSignRequest.getPatientSign(), patientSignRequest.getId()); | |
| 227 | 227 | return baseResponse; |
| 228 | 228 | } |
| 229 | 229 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
View file @
4991bda
| ... | ... | @@ -71,8 +71,8 @@ |
| 71 | 71 | @RequestMapping(method = RequestMethod.POST, value = "/babyCheckSign") |
| 72 | 72 | @ResponseBody |
| 73 | 73 | @TokenRequired |
| 74 | - public BaseResponse babyCheckSign(String patientSign, String id, HttpServletRequest request) { | |
| 75 | - BaseResponse baseResponse = babyCheckFacade.babyCheckSign(patientSign, id); | |
| 74 | + public BaseResponse babyCheckSign(@Valid @RequestBody PatientSignRequest patientSignRequest, HttpServletRequest request) { | |
| 75 | + BaseResponse baseResponse = babyCheckFacade.babyCheckSign(patientSignRequest.getPatientSign(), patientSignRequest.getId()); | |
| 76 | 76 | return baseResponse; |
| 77 | 77 | } |
| 78 | 78 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
View file @
4991bda
| ... | ... | @@ -4,6 +4,7 @@ |
| 4 | 4 | import com.lyms.platform.common.base.BaseController; |
| 5 | 5 | import com.lyms.platform.common.result.BaseResponse; |
| 6 | 6 | import com.lyms.platform.common.utils.StringUtils; |
| 7 | +import com.lyms.platform.operate.web.request.PatientSignRequest; | |
| 7 | 8 | import com.lyms.platform.operate.web.service.BabyEyeCheckService; |
| 8 | 9 | import com.lyms.platform.pojo.BabyEyeCheck; |
| 9 | 10 | import com.lyms.platform.pojo.BabyEyePatient; |
| ... | ... | @@ -13,6 +14,7 @@ |
| 13 | 14 | |
| 14 | 15 | import javax.servlet.http.HttpServletRequest; |
| 15 | 16 | import javax.servlet.http.HttpServletResponse; |
| 17 | +import javax.validation.Valid; | |
| 16 | 18 | import java.util.Date; |
| 17 | 19 | |
| 18 | 20 | /** |
| ... | ... | @@ -50,8 +52,8 @@ |
| 50 | 52 | @RequestMapping(method = RequestMethod.POST, value = "/babyEyeCheckSign") |
| 51 | 53 | @ResponseBody |
| 52 | 54 | @TokenRequired |
| 53 | - public BaseResponse babyEyeCheckSign(String patientSign, String id, HttpServletRequest request) { | |
| 54 | - return babyEyeCheckService.babyEyeCheckSign(patientSign, id); | |
| 55 | + public BaseResponse babyEyeCheckSign(@Valid @RequestBody PatientSignRequest patientSignRequest, HttpServletRequest request) { | |
| 56 | + return babyEyeCheckService.babyEyeCheckSign(patientSignRequest.getPatientSign(), patientSignRequest.getId()); | |
| 55 | 57 | } |
| 56 | 58 | |
| 57 | 59 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
4991bda
| ... | ... | @@ -110,8 +110,8 @@ |
| 110 | 110 | @RequestMapping(method = RequestMethod.POST, value = "/matdelSign") |
| 111 | 111 | @ResponseBody |
| 112 | 112 | @TokenRequired |
| 113 | - public BaseResponse matdelSign(String patientSign, String id, HttpServletRequest request) { | |
| 114 | - BaseResponse baseResponse = matDeliverFacade.matdelSign(patientSign, id); | |
| 113 | + public BaseResponse matdelSign(@Valid @RequestBody PatientSignRequest patientSignRequest, HttpServletRequest request) { | |
| 114 | + BaseResponse baseResponse = matDeliverFacade.matdelSign(patientSignRequest.getPatientSign(), patientSignRequest.getId()); | |
| 115 | 115 | return baseResponse; |
| 116 | 116 | } |
| 117 | 117 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientSignRequest.java
View file @
4991bda
| 1 | +package com.lyms.platform.operate.web.request; | |
| 2 | + | |
| 3 | +import com.lyms.platform.common.core.annotation.form.Form; | |
| 4 | + | |
| 5 | + | |
| 6 | +@Form | |
| 7 | +public class PatientSignRequest{ | |
| 8 | + private String id; | |
| 9 | + | |
| 10 | + | |
| 11 | + //医生签名 | |
| 12 | + private String doctorSign; | |
| 13 | + | |
| 14 | + //患者签名 | |
| 15 | + private String patientSign; | |
| 16 | + | |
| 17 | + public String getId() { | |
| 18 | + return id; | |
| 19 | + } | |
| 20 | + | |
| 21 | + public void setId(String id) { | |
| 22 | + this.id = id; | |
| 23 | + } | |
| 24 | + | |
| 25 | + public String getDoctorSign() { | |
| 26 | + return doctorSign; | |
| 27 | + } | |
| 28 | + | |
| 29 | + public void setDoctorSign(String doctorSign) { | |
| 30 | + this.doctorSign = doctorSign; | |
| 31 | + } | |
| 32 | + | |
| 33 | + public String getPatientSign() { | |
| 34 | + return patientSign; | |
| 35 | + } | |
| 36 | + | |
| 37 | + public void setPatientSign(String patientSign) { | |
| 38 | + this.patientSign = patientSign; | |
| 39 | + } | |
| 40 | +} |