Commit 52961ecc2c1d8e71071e0dfba6b1d1859e05c70f
1 parent
96e91f4b99
Exists in
master
and in
6 other branches
秦皇岛-20211223-儿保运动评测保存bug
Showing 1 changed file with 12 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
View file @
52961ec
... | ... | @@ -1192,8 +1192,12 @@ |
1192 | 1192 | } |
1193 | 1193 | Integer month = DateUtil.getBabyAgeMonth(babyModel.getBirth(), new Date()); |
1194 | 1194 | //Integer currentMonth = getCurrentMonth(month, 3, 1); |
1195 | - //秦皇岛-前端算出来的月龄model.getMonthAge()直接拿 | |
1196 | - if("216".equals(hospitalId)){ | |
1195 | + /** | |
1196 | + * 秦皇岛-20211223 | |
1197 | + * 前端算出来的月龄model.getMonthAge()直接拿, | |
1198 | + * model.getMonthAge()下标0的位置如果是孕表示月龄纠正后孩子现在时间还未出生,这种情况按出生日期计算 | |
1199 | + */ | |
1200 | + if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")!=0){ | |
1197 | 1201 | month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); |
1198 | 1202 | } |
1199 | 1203 | model.setBirth(babyModel.getBirth()); |
... | ... | @@ -1223,8 +1227,12 @@ |
1223 | 1227 | |
1224 | 1228 | Integer month = DateUtil.getBabyAgeMonth(babyModel.getBirth(), |
1225 | 1229 | mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), ExerciseAppraisalModel.class).getCreateTime()); |
1226 | - //秦皇岛-前端算出来的月龄model.getMonthAge()直接拿 | |
1227 | - if("216".equals(hospitalId)){ | |
1230 | + /** | |
1231 | + * 秦皇岛-20211223 | |
1232 | + * 前端算出来的月龄model.getMonthAge()直接拿, | |
1233 | + * model.getMonthAge()下标0的位置如果是孕表示月龄纠正后孩子现在时间还未出生,这种情况按出生日期计算 | |
1234 | + */ | |
1235 | + if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")!=0){ | |
1228 | 1236 | month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); |
1229 | 1237 | } |
1230 | 1238 | model.setCreateUser(null); |