jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8d6924062f83c846e0328d6a4f81fd5ed6c47e77

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

健康统计-添加儿童膳食

Showing 17 changed files with 266 additions and 46 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java View file @ 8d69240
... ... @@ -121,6 +121,19 @@
121 121  
122 122 private String remark;
123 123  
  124 + /**
  125 + * 解读医生
  126 + */
  127 + private String interpretDoctorId;
  128 +
  129 + public String getInterpretDoctorId() {
  130 + return interpretDoctorId;
  131 + }
  132 +
  133 + public void setInterpretDoctorId(String interpretDoctorId) {
  134 + this.interpretDoctorId = interpretDoctorId;
  135 + }
  136 +
124 137 public List<String> getFoods() {
125 138 return foods;
126 139 }
platform-dal/src/main/java/com/lyms/platform/pojo/HealthChargeModel.java View file @ 8d69240
... ... @@ -27,6 +27,11 @@
27 27 //建档id或者临时档案id
28 28 private String foreignId;
29 29  
  30 + /**
  31 + * 儿童 - 建档id或者临时档案id
  32 + */
  33 + private String babyForeignId;
  34 +
30 35 //打印报告等级
31 36 private Integer type;
32 37  
... ... @@ -153,6 +158,14 @@
153 158  
154 159 public void setSource(Integer source) {
155 160 this.source = source;
  161 + }
  162 +
  163 + public String getBabyForeignId() {
  164 + return babyForeignId;
  165 + }
  166 +
  167 + public void setBabyForeignId(String babyForeignId) {
  168 + this.babyForeignId = babyForeignId;
156 169 }
157 170 }
platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java View file @ 8d69240
... ... @@ -36,7 +36,9 @@
36 36 private Date nutritiTimeStart;
37 37 private Date nutritiTimeEnd;
38 38  
  39 + private String interpretDoctorId;
39 40  
  41 +
40 42 @Override
41 43 public MongoQuery convertToQuery() {
42 44 MongoCondition condition = MongoCondition.newInstance();
43 45  
... ... @@ -56,9 +58,16 @@
56 58 condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
57 59 }
58 60  
  61 + if (null != interpretDoctorId) {
  62 + condition = condition.and("interpretDoctorId", interpretDoctorId, MongoOper.IS);
  63 + }
  64 +
  65 +
59 66 if (null != doctorId) {
60 67 condition = condition.and("doctorId", doctorId, MongoOper.IS);
61 68 }
  69 +
  70 +
62 71 Criteria c = null;
63 72  
64 73 if(null != createdStart && createdEnd != null){
... ... @@ -82,6 +91,14 @@
82 91 return condition.toMongoQuery();
83 92 }
84 93  
  94 +
  95 + public String getInterpretDoctorId() {
  96 + return interpretDoctorId;
  97 + }
  98 +
  99 + public void setInterpretDoctorId(String interpretDoctorId) {
  100 + this.interpretDoctorId = interpretDoctorId;
  101 + }
