jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c5ea163a7b16ff2a8b74e8269cf28dd4ac1938c2

Authored by dqcer
1 parent 8d6924062f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

健康统计-添加儿童膳食

Showing 3 changed files with 96 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java View file @ c5ea163
... ... @@ -141,9 +141,7 @@
141 141 @TokenRequired
142 142 public BaseResponse unSettleList(@Valid @RequestBody BabyNutritionSettleRequest request,
143 143 HttpServletRequest httpServletRequest) {
144   - // TODO: 2019/5/27
145   - return null;
146   - //return babyNutritionFacade.unSettleList(request, getUserId(httpServletRequest));
  144 + return babyNutritionFacade.unSettleList(request, getUserId(httpServletRequest));
147 145 }
148 146  
149 147 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ c5ea163
... ... @@ -11,6 +11,7 @@
11 11 import com.lyms.platform.common.utils.*;
12 12 import com.lyms.platform.common.utils.StringUtils;
13 13 import com.lyms.platform.operate.web.request.BabyNutritionRequest;
  14 +import com.lyms.platform.operate.web.request.BabyNutritionSettleRequest;
14 15 import com.lyms.platform.operate.web.result.*;
15 16 import com.lyms.platform.operate.web.service.PatientWeightService;
16 17  
... ... @@ -1002,5 +1003,34 @@
1002 1003 }
1003 1004  
1004 1005  
  1006 + /**
  1007 + * 未结算列表
  1008 + *
  1009 + * @param request
  1010 + * @param userId
  1011 + * @return
  1012 + */
  1013 + public BaseResponse unSettleList(BabyNutritionSettleRequest request, Integer userId) {
  1014 + HealthChargeQuery healthChargeQuery = new HealthChargeQuery();
  1015 + healthChargeQuery.setPage(request.getPage());
  1016 + healthChargeQuery.setLimit(request.getLimit());
  1017 + healthChargeQuery.setNeed("true");
  1018 + healthChargeQuery.setHealthType(4);
  1019 + healthChargeQuery.setYn(YnEnums.YES.getId());
  1020 + healthChargeQuery.setHospitalId(request.getHospitalId());
  1021 + healthChargeQuery.setStatus(1);
  1022 + // TODO: 2019/5/27 时间默认值未指定
  1023 + healthChargeQuery.setCreatedEnd(request.getStartTime());
  1024 + healthChargeQuery.setCreatedEnd(request.getEndTime());
  1025 + List<HealthChargeModel> list = healthChargeService.queryHealthChargeList(healthChargeQuery);
  1026 + if (CollectionUtils.isNotEmpty(list)){
  1027 + for (HealthChargeModel model: list){
  1028 + // TODO: 2019/5/27 根据babyid 获取母亲id 儿童姓名进行筛选
  1029 + }
  1030 + }
  1031 +
  1032 +
  1033 + return null;
  1034 + }
1005 1035 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSettleRequest.java View file @ c5ea163
... ... @@ -2,11 +2,76 @@
2 2  
3 3 import com.lyms.platform.common.dao.BaseQuery;
4 4  
  5 +import java.util.Date;
  6 +
5 7 /**
6 8 * 结算请求的参数类
7 9 */
8 10 public class BabyNutritionSettleRequest extends BaseQuery {
9 11  
  12 + /**
  13 + * 查询号 姓名/证件号/联系方式
  14 + */
  15 + private String number;
10 16  
  17 + /**
  18 + * 报表解读人
  19 + */
  20 + private String interpretDoctorId;
  21 +
  22 + /**
  23 + * 开始时间
  24 + */
  25 + private Date startTime;
  26 +
  27 + /**
  28 + * 结束时间
  29 + */
  30 + private Date endTime;
  31 +
  32 + /**
  33 + * 医院id
  34 + */
  35 + private String hospitalId;
  36 +
  37 + public String getHospitalId() {
  38 + return hospitalId;
  39 + }
  40 +
  41 + public void setHospitalId(String hospitalId) {
  42 + this.hospitalId = hospitalId;
  43 + }
  44 +
  45 + public String getNumber() {
  46 + return number;
  47 + }
  48 +
  49 + public void setNumber(String number) {
  50 + this.number = number;
  51 + }
  52 +
  53 + public String getInterpretDoctorId() {
  54 + return interpretDoctorId;
  55 + }
  56 +
  57 + public void setInterpretDoctorId(String interpretDoctorId) {
  58 + this.interpretDoctorId = interpretDoctorId;
  59 + }
  60 +
  61 + public Date getStartTime() {
  62 + return startTime;
  63 + }
  64 +
  65 + public void setStartTime(Date startTime) {
  66 + this.startTime = startTime;
  67 + }
  68 +
  69 + public Date getEndTime() {
  70 + return endTime;
  71 + }
  72 +
  73 + public void setEndTime(Date endTime) {
  74 + this.endTime = endTime;
  75 + }
11 76 }