Commit 33aa702db1bdb3799635d11aac68d246413287e9
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
33aa702
| ... | ... | @@ -1227,6 +1227,7 @@ |
| 1227 | 1227 | |
| 1228 | 1228 | map.put("monthAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate())); |
| 1229 | 1229 | map.put("birth",DateUtil.getyyyy_MM_dd(babyModel.getBirth())); |
| 1230 | + map.put("mphone",babyModel.getMphone()); | |
| 1230 | 1231 | } |
| 1231 | 1232 | map.put("checkMonthAge", babyCheckModel.getCheckMonth() + "月龄"); |
| 1232 | 1233 | map.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())); |
| ... | ... | @@ -3400,7 +3401,8 @@ |
| 3400 | 3401 | if(null!=babyModel&&"216".equals(babyModel.getHospitalId())){ |
| 3401 | 3402 | Map<String,Object> buildRecord=new HashMap<>(); |
| 3402 | 3403 | //月龄 |
| 3403 | - int time=DateUtil.getBabyAgeMonth(babyModel.getBirth(), babyModel.getBuildDate()); | |
| 3404 | + //新逻辑建档默认0月龄不用原逻辑 | |
| 3405 | + int time=0; //DateUtil.getBabyAgeMonth(babyModel.getBirth(), babyModel.getBuildDate());//原来的逻辑 | |
| 3404 | 3406 | buildRecord.put("head", babyModel.getBabyHead()); |
| 3405 | 3407 | buildRecord.put("time", time); |
| 3406 | 3408 | buildRecord.put("height", babyModel.getBabyHeight()); |