85 102  
86 103 public Date getCreatedEnd() {
87 104 return createdEnd;
platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java View file @ 8d69240
... ... @@ -30,6 +30,11 @@
30 30 //建档id或者临时档案id
31 31 private String foreignId;
32 32  
  33 + /**
  34 + * 儿童 - 建档id或者临时档案id
  35 + */
  36 + private String babyForeignId;
  37 +
33 38 //打印报告等级
34 39 private Integer type;
35 40  
... ... @@ -52,6 +57,14 @@
52 57 */
53 58 private String doctorId;
54 59  
  60 + public String getBabyForeignId() {
  61 + return babyForeignId;
  62 + }
  63 +
  64 + public void setBabyForeignId(String babyForeignId) {
  65 + this.babyForeignId = babyForeignId;
  66 + }
  67 +
55 68 public String getDoctorId() {
56 69 return doctorId;
57 70 }
... ... @@ -103,6 +116,9 @@
103 116  
104 117 if (null != doctorId) {
105 118 condition = condition.and("doctorId", doctorId, MongoOper.IS);
  119 + }
  120 + if (null != babyForeignId) {
  121 + condition = condition.and("babyForeignId", babyForeignId, MongoOper.IS);
106 122 }
107 123  
108 124 Criteria c = null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java View file @ 8d69240
... ... @@ -7,6 +7,7 @@
7 7 import com.lyms.platform.common.result.BaseResponse;
8 8 import com.lyms.platform.operate.web.facade.BabyNutritionFacade;
9 9 import com.lyms.platform.operate.web.request.BabyNutritionRequest;
  10 +import com.lyms.platform.operate.web.request.BabyNutritionSettleRequest;
10 11 import org.springframework.beans.factory.annotation.Autowired;
11 12 import org.springframework.stereotype.Controller;
12 13 import org.springframework.web.bind.annotation.*;
13 14  
... ... @@ -62,8 +63,10 @@
62 63 @RequestParam(required = false) String vcCardNo,
63 64 @RequestParam(required = false) String babyName,
64 65 @RequestParam(required = false) String recordTime,
  66 + @RequestParam(required = false) String interpretDoctorId,
  67 + @RequestParam(required = false) String settleStatus,
65 68 HttpServletRequest request) {
66   - return babyNutritionFacade.queryBabyNutritionList(page, limit, queryNo, vcCardNo, babyName, getUserId(request), recordTime);
  69 + return babyNutritionFacade.queryBabyNutritionList(page, limit, queryNo, vcCardNo, babyName, getUserId(request), recordTime, interpretDoctorId, settleStatus);
67 70 }
68 71  
69 72  
... ... @@ -125,6 +128,22 @@
125 128 @RequestMapping(value = "/queryBabyDietReport/{id}", method = RequestMethod.GET)
126 129 public BaseObjectResponse queryBabyDietReport(@PathVariable("id") String id, HttpServletRequest request) {
127 130 return null;
  131 + }
  132 +
  133 + /**
  134 + * 未结算列表
  135 + *
  136 + * @param request
  137 + * @return
  138 + */
  139 + @RequestMapping(method = RequestMethod.POST, value = "/unSettle/list")
  140 + @ResponseBody
  141 + @TokenRequired
  142 + public BaseResponse unSettleList(@Valid @RequestBody BabyNutritionSettleRequest request,
  143 + HttpServletRequest httpServletRequest) {
  144 + // TODO: 2019/5/27
  145 + return null;
  146 + //return babyNutritionFacade.unSettleList(request, getUserId(httpServletRequest));
128 147 }
129 148  
130 149 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ 8d69240
... ... @@ -15,6 +15,7 @@
15 15 import com.lyms.platform.operate.web.service.PatientWeightService;
16 16  
17 17 import com.lyms.platform.permission.model.Organization;
  18 +import com.lyms.platform.permission.model.Users;
18 19 import com.lyms.platform.permission.service.MeasureDataInfoService;
19 20 import com.lyms.platform.permission.service.OrganizationService;
20 21 import com.lyms.platform.permission.service.UsersService;
... ... @@ -73,6 +74,15 @@
73 74 @Autowired
74 75 private PatientWeightService patientWeightService;
75 76  
  77 + @Autowired
  78 + private HealthChargeFacade healthChargeFacade;
  79 +
  80 + @Autowired
  81 + private UsersService usersService;
  82 +
  83 + @Autowired
  84 + private HealthChargeService healthChargeService;
  85 +
