Commit ab315fe854aacc95e874a0c47c40733094392146
1 parent
84471e7ff4
Exists in
master
and in
6 other branches
更新
Showing 1 changed file with 3 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
View file @
ab315fe
| ... | ... | @@ -247,10 +247,10 @@ |
| 247 | 247 | } |
| 248 | 248 | ArrayList<String> arrayList = new ArrayList<>(); |
| 249 | 249 | if (StringUtils.isNotEmpty(settleStatus)) { |
| 250 | - List<HealthChargeModel> models = mongoTemplate.find(Query.query(Criteria.where("status").is(settleStatus).and("healthType").is("5")), HealthChargeModel.class); | |
| 250 | + List<HealthChargeModel> models = mongoTemplate.find(Query.query(Criteria.where("status").is(Integer.parseInt(settleStatus)).and("healthType").is(5)), HealthChargeModel.class); | |
| 251 | 251 | if (CollectionUtils.isNotEmpty(models)) { |
| 252 | 252 | for (HealthChargeModel model : models) { |
| 253 | - arrayList.add(model.getId()); | |
| 253 | + arrayList.add(model.getBabyNutritionId()); | |
| 254 | 254 | } |
| 255 | 255 | } |
| 256 | 256 | } |
| ... | ... | @@ -272,7 +272,7 @@ |
| 272 | 272 | for (BabyNutritionModel model : models) { |
| 273 | 273 | Integer currentSettleStatus = getSettleStatus(model); |
| 274 | 274 | |
| 275 | - // 组织数据格式 | |
| 275 | + // 组织数据格式 Integer currentSettleStatus = getSettleStatus(model); | |
| 276 | 276 | Map mapData = getMapData(model, currentSettleStatus); |
| 277 | 277 | list.add(mapData); |
| 278 | 278 | } |