diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostVisitHospitalModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostVisitHospitalModel.java index 222b658..ef4a235 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostVisitHospitalModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostVisitHospitalModel.java @@ -6,15 +6,19 @@ package com.lyms.platform.pojo; * @discription */ +import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.result.BaseModel; +import org.hibernate.validator.constraints.NotEmpty; import org.springframework.data.mongodb.core.mapping.Document; +import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; /** * 产后修养地配置 */ +@Form @Document(collection = "lyms_post_visit_hospital") public class PostVisitHospitalModel extends BaseModel { private String id; @@ -25,6 +29,8 @@ public class PostVisitHospitalModel extends BaseModel { /** * 产后修养医院id */ + @NotNull(message = "产后修养医院id不能为空") + @NotEmpty(message = "产后修养医院id不能为空") private String postHosptial; /** * 地址id集合 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java index bfa6271..68e44b6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; import java.util.Map; @@ -92,7 +93,7 @@ public class ModularFunctionConfigController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/addPostVisitHospital") @ResponseBody @TokenRequired - public BaseResponse addPostVisitHospital(PostVisitHospitalModel model, + public BaseResponse addPostVisitHospital(@Valid @RequestBody PostVisitHospitalModel model, HttpServletRequest request) { if(StringUtils.isNotEmpty(model.getId())){ modularFunctionConfigFacde.updatePostVisitHospital(model, getUserId(request)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 1ebc100..b6e6fd5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -354,16 +354,19 @@ public class AntenatalExaminationFacade { @Override public void run() { try { - //发送推送消息 - if (antExamModel.getSendMsg() != null && antExamModel.getSendMsg()) { - Patients patients = patientsService.findOnePatientById(antExamModel.getParentId()); - if (patients != null) { - patients.setVcCardNo(antExAddRequest.getVcCardNo()); + Patients patients = patientsService.findOnePatientById(antExamModel.getParentId()); + if (patients != null) { + patients.setVcCardNo(antExAddRequest.getVcCardNo()); + //发送推送消息 + if (antExamModel.getSendMsg() != null && antExamModel.getSendMsg()) { //发送推送消息 patients.setSendMsgTime(new Date()); + } + if(antExamModel.getSendMsg() != null || StringUtils.isNotEmpty(antExAddRequest.getVcCardNo())){ patientsService.updatePatient(patients); } } + } catch (Exception e) { e.printStackTrace(); }