76 86 public BaseObjectResponse queryBabyNutritionRecord(String babyId) {
77 87 Map<String, Object> resMap = new HashMap<>();
78 88 BabyBasicResult base = new BabyBasicResult();
... ... @@ -188,7 +198,21 @@
188 198 return results;
189 199 }
190 200  
191   - public BaseResponse queryBabyNutritionList(Integer page, Integer limit, String queryNo, String vcCardNo, String babyName,Integer userId,String recordTime) {
  201 + /**
  202 + *
  203 + * @param page
  204 + * @param limit
  205 + * @param queryNo
  206 + * @param vcCardNo
  207 + * @param babyName
  208 + * @param userId
  209 + * @param recordTime
  210 + * @param interpretDoctorId 报告解读人
  211 + * @param settleStatus 结算状态
  212 + * @return
  213 + */
  214 + public BaseResponse queryBabyNutritionList(Integer page, Integer limit, String queryNo, String vcCardNo,
  215 + String babyName,Integer userId,String recordTime, String interpretDoctorId, String settleStatus) {
192 216 String hospitalId = autoMatchFacade.getHospitalId(userId);
193 217 List<Map> list = new ArrayList<>();
194 218 List<String> babyIds = new ArrayList<>();
195 219  
... ... @@ -224,7 +248,9 @@
224 248 babyQuery.setBabyIds(babyIds);
225 249 babyQuery.setLimit(limit);
226 250 babyQuery.setPage(page);
  251 + babyQuery.setInterpretDoctorId(interpretDoctorId);
227 252  
  253 +
228 254 if (StringUtils.isNotEmpty(recordTime)) {
229 255 String[] dates = recordTime.split(" - ");
230 256 babyQuery.setNutritiTimeStart(DateUtil.parseYMD(dates[0]));
231 257  
232 258  
233 259  
234 260  
235 261  
236 262  
237 263  
... ... @@ -239,42 +265,59 @@
239 265 {
240 266 for (BabyNutritionModel model : models)
241 267 {
242   - Map map = new HashMap();
  268 + Integer currentSettleStatus = getSettleStatus(model);
  269 + if (settleStatus != null){
  270 + if (currentSettleStatus != null && (currentSettleStatus == Integer.parseInt(settleStatus))){
  271 + Map map = new HashMap();
  272 + map.put("id",model.getId());
  273 + map.put("babyId",model.getBabyId());
243 274  
244   - map.put("id",model.getId());
245   - map.put("babyId",model.getBabyId());
  275 + BabyModel baby = babyBookbuildingService.queryBabyBuildById(model.getBabyId());
  276 + map.put("babyName",baby.getName());
  277 + map.put("babySex", SexEnum.getTextById(baby.getSex()));
  278 + map.put("monthAge",StringUtils.emptyDeal(DateUtil.getBabyMonthAge(baby.getBirth(), new Date())));
  279 + map.put("motherName", baby.getMname());
  280 + map.put("phone", baby.getMphone());
  281 + map.put("vcCardNo", baby.getVcCardNo());
246 282  
247   - BabyModel baby = babyBookbuildingService.queryBabyBuildById(model.getBabyId());
248   - map.put("babyName",baby.getName());
249   - map.put("babySex", SexEnum.getTextById(baby.getSex()));
250   - map.put("monthAge",StringUtils.emptyDeal(DateUtil.getBabyMonthAge(baby.getBirth(), new Date())));
251   - map.put("motherName", baby.getMname());
252   - map.put("phone", baby.getMphone());
253   - map.put("vcCardNo", baby.getVcCardNo());
  283 + String highRiskInfos = basicConfigFacade.queryBaseInfoByStr(baby.getHighRiskInfo());
  284 + map.put("highRiskInfos",highRiskInfos);
254 285  
255   - String highRiskInfos = basicConfigFacade.queryBaseInfoByStr(baby.getHighRiskInfo());
256   - map.put("highRiskInfos",highRiskInfos);
257   -
258   - String diagnose = "";
259   - if (StringUtils.isNotEmpty(baby.getPid())) {
260   - List diagList = babyCheckFacade.getBabyLastDiagnose(baby.getPid());
261   - if (CollectionUtils.isNotEmpty(diagList)) {
262   - for (Object obj : diagList) {
263   - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String) obj);
264   - if (basicConfig != null) {
265   - diagnose += basicConfig.getName() + " ";
  286 + String diagnose = "";
  287 + if (StringUtils.isNotEmpty(baby.getPid())) {
  288 + List diagList = babyCheckFacade.getBabyLastDiagnose(baby.getPid());
  289 + if (CollectionUtils.isNotEmpty(diagList)) {
  290 + for (Object obj : diagList) {
  291 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String) obj);
  292 + if (basicConfig != null) {
  293 + diagnose += basicConfig.getName() + " ";
  294 + }
  295 + }
266 296 }
267 297 }
268   - }
269   - }
270 298  
271   - map.put("diagnose", StringUtils.emptyDeal(diagnose));
  299 + map.put("diagnose", StringUtils.emptyDeal(diagnose));
272 300  
273   - map.put("weight", model.getWeight());
274   - map.put("height", model.getHeight());
275   - map.put("recordTime", DateUtil.getyyyy_MM_dd(model.getNutritiTime()));
  301 + map.put("weight", model.getWeight());
  302 + map.put("height", model.getHeight());
  303 + map.put("recordTime", DateUtil.getyyyy_MM_dd(model.getNutritiTime()));
276 304  
277   - list.add(map);
  305 + // 新增报表解读人和结算状态
  306 + String currInterpretDoctorId = model.getInterpretDoctorId();
  307 + String interpretDoctorName = "";
  308 + if (StringUtils.isNotEmpty(currInterpretDoctorId)){
  309 + Users users = usersService.getUsers(Integer.parseInt(currInterpretDoctorId));
  310 + if (users != null){
  311 + interpretDoctorName = users.getName();
  312 + }
  313 + }
  314 + String settleStatusName = currentSettleStatus == 1 ? "未结算" : "已结算";
  315 + map.put("interpretDoctorName", interpretDoctorName);
  316 + map.put("settleStatusName", settleStatusName);
  317 +
  318 + list.add(map);
  319 + }
  320 + }
278 321 }
279 322 }
280 323  
... ... @@ -287,6 +330,23 @@
287 330 return objectResponse;
288 331 }
289 332  
  333 + /**
  334 + * 获取结算状态
  335 + *
  336 + * @param model
  337 + * @return 1-未结算 2-已结算 null-异常
  338 + */
  339 + private Integer getSettleStatus(BabyNutritionModel model) {
  340 + HealthChargeQuery healthChargeQuery = new HealthChargeQuery();
  341 + healthChargeQuery.setBabyForeignId(model.getId());
  342 + List<HealthChargeModel> healthChargeModelList = healthChargeService.queryHealthChargeList(healthChargeQuery);
  343 + if (CollectionUtils.isNotEmpty(healthChargeModelList)){
  344 + HealthChargeModel healthChargeModel = healthChargeModelList.get(0);
  345 + return healthChargeModel.getStatus();
  346 + }
  347 + return null;
  348 + }
  349 +
