Commit 0f5128362f003fccee721f756becc39b355ad8f3
1 parent
6ac2f55cdc
Exists in
master
and in
6 other branches
秦皇岛20211222运动测评的月龄就会按照纠正月龄来计算
Showing 2 changed files with 10 additions and 6 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/ExerciseAppraisalModel.java
View file @
0f51283
| ... | ... | @@ -128,13 +128,13 @@ |
| 128 | 128 | private Integer yn; |
| 129 | 129 | |
| 130 | 130 | //月龄 |
| 131 | - private Integer monthAge; | |
| 131 | + private String monthAge; | |
| 132 | 132 | |
| 133 | - public Integer getMonthAge() { | |
| 133 | + public String getMonthAge() { | |
| 134 | 134 | return monthAge; |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - public void setMonthAge(Integer monthAge) { | |
| 137 | + public void setMonthAge(String monthAge) { | |
| 138 | 138 | this.monthAge = monthAge; |
| 139 | 139 | } |
| 140 | 140 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
View file @
0f51283
| ... | ... | @@ -1194,7 +1194,7 @@ |
| 1194 | 1194 | //Integer currentMonth = getCurrentMonth(month, 3, 1); |
| 1195 | 1195 | //秦皇岛-前端算出来的月龄model.getMonthAge()直接拿 |
| 1196 | 1196 | if("216".equals(hospitalId)){ |
| 1197 | - month= model.getMonthAge(); | |
| 1197 | + month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); | |
| 1198 | 1198 | } |
| 1199 | 1199 | model.setBirth(babyModel.getBirth()); |
| 1200 | 1200 | model.setCardNo(babyModel.getCardNo()); |
| ... | ... | @@ -1225,7 +1225,7 @@ |
| 1225 | 1225 | mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), ExerciseAppraisalModel.class).getCreateTime()); |
| 1226 | 1226 | //秦皇岛-前端算出来的月龄model.getMonthAge()直接拿 |
| 1227 | 1227 | if("216".equals(hospitalId)){ |
| 1228 | - month= model.getMonthAge(); | |
| 1228 | + month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); | |
| 1229 | 1229 | } |
| 1230 | 1230 | model.setCreateUser(null); |
| 1231 | 1231 | model.setCreateTime(null); |
| ... | ... | @@ -1288,7 +1288,7 @@ |
| 1288 | 1288 | @Override |
| 1289 | 1289 | public BaseResponse findExerciseAppraisal(Integer userId, JSONObject jsonObject) { |
| 1290 | 1290 | String babyId = jsonObject.getString("babyId"); |
| 1291 | - String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 1291 | + final String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 1292 | 1292 | BaseResponse baseResponse = new BaseResponse(); |
| 1293 | 1293 | Query query = new Query(); |
| 1294 | 1294 | query.addCriteria(Criteria.where("hospitalId").is(hospitalId).and("yn").is(YnEnums.YES.getId()).and("babyId").is(babyId)); |
| ... | ... | @@ -1301,6 +1301,10 @@ |
| 1301 | 1301 | Date checkTime = model.getCheckTime(); |
| 1302 | 1302 | map.put("checkTimeStr", DateUtil.getyyyy_MM_dd(checkTime)); |
| 1303 | 1303 | map.put("checkMonthStr", DateUtil.getBabyMonthAge(model.getBirth(), checkTime)); |
| 1304 | + //秦皇岛需求 | |
| 1305 | + if("216".equals(hospitalId)){ | |
| 1306 | + map.put("checkMonthStr",model.getMonthAge()); | |
| 1307 | + } | |
| 1304 | 1308 | map.put("checkDoctorStr", usersMapper.getUsers(Integer.parseInt(model.getCheckDoctor())).getName()); |
| 1305 | 1309 | add(map); |
| 1306 | 1310 | } |