diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java index 5689f54..790fe98 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java @@ -38,14 +38,14 @@ public class BabyNutritionQuery extends BaseQuery implements IConvertToNativeQue private String interpretDoctorId; - private String status; + private List ids; - public String getStatus() { - return status; + public List getIds() { + return ids; } - public void setStatus(String status) { - this.status = status; + public void setIds(List ids) { + this.ids = ids; } @Override @@ -76,8 +76,8 @@ public class BabyNutritionQuery extends BaseQuery implements IConvertToNativeQue condition = condition.and("doctorId", doctorId, MongoOper.IS); } - if (null != status) { - condition = condition.and("status", status, MongoOper.IS); + if (CollectionUtils.isNotEmpty(ids)) { + condition = condition.and("id", ids, MongoOper.IN); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java index 41cd8c6..f62287b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java @@ -171,7 +171,7 @@ public class HealthChargeQuery extends BaseQuery implements IConvertToNativeQuer } if (CollectionUtils.isNotEmpty(ids)) { - condition = condition.and("id", ids, MongoOper.IN); + condition = condition.and("babyForeignId", ids, MongoOper.IN); } if (CollectionUtils.isNotEmpty(hospitalIds)){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java index c397530..374a5da 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.BabyNutritionFacade; import com.lyms.platform.operate.web.request.BabyNutritionRequest; import com.lyms.platform.operate.web.request.BabyNutritionSettleRequest; @@ -146,6 +147,7 @@ public class BabyNutritionController extends BaseController { @TokenRequired public BaseResponse unSettleList(@Valid @RequestBody BabyNutritionSettleRequest request, HttpServletRequest httpServletRequest) { + getStartTimeAndEndTime(request); return babyNutritionFacade.unSettleList(request, getUserId(httpServletRequest)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index d9fe42e..ecf8d83 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -245,8 +245,17 @@ public class BabyNutritionFacade { if (StringUtils.isNotEmpty(interpretDoctorId)) { babyQuery.setInterpretDoctorId(interpretDoctorId); } + ArrayList arrayList = new ArrayList<>(); if (StringUtils.isNotEmpty(settleStatus)) { - babyQuery.setStatus(settleStatus); + List models = mongoTemplate.find(Query.query(Criteria.where("status").is(settleStatus).and("healthType").is("5")), HealthChargeModel.class); + if (CollectionUtils.isNotEmpty(models)) { + for (HealthChargeModel model : models) { + arrayList.add(model.getId()); + } + } + } + if (arrayList.size() > 0) { + babyQuery.setIds(arrayList); } if (StringUtils.isNotEmpty(recordTime)) { @@ -262,17 +271,10 @@ public class BabyNutritionFacade { if (CollectionUtils.isNotEmpty(models)) { for (BabyNutritionModel model : models) { Integer currentSettleStatus = getSettleStatus(model); - if (settleStatus != null) { - if (currentSettleStatus != null && (currentSettleStatus == Integer.parseInt(settleStatus))) { - // 组织数据格式 - Map mapData = getMapData(model, currentSettleStatus); - list.add(mapData); - } - } else { - // 组织数据格式 - Map mapData = getMapData(model, currentSettleStatus); - list.add(mapData); - } + + // 组织数据格式 + Map mapData = getMapData(model, currentSettleStatus); + list.add(mapData); } } @@ -1051,6 +1053,7 @@ public class BabyNutritionFacade { private List getBabyModels(String findNo, String babyForeignId) { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setQueryNo(findNo); + babyQuery.setMphone(findNo); babyQuery.setYn(YnEnums.YES.getId()); if (babyForeignId != null) { babyQuery.setId(babyForeignId);