290 350 public BaseObjectResponse queryBabyNutritionReport(String id,Integer userId) {
291 351  
292 352  
293 353  
... ... @@ -618,8 +678,8 @@
618 678  
619 679 data.put("wlysitems", wlysitems);
620 680  
  681 + healthChargeFacade.addHealthCharge(hospitalId, 4, model.getId(), null, null, userId, model.getInterpretDoctorId(), true);
621 682 }
622   -
623 683 BaseObjectResponse objectResponse = new BaseObjectResponse();
624 684 objectResponse.setData(data);
625 685 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java View file @ 8d69240
... ... @@ -53,13 +53,37 @@
53 53 @Autowired
54 54 private UsersService usersService;
55 55  
56   - public BaseResponse addHealthCharge(String hospitalId,Integer healthType,String foreignId,Integer type,Integer source, Integer userId, String doctorId){
  56 + /**
  57 + * 新增字段：报表解读人 孕妇/儿童
  58 + *
  59 + * @param hospitalId 医院id
  60 + * @param healthType 打印类型 1体重 2 血糖 3 血压 4妊高症 4-儿童膳食
  61 + * @param foreignId 档案id （院内建档或者临时档案id）孕妇/儿童
  62 + * @param type 打印报告类别 1普通报告 2高危报告（暂时不用）
  63 + * @param source 档案来源类型 1院内建档 2零时建档 （暂时不用）
  64 + * @param userId 当前登陆用户id
  65 + * @param doctorId 报表解读人id
  66 + * @param isBaby 是否为儿童
  67 + * @return
  68 + */
  69 + public BaseResponse addHealthCharge(String hospitalId,
  70 + Integer healthType,
  71 + String foreignId,
  72 + Integer type,
  73 + Integer source,
  74 + Integer userId,
  75 + String doctorId,
  76 + boolean isBaby){
57 77 HealthChargeRequest request = new HealthChargeRequest();
58 78 request.setHospitalId(hospitalId);
59 79 request.setHealthType(healthType);
60   - request.setForeignId(foreignId);
61   - request.setType(type);
62   - request.setSource(source);
  80 + if (isBaby){
  81 + request.setBabyForeignId(foreignId);
  82 + } else {
  83 + request.setForeignId(foreignId);
  84 + request.setType(type);
  85 + request.setSource(source);
  86 + }
63 87 request.setDoctorId(doctorId);
64 88 return addHealthCharge(request, userId);
65 89 }
66 90  
... ... @@ -95,9 +119,16 @@
95 119 public BaseResponse addHealthCharge(HealthChargeRequest request, Integer userId) {
96 120  
97 121 HealthChargeQuery healthChargeQuery = new HealthChargeQuery();
98   - healthChargeQuery.setForeignId(request.getForeignId());
  122 + String babyForeignId = request.getBabyForeignId();
  123 + if (StringUtils.isNotEmpty(babyForeignId)){
  124 + // 儿童
  125 + healthChargeQuery.setBabyForeignId(babyForeignId);
  126 + }else {
  127 + // 孕妇
  128 + healthChargeQuery.setForeignId(request.getForeignId());
  129 + healthChargeQuery.setSource(request.getSource());
  130 + }
99 131 healthChargeQuery.setHealthType(request.getHealthType());
100   - healthChargeQuery.setSource(request.getSource());
101 132 List<HealthChargeModel> list = healthChargeService.queryHealthChargeList(healthChargeQuery);
102 133  
103 134 boolean isSave = false;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java View file @ 8d69240
... ... @@ -128,8 +128,19 @@
128 128 private List<String> foods;
129 129  
130 130 private String remark;
  131 + /**
  132 + * 解读医生
  133 + */
  134 + private String interpretDoctorId;
131 135  
  136 + public String getInterpretDoctorId() {
  137 + return interpretDoctorId;
  138 + }
132 139  
  140 + public void setInterpretDoctorId(String interpretDoctorId) {
  141 + this.interpretDoctorId = interpretDoctorId;
  142 + }
  143 +
133 144 @Override
134 145 public BabyNutritionModel convertToDataModel() {
135 146 BabyNutritionModel model = new BabyNutritionModel();
... ... @@ -177,6 +188,7 @@
177 188 model.setFruits(fruits);
178 189 model.setFoods(foods);
179 190 model.setRemark(remark);
  191 + model.setInterpretDoctorId(interpretDoctorId);
180 192 return model;
181 193 }
182 194  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSettleRequest.java View file @ 8d69240
  1 +package com.lyms.platform.operate.web.request;
  2 +
  3 +import com.lyms.platform.common.dao.BaseQuery;
  4 +
  5 +/**
  6 + * 结算请求的参数类
  7 + */
  8 +public class BabyNutritionSettleRequest extends BaseQuery {
  9 +
  10 +
  11 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HealthChargeRequest.java View file @ 8d69240
... ... @@ -23,6 +23,11 @@
23 23 //建档id或者临时档案id
24 24 private String foreignId;
25 25  
  26 + /**
  27 + * 儿童 - 建档id或者临时档案id
  28 + */
  29 + private String babyForeignId;
  30 +
26 31 //打印报告类别 1普通报告 2高危报告
27 32 private Integer type;
28 33  
29 34  
... ... @@ -45,7 +50,16 @@
45 50 model.setType(type);
46 51 model.setSource(source);
47 52 model.setDoctorId(doctorId);
  53 + model.setBabyForeignId(babyForeignId);
48 54 return model;
  55 + }
  56 +
  57 + public String getBabyForeignId() {
  58 + return babyForeignId;
  59 + }
  60 +
  61 + public void setBabyForeignId(String babyForeignId) {
  62 + this.babyForeignId = babyForeignId;
49 63 }
50 64  
51 65 public String getDoctorId() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java View file @ 8d69240
... ... @@ -123,6 +123,19 @@
123 123  
124 124 private String remark;
125 125  
  126 + /**
  127 + * 解读医生
  128 + */
  129 + private String interpretDoctorId;
  130 +
  131 + public String getInterpretDoctorId() {
  132 + return interpretDoctorId;
  133 + }
  134 +
  135 + public void setInterpretDoctorId(String interpretDoctorId) {
  136 + this.interpretDoctorId = interpretDoctorId;
  137 + }
  138 +
126 139 public BabyNutritionResult convertToResult(BabyNutritionModel model) {
127 140 setId(model.getId());
128 141 setHospitalId(model.getHospitalId());
... ... @@ -171,6 +184,7 @@
171 184 setFruits(model.getFruits());
172 185 setFoods(model.getFoods());
173 186 setRemark(model.getRemark());
  187 + setInterpretDoctorId(model.getInterpretDoctorId());
174 188 return this;
175 189 }
176 190  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ 8d69240
... ... @@ -804,7 +804,7 @@
804 804 }
805 805 }
806 806  
807   - healthChargeFacade.addHealthCharge(bloodPressure.getHospitalId(), 3, bloodPressure.getParentId(), 1, 1, userId, doctorId);
  807 + healthChargeFacade.addHealthCharge(bloodPressure.getHospitalId(), 3, bloodPressure.getParentId(), 1, 1, userId, doctorId, false);
