jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 40882faf0acfce55066b18bd9cbb09e722dca14a

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

修改产筛时间

Showing 2 changed files with 5 additions and 5 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ 40882fa
... ... @@ -398,8 +398,8 @@
398 398 sieveModel.setName(patients.getUsername());
399 399 sieveModel.setLastMenses(patients.getLastMenses());
400 400 sieveModel.setCardNo(patients.getCardNo());
401   - if (null != sieveModel.getDueWeek()) {
402   - sieveModel.setDueWeek(days);
  401 + if (null != sieveModel.getDueWeek()&&null!=sieveModel.getApplyDate()) {
  402 + sieveModel.setDueWeek(DateUtil.daysBetween(patients.getLastMenses(), sieveModel.getApplyDate()));
403 403 }
404 404 SieveService.handOrder(sieveModel);
405 405 sieveDao.updateChanQianSieve(sieveModel);
... ... @@ -436,8 +436,8 @@
436 436 sieveModel.setName(patients.getUsername());
437 437 sieveModel.setLastMenses(patients.getLastMenses());
438 438 sieveModel.setCardNo(patients.getCardNo());
439   - if (null != sieveModel.getDueWeek()) {
440   - sieveModel.setDueWeek(days);
  439 + if (null != sieveModel.getDueWeek() &&null!=sieveModel.getApplyDate()) {
  440 + sieveModel.setDueWeek(DateUtil.daysBetween(patients.getLastMenses(), sieveModel.getApplyDate()));
441 441 }
442 442 SieveService.handOrder(sieveModel);
443 443 sieveDao.updateChanQianSieve(sieveModel);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 40882fa
... ... @@ -387,7 +387,7 @@
387 387 if (StringUtils.isNotEmpty(sieveApplyOrderModel.getCheckDate())) {
388 388 sieveModel.setApplyDate(DateUtil.parseYMD(sieveApplyOrderModel.getCheckDate()));
389 389 }
390   - int days = DateUtil.daysBetween(sieveModel.getLastMenses(), new Date());
  390 + int days = DateUtil.daysBetween(sieveModel.getLastMenses(), sieveModel.getApplyDate());
391 391 sieveModel.setDueWeek(days);
392 392 SieveService.handOrder(sieveModel);
393 393 sieveService.updateOneChanQianDiaSieve(sieveModel);