From 0bf62ec296e87de2c5bc2c04b2bfa856ef13a16a Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 18 Aug 2016 18:25:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E7=94=B5=E5=AD=90=E7=97=85?= =?UTF-8?q?=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/BabyBookbuildingFacade.java | 2 ++ .../com/lyms/platform/operate/web/facade/BabyCheckFacade.java | 2 +- .../operate/web/request/YunBookbuildingAddRequest.java | 1 + .../com/lyms/platform/operate/web/result/BabyInfoResult.java | 10 ++++++++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index c75aee9..e9d7f45 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -109,6 +109,7 @@ public class BabyBookbuildingFacade { for(BabyModel babyModel:models){ Map checkRecord = new HashMap<>(); checkRecord.put("id", babyModel.getId()); + checkRecord.put("pid",babyModel.getPid()); checkRecord.put("checkDate", DateUtil.getyyyy_MM_dd(babyModel.getBuildDate())); String monthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), babyModel.getBuildDate()); checkRecord.put("monthAge", monthAge); @@ -1034,6 +1035,7 @@ public class BabyBookbuildingFacade { puerperaQuery.setCardNo(model.getMcertNo()); BabyInfoResult result = new BabyInfoResult(); + result.setPid(model.getPid()); result.setCardNo(model.getMcertNo());//母亲的身份证号码 result.setName(model.getName()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index c881b1b..a86495d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -249,7 +249,7 @@ public class BabyCheckFacade { { monthAge = DateUtil.getBabyMonthAge(babyBirth, checkDate); } - + checkRecord.put("parentId",cmodel.getBuildId()); checkRecord.put("id", cmodel.getId()); checkRecord.put("checkDate", DateUtil.getyyyy_MM_dd(checkDate)); checkRecord.put("monthAge", monthAge); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 3d4aa11..a2eba98 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -140,6 +140,7 @@ public class YunBookbuildingAddRequest { //医院Id @FormParam + @NotEmpty(message = "医院id不能为空.") private String hospitalId; //服务状态 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java index 78c04ad..0e0ccad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java @@ -12,10 +12,20 @@ public class BabyInfoResult { private String name; private String monthAge; private String cardNo; + private String id; private List> buildRecords; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public List> getBuildRecords() { return buildRecords; } -- 1.8.3.1