808 808 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas);
809 809 } else {
810 810 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("失败").setData("请检查数据是否填写完整！");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ 8d69240
... ... @@ -1271,7 +1271,7 @@
1271 1271 if (bloodSugar != null){
1272 1272 doctorId = bloodSugar.getDoctorId();
1273 1273 }
1274   - healthChargeFacade.addHealthCharge(hospitalId, 2, patientId, 1, 1, userId, doctorId);
  1274 + healthChargeFacade.addHealthCharge(hospitalId, 2, patientId, 1, 1, userId, doctorId, false);
1275 1275  
1276 1276 resp.setData(data);
1277 1277 resp.setErrorcode(ResponseCode.SUCCESS.getCode());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 8d69240
... ... @@ -670,7 +670,7 @@
670 670 List<Map<String, Object>> dayWeights2 = patientWeight.getDayWeights2();
671 671 String doctorId = getDoctorId(dayWeights2);
672 672  
673   - healthChargeFacade.addHealthCharge(hospitalId, 1, patientWeight.getPatientId(), 1, 1, userId, doctorId);
  673 + healthChargeFacade.addHealthCharge(hospitalId, 1, patientWeight.getPatientId(), 1, 1, userId, doctorId, false);
674 674 return RespBuilder.buildSuccess(map);
675 675 }
676 676 return RespBuilder.buildSuccess();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java View file @ 8d69240
... ... @@ -400,7 +400,7 @@
400 400 }
401 401 }
402 402 }
403   - healthChargeFacade.addHealthCharge(hospitalId, 3, temporaryBloo.getTemporaryUserId(), 1, 2, userId, doctorId);
  403 + healthChargeFacade.addHealthCharge(hospitalId, 3, temporaryBloo.getTemporaryUserId(), 1, 2, userId, doctorId, false);
