liquanyu / regional-platform

Download as
Browse Code »

Commit 82e5ffe8549342c16cdec22811f7cf5cf611bfde

Authored by wtt
1 parent 9c96e82007
Exists in master and in 1 other branch dev

update

Showing 3 changed files with 8 additions and 15 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 82e5ffe
... ... @@ -525,20 +525,10 @@
525 525 babyAutoRiskRequest.setEncoded(model.getEncoded());
526 526 babyAutoRiskRequest.setCardNo(model.getCardNo());
527 527 if(model.getBirth()!=null && model.getCreated()!=null){
528   - babyAutoRiskRequest.setDueWeek(DateUtil.getWeekDesc(model.getBirth(), model.getCreated()));
  528 + babyAutoRiskRequest.setDueWeek(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
  529 +
529 530 }
530   - String dueWeek = "";
531   - if (model.getDueWeek() != null) {
532   - dueWeek += model.getDueWeek() + "周";
533   - } else {
534   - dueWeek += "0周";
535   - }
536   - if (model.getDueDay() != null) {
537   - dueWeek += model.getDueDay() + "天";
538   - } else {
539   - dueWeek += "0天";
540   - }
541   - babyAutoRiskRequest.setDueWeek(dueWeek);
  531 +
542 532 Map map = new HashMap();
543 533 map.put("fmfs", model.getDueType());
544 534 babyAutoRiskRequest.setDeliveryMode(map);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 82e5ffe
... ... @@ -643,7 +643,8 @@
643 643 babyAutoRiskRequest.setEncoded(babyModel.getEncoded());
644 644 babyAutoRiskRequest.setCardNo(babyModel.getCardNo());
645 645 if(babyModel.getBirth()!=null && model.getCreated()!=null){
646   - babyAutoRiskRequest.setDueWeek(DateUtil.getWeekDesc(babyModel.getBirth(), model.getCreated()));
  646 + babyAutoRiskRequest.setDueWeek(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
  647 +
647 648 }
648 649 babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 2,"");
649 650 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 82e5ffe
... ... @@ -455,13 +455,15 @@
455 455 babyAutoRiskRequest.setMphone(patients1.getPhone());
456 456 babyAutoRiskRequest.setMname(patients1.getUsername());
457 457 babyAutoRiskRequest.setMcertNo(patients1.getCardNo());
458   - babyAutoRiskRequest.setDueWeek(maternalDeliverModel.getDueWeek());
  458 +
459 459 BabyModel babyModel = babyService.getOneBabyById(baby.get(i).getId());
460 460 if(babyModel!=null ){
461 461 babyAutoRiskRequest.setBabyId(babyModel.getId());
462 462 babyAutoRiskRequest.setName(babyModel.getName());
463 463 babyAutoRiskRequest.setEncoded(babyModel.getEncoded());
464 464 babyAutoRiskRequest.setCardNo(babyModel.getCardNo());
  465 + babyAutoRiskRequest.setDueWeek(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
  466 +
465 467 }
466 468 babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 0, "");
467 469 }