jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 04376c3d0aa121caa96c0f032ad7aa180562cb5f

Authored by liquanyu
1 parent a080a03838
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 3 additions and 2 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ 04376c3
... ... @@ -452,7 +452,7 @@
452 452  
453 453 public void setAutoMatDeliver(String cardNo,Date dueDate)
454 454 {
455   - Date endDate = dueDate == null ? DateUtil.addDay(new Date(), -294) : dueDate;
  455 + Date endDate = DateUtil.addDay(new Date(), -294);
456 456 PatientsQuery patientsQuery = new PatientsQuery();
457 457 patientsQuery.setYn(YnEnums.YES.getId());
458 458 patientsQuery.setType(1);
... ... @@ -470,7 +470,8 @@
470 470 for (Patients patients : patientses) {
471 471 patients.setType(3);
472 472 patients.setBuildType(2);
473   - patients.setFmDate(DateUtil.addDay(patients.getLastMenses(), 294));
  473 + Date fmDate = dueDate != null ? dueDate : DateUtil.addDay(patients.getLastMenses(), 294);
  474 + patients.setFmDate(fmDate);
474 475 patients.setModified(new Date());
475 476 // hujiaqi添加，是否自动分娩
476 477 patients.setIsAutoFm(YnEnums.YES.getId());