404 404 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas);
405 405 } else {
406 406 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("失败").setData("请检查数据是否填写完整！");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java View file @ 8d69240
... ... @@ -409,7 +409,7 @@
409 409 doctorId = temporaryBloodSugar.getDoctorId();
410 410 }
411 411  
412   - healthChargeFacade.addHealthCharge(hospitalId, 2, id, 1, 2, userId, doctorId);
  412 + healthChargeFacade.addHealthCharge(hospitalId, 2, id, 1, 2, userId, doctorId, false);
413 413  
414 414 resp.setData(data);
415 415 resp.setErrorcode(ResponseCode.SUCCESS.getCode());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java View file @ 8d69240
... ... @@ -491,7 +491,7 @@
491 491 List<Map<String, Object>> dayWeights2 = temporaryWeight.getDayWeights2();
492 492 String doctorId = patientWeightService.getDoctorId(dayWeights2);
493 493  
494   - healthChargeFacade.addHealthCharge(hospitalId, 1, temporaryWeight.getTemporaryUserId(), 1, 2, userId, doctorId);
  494 + healthChargeFacade.addHealthCharge(hospitalId, 1, temporaryWeight.getTemporaryUserId(), 1, 2, userId, doctorId, false);
495 495 return RespBuilder.buildSuccess(map);
496 496 }
497 497 return RespBuilder.buildSuccess();
... ... @@ -837,7 +837,7 @@
837 837 List<Map<String, Object>> dayWeights2 = temporary.getDayWeights2();
838 838 String doctorId = patientWeightService.getDoctorId(dayWeights2);
839 839  
840   - healthChargeFacade.addHealthCharge(hospitalId, 1, temporary.getTemporaryUserId(), 2, 2, userId, doctorId);
  840 + healthChargeFacade.addHealthCharge(hospitalId, 1, temporary.getTemporaryUserId(), 2, 2, userId, doctorId, false);
841 841 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(this.getFirstOrNull(datas));
842 842 }
843 843