Commit 62c540ab4709b7f2070577efaf57de0962c3862e
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
62c540a
| ... | ... | @@ -1451,7 +1451,7 @@ |
| 1451 | 1451 | result.setNextDate(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate()))); |
| 1452 | 1452 | result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date()))); |
| 1453 | 1453 | result.setPatientId(model.getParentId()); |
| 1454 | - | |
| 1454 | + result.setBuildTime(DateUtil.getyyyy_MM_dd(model.getBuildDate())); | |
| 1455 | 1455 | String diagnose = ""; |
| 1456 | 1456 | // if (!StringUtils.isEmpty(model.getDiagnose())) { |
| 1457 | 1457 | // List diagList = JsonUtil.toList(model.getDiagnose(), List.class); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java
View file @
62c540a
| ... | ... | @@ -45,6 +45,17 @@ |
| 45 | 45 | //诊断 |
| 46 | 46 | private String diagnose; |
| 47 | 47 | |
| 48 | + | |
| 49 | + private String buildTime; | |
| 50 | + | |
| 51 | + public String getBuildTime() { | |
| 52 | + return buildTime; | |
| 53 | + } | |
| 54 | + | |
| 55 | + public void setBuildTime(String buildTime) { | |
| 56 | + this.buildTime = buildTime; | |
| 57 | + } | |
| 58 | + | |
| 48 | 59 | public String getServiceType() { |
| 49 | 60 | return serviceType; |
| 50 | 61 | } |