fangcheng / regional-platform

Download as
Browse Code »

Commit 900f14b62d53d34c33fa2a473141c5e2511ad04d

Authored by jiangjiazhi
1 parent bf5a115894
Exists in master and in 1 other branch nobuildprocess

修改新电子病历

Showing 1 changed file with 6 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 900f14b
... ... @@ -282,7 +282,7 @@
282 282 }
283 283  
284 284  
285   - private BabyModel fillBaby(Patients patients) {
  285 + private BabyModel fillBaby(Patients patients,MatDeliverAddRequest deliverAddRequest) {
286 286 BabyModel babyModel = new BabyModel();
287 287 if (null != patients) {
288 288 babyModel.setAreaId(patients.getAreaId());
... ... @@ -312,8 +312,10 @@
312 312 babyModel.setBuildDoctor("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29");
313 313 babyModel.setServiceStatus(patients.getServiceStatus());
314 314 babyModel.setServiceType(patients.getServiceType());
315   - int day=DateUtil.getDays(patients.getLastMenses(),patients.getFmDate());
316   - babyModel.setDueWeek(day/7);
  315 + if(null!=deliverAddRequest.getDueDate()){
  316 + int day=DateUtil.getDays(patients.getLastMenses(),DateUtil.parseYMD(deliverAddRequest.getDueDate()));
  317 + babyModel.setDueWeek(day/7);
  318 + }
317 319 }
318 320 // 产妇分娩建档
319 321 babyModel.setBuildType(2);
... ... @@ -410,7 +412,7 @@
410 412 MaternalDeliverModel.Baby baby1 = baby.convertToDataModel();
411 413 babyList.add(baby1);
412 414 //填充小孩基本信息
413   - BabyModel babyModel = fillBaby(patients);
  415 + BabyModel babyModel = fillBaby(patients,deliverAddRequest);
414 416 babyModel.setDeliverOrg(hospital);
415 417 baby.setId(baby1.getId());
416 418 babyModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate()));