Commit 879c6fda33f896bebfff31df969c3973eb49caa1
1 parent
6d21897c9e
Exists in
master
and in
6 other branches
设置修改分娩时间
Showing 2 changed files with 5 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
879c6fd
| ... | ... | @@ -233,7 +233,7 @@ |
| 233 | 233 | patientsService.updatePatient(patientsLocal); |
| 234 | 234 | |
| 235 | 235 | //修改分娩日期 |
| 236 | - updatePatientFmDate(patients1.getPid(), fmDate, 1); | |
| 236 | + updatePatientFmDate(patients1.getPid(), fmDate, 1,patients1.getLastMenses()); | |
| 237 | 237 | //修改person表状态为产妇 |
| 238 | 238 | if (StringUtils.isNotEmpty(patients1.getPid())) { |
| 239 | 239 | PersonModel personModel = new PersonModel(); |
| ... | ... | @@ -348,7 +348,7 @@ |
| 348 | 348 | patientsService.updatePatient(patients1); |
| 349 | 349 | |
| 350 | 350 | //修改分娩日期 |
| 351 | - updatePatientFmDate(patients.getPid(), fmDate, 3); | |
| 351 | + updatePatientFmDate(patients.getPid(), fmDate, 3,patients.getLastMenses()); | |
| 352 | 352 | |
| 353 | 353 | /** 填写分娩表分娩 >> 作废未使用的产检券 */ |
| 354 | 354 | // remoteService.invalidCoupon(patients.getPid(), "2", RemoteUrlEnum.INVALID_COUPON_URL); |
| 355 | 355 | |
| ... | ... | @@ -365,13 +365,15 @@ |
| 365 | 365 | * @param pid |
| 366 | 366 | * @param fmDate |
| 367 | 367 | */ |
| 368 | - private void updatePatientFmDate(String pid, Date fmDate, int type) { | |
| 368 | + private void updatePatientFmDate(String pid, Date fmDate, int type,Date lastMess) { | |
| 369 | 369 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 370 | 370 | patientsQuery.setPid(pid); |
| 371 | 371 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 372 | 372 | patientsQuery.setType(type); |
| 373 | 373 | patientsQuery.setDueStatus(0); |
| 374 | 374 | patientsQuery.setBuildType(1); |
| 375 | + patientsQuery.setLastMensesStart(lastMess); | |
| 376 | + patientsQuery.setLastMensesEnd(fmDate); | |
| 375 | 377 | List<Patients> patientsList = patientsService.queryPatient(patientsQuery); |
| 376 | 378 | for (Patients patients : patientsList) { |
| 377 | 379 | //判断分娩日期是否大于24孕周 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
879c6fd
| ... | ... | @@ -15,7 +15,6 @@ |
| 15 | 15 | import com.lyms.platform.permission.dao.master.CouponMapper; |
| 16 | 16 | import com.lyms.platform.pojo.*; |
| 17 | 17 | import com.lymsh.platform.reportdata.model.echarts.Series; |
| 18 | -import javafx.scene.shape.Circle; | |
| 19 | 18 | import org.apache.commons.collections.MapUtils; |
| 20 | 19 | import org.apache.commons.lang.StringUtils; |
| 21 | 20 | import org.springframework.beans.factory.annotation.Autowired; |