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 86913c3..5d64f5e 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 @@ -141,9 +141,7 @@ public class BabyNutritionController extends BaseController { @TokenRequired public BaseResponse unSettleList(@Valid @RequestBody BabyNutritionSettleRequest request, HttpServletRequest httpServletRequest) { - // TODO: 2019/5/27 - return null; - //return babyNutritionFacade.unSettleList(request, getUserId(httpServletRequest)); + return babyNutritionFacade.unSettleList(request, getUserId(httpServletRequest)); } } \ No newline at end of file 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 2578a65..c46d661 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 @@ -11,6 +11,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.BabyNutritionRequest; +import com.lyms.platform.operate.web.request.BabyNutritionSettleRequest; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.PatientWeightService; @@ -1002,4 +1003,33 @@ public class BabyNutritionFacade { } + /** + * 未结算列表 + * + * @param request + * @param userId + * @return + */ + public BaseResponse unSettleList(BabyNutritionSettleRequest request, Integer userId) { + HealthChargeQuery healthChargeQuery = new HealthChargeQuery(); + healthChargeQuery.setPage(request.getPage()); + healthChargeQuery.setLimit(request.getLimit()); + healthChargeQuery.setNeed("true"); + healthChargeQuery.setHealthType(4); + healthChargeQuery.setYn(YnEnums.YES.getId()); + healthChargeQuery.setHospitalId(request.getHospitalId()); + healthChargeQuery.setStatus(1); + // TODO: 2019/5/27 时间默认值未指定 + healthChargeQuery.setCreatedEnd(request.getStartTime()); + healthChargeQuery.setCreatedEnd(request.getEndTime()); + List list = healthChargeService.queryHealthChargeList(healthChargeQuery); + if (CollectionUtils.isNotEmpty(list)){ + for (HealthChargeModel model: list){ + // TODO: 2019/5/27 根据babyid 获取母亲id 儿童姓名进行筛选 + } + } + + + return null; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSettleRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSettleRequest.java index 6db4bd4..dbb32ba 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSettleRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSettleRequest.java @@ -2,10 +2,75 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.dao.BaseQuery; +import java.util.Date; + /** * 结算请求的参数类 */ public class BabyNutritionSettleRequest extends BaseQuery { + /** + * 查询号 姓名/证件号/联系方式 + */ + private String number; + + /** + * 报表解读人 + */ + private String interpretDoctorId; + + /** + * 开始时间 + */ + private Date startTime; + + /** + * 结束时间 + */ + private Date endTime; + + /** + * 医院id + */ + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getNumber() { + return number; + } + + public void setNumber(String number) { + this.number = number; + } + + public String getInterpretDoctorId() { + return interpretDoctorId; + } + + public void setInterpretDoctorId(String interpretDoctorId) { + this.interpretDoctorId = interpretDoctorId; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + public void setEndTime(Date endTime) { + this.endTime = endTime; + } }