Commit 707ea43f555523433e5a2e756d98f1d46868a50c

Authored by jiangjiazhi

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java View file @ 707ea43
... ... @@ -106,6 +106,7 @@
106 106 for (BabyModel babyModel : babyModelList) {
107 107 BabyStatisticsManagerBuildDoctorListQueryModel babyStatisticsManagerBuildDoctorListQueryModel = new BabyStatisticsManagerBuildDoctorListQueryModel();
108 108 babyStatisticsManagerBuildDoctorListQueryModel.setName(babyModel.getName());
  109 + babyStatisticsManagerBuildDoctorListQueryModel.setBabyId(babyModel.getId());
109 110 for (SexEnum sexEnum : SexEnum.values()) {
110 111 if (sexEnum.getId().equals(babyModel.getSex())) {
111 112 babyStatisticsManagerBuildDoctorListQueryModel.setSex(sexEnum.getText());
... ... @@ -207,6 +208,7 @@
207 208 }
208 209 for (BabyCheckModel babyCheckModel : babyCheckModelList) {
209 210 BabyStatisticsManagerCheckDoctorListQueryModel babyStatisticsManagerCheckDoctorListQueryModel = new BabyStatisticsManagerCheckDoctorListQueryModel();
  211 + babyStatisticsManagerCheckDoctorListQueryModel.setBabyId(babyCheckModel.getBuildId());
210 212 Integer checkMonthInt = babyCheckModel.getCheckMonth();
211 213 String checkMonthStr = "";
212 214 if (checkMonthInt != null) {
... ... @@ -310,6 +312,7 @@
310 312 if (CollectionUtils.isNotEmpty(babyCheckModelList)) {
311 313 for (BabyCheckModel babyCheckModel : babyCheckModelList) {
312 314 BabyStatisticsManagerWeekAgeListQueryModel babyStatisticsManagerWeekAgeListQueryModel = new BabyStatisticsManagerWeekAgeListQueryModel();
  315 + babyStatisticsManagerWeekAgeListQueryModel.setBabyId(babyCheckModel.getBuildId());
313 316 Integer checkMonthInt = babyCheckModel.getCheckMonth();
314 317 String checkMonthStr = "";
315 318 if (checkMonthInt != null) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyStatisticsManagerBuildDoctorListQueryModel.java View file @ 707ea43
... ... @@ -21,6 +21,16 @@
21 21  
22 22 private String buildDoctor;
23 23  
  24 + private String babyId;
  25 +
  26 + public String getBabyId() {
  27 + return babyId;
  28 + }
  29 +
  30 + public void setBabyId(String babyId) {
  31 + this.babyId = babyId;
  32 + }
  33 +
24 34 public String getName() {
25 35 return name;
26 36 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyStatisticsManagerCheckDoctorListQueryModel.java View file @ 707ea43
... ... @@ -21,6 +21,16 @@
21 21  
22 22 private String checkDoctor;
23 23  
  24 + private String babyId;
  25 +
  26 + public String getBabyId() {
  27 + return babyId;
  28 + }
  29 +
  30 + public void setBabyId(String babyId) {
  31 + this.babyId = babyId;
  32 + }
  33 +
24 34 public String getName() {
25 35 return name;
26 36 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyStatisticsManagerWeekAgeListQueryModel.java View file @ 707ea43
... ... @@ -21,6 +21,16 @@
21 21  
22 22 private String checkDoctor;
23 23  
  24 + private String babyId;
  25 +
  26 + public String getBabyId() {
  27 + return babyId;
  28 + }
  29 +
  30 + public void setBabyId(String babyId) {
  31 + this.babyId = babyId;
  32 + }
  33 +
24 34 public String getName() {
25 35 return name;
26 36 }