Commit 584af39903af665ab94499f8cdb0a3817c2c44b9
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java
View file @
584af39
| ... | ... | @@ -5,16 +5,19 @@ |
| 5 | 5 | import com.lyms.platform.common.enums.YnEnums; |
| 6 | 6 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 7 | 7 | import com.lyms.platform.common.result.BaseResponse; |
| 8 | +import com.lyms.platform.common.utils.DateUtil; | |
| 8 | 9 | import com.lyms.platform.operate.web.request.BabyVisitAddRequest; |
| 9 | 10 | import com.lyms.platform.operate.web.request.VisitAddRequest; |
| 10 | 11 | import com.lyms.platform.operate.web.request.VisitAddRequest.SimpleVisitPuerpera; |
| 11 | -import com.lyms.platform.operate.web.result.AddressInner; | |
| 12 | 12 | import com.lyms.platform.operate.web.result.BabyVisitResult; |
| 13 | 13 | import com.lyms.platform.operate.web.result.BabyVisitResult.BabyVisit; |
| 14 | 14 | import com.lyms.platform.operate.web.result.SimpleVisit; |
| 15 | 15 | import com.lyms.platform.operate.web.result.VisitResult; |
| 16 | 16 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
| 17 | -import com.lyms.platform.pojo.*; | |
| 17 | +import com.lyms.platform.pojo.BabyModel; | |
| 18 | +import com.lyms.platform.pojo.BabyVisitModel; | |
| 19 | +import com.lyms.platform.pojo.Patients; | |
| 20 | +import com.lyms.platform.pojo.VisitModel; | |
| 18 | 21 | import com.lyms.platform.query.BabyModelQuery; |
| 19 | 22 | import com.lyms.platform.query.PatientsQuery; |
| 20 | 23 | import com.lyms.platform.query.VisitQuery; |
| ... | ... | @@ -80,7 +83,7 @@ |
| 80 | 83 | private BaseObjectResponse doBiz(Patients puerperaModel) { |
| 81 | 84 | VisitResult data = new VisitResult(); |
| 82 | 85 | if (null != puerperaModel) { |
| 83 | - data.convertToResult1(puerperaModel, CommonsHelper.fullAddress(puerperaModel,basicConfigService)); | |
| 86 | + data.convertToResult1(puerperaModel, CommonsHelper.fullAddress(puerperaModel, basicConfigService)); | |
| 84 | 87 | VisitQuery visitQuery = new VisitQuery(); |
| 85 | 88 | visitQuery.setParentId(puerperaModel.getId()); |
| 86 | 89 | List<VisitModel> visits = visitService.queryVisit(visitQuery); |
| ... | ... | @@ -114,6 +117,7 @@ |
| 114 | 117 | return patientsService.findOnePatientByCardNo(query); |
| 115 | 118 | } |
| 116 | 119 | |
| 120 | + | |
| 117 | 121 | /** |
| 118 | 122 | * 增加产妇访视记录 |
| 119 | 123 | * |
| ... | ... | @@ -123,6 +127,14 @@ |
| 123 | 127 | public BaseResponse addOneVisit(VisitAddRequest visitRequest) { |
| 124 | 128 | // 获取患者id |
| 125 | 129 | String parentId = visitRequest.getParentId(); |
| 130 | + String checkTime = visitRequest.getCheckTime(); | |
| 131 | + if (StringUtils.isNotEmpty(checkTime)&&null!=visitRequest.getPatients().getDueDate()) { | |
| 132 | + boolean f = DateUtil.parseYMD(checkTime).before(visitRequest.getPatients().getDueDate()); | |
| 133 | + if (f) { | |
| 134 | + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("检查时间必须大于分娩时间"); | |
| 135 | + } | |
| 136 | + } | |
| 137 | + | |
| 126 | 138 | if (StringUtils.isNotBlank(parentId)) { |
| 127 | 139 | Patients model; |
| 128 | 140 | PatientsQuery patientsQuery = new PatientsQuery(); |