diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java index 7631d8e..3f5304b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java @@ -51,9 +51,18 @@ public class TemporaryBloodModel extends BaseModel { private String riskLevelId; + private String hospitalId; private Integer yn; + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public String getRiskLevelId() { return riskLevelId; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java index bd74e23..ac46cab 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java @@ -61,6 +61,16 @@ public class TemporaryBloodSugar extends BaseModel { private String riskLevelId; + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public String getRiskLevelId() { return riskLevelId; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java index 6630d24..95c455f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java @@ -53,6 +53,16 @@ public class TemporaryWeightModel extends BaseModel { private String doctorName; + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public String getDoctorName() { return doctorName; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java index 935ae87..5dd4a1b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.service.ITemporaryBloodService; @@ -9,6 +10,7 @@ import com.lyms.platform.pojo.TemporaryBloodModel; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -27,7 +29,7 @@ public class TemporaryBloodController extends BaseController { @TokenRequired @ResponseBody public BaseResponse addTemporaryBlood(@Valid @RequestBody TemporaryBloodModel temporaryBloodModel, HttpServletRequest request) { - return temporaryBloodService.addTemporaryBlood(temporaryBloodModel); + return temporaryBloodService.addTemporaryBlood(temporaryBloodModel, getUserId(request)); } @RequestMapping(value = "/update", method = RequestMethod.PUT) @@ -53,8 +55,8 @@ public class TemporaryBloodController extends BaseController { @RequestMapping(value = "/queryAll", method = RequestMethod.GET) @TokenRequired @ResponseBody - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { - return temporaryBloodService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit); + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, HttpServletRequest request) { + return temporaryBloodService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit, getUserId(request)); } @ResponseBody @@ -66,11 +68,16 @@ public class TemporaryBloodController extends BaseController { @ResponseBody @RequestMapping(value = "/presentation/{id}", method = RequestMethod.GET) - public BaseResponse getXyPresentation(@PathVariable String id) { + public BaseResponse getXyPresentation(@PathVariable String id, HttpServletRequest request) { if (StringUtils.isEmpty(id) || "null".equals(id)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id参数不能为空"); } - return temporaryBloodService.getXyPresentation(id); + return temporaryBloodService.getXyPresentation(id, getUserId(request)); } + protected Integer getUserId(HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + Assert.notNull(loginState, "未登录"); + return loginState.getId(); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java index 513bd81..cce43ba 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java @@ -8,6 +8,7 @@ import com.lyms.platform.operate.web.service.ITemporaryBloodSugarService; import com.lyms.platform.pojo.TemporaryBloodSugar; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -25,9 +26,9 @@ public class TemporaryBloodSugarController extends BaseController { @RequestMapping(value = "/addAndUpate", method = RequestMethod.POST) @TokenRequired @ResponseBody - public BaseResponse addTempraryBloodSugar(@Valid @RequestBody TemporaryBloodSugar bloodSugar) { + public BaseResponse addTempraryBloodSugar(@Valid @RequestBody TemporaryBloodSugar bloodSugar, HttpServletRequest request) { - return bloodSugarService.addAndUpdate(bloodSugar); + return bloodSugarService.addAndUpdate(bloodSugar, getUserId(request)); } @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @@ -49,11 +50,10 @@ public class TemporaryBloodSugarController extends BaseController { @RequestMapping(value = "/queryAll", method = RequestMethod.GET) @TokenRequired @ResponseBody - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { - return bloodSugarService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit); + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, HttpServletRequest request) { + return bloodSugarService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit, getUserId(request)); } - @ResponseBody @RequestMapping(value = "/{id}/{type}/{time}", method = RequestMethod.GET) @TokenRequired @@ -75,4 +75,10 @@ public class TemporaryBloodSugarController extends BaseController { LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); return bloodSugarService.getSysBloodSugarReport(id, loginState.getId()); } + + protected Integer getUserId(HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + Assert.notNull(loginState, "未登录"); + return loginState.getId(); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java index cb26ce0..1819f2a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java @@ -7,15 +7,15 @@ import java.util.Date; public interface ITemporaryBloodService extends IBaseService { - BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel); + BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel, Integer userId); BaseResponse deleteTemporaryBlood(String id); BaseResponse queryOne(String id); - BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit); + BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId); BaseResponse info(String id, Date startDate); - public BaseResponse getXyPresentation(String bloodId); + public BaseResponse getXyPresentation(String bloodId, Integer userId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java index fa6c361..f270f08 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java @@ -7,13 +7,13 @@ import java.util.Date; public interface ITemporaryBloodSugarService extends IBaseService { - BaseResponse addAndUpdate(TemporaryBloodSugar bloodSugar); + BaseResponse addAndUpdate(TemporaryBloodSugar bloodSugar, Integer id); BaseResponse deleteBloodSugar(String id); BaseResponse queryOne(String id); - BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit); + BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId); BaseResponse info(String parentId, Integer type, Date time); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java index 54c1870..f42e59e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java @@ -12,11 +12,15 @@ import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.HealthChargeFacade; +import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; import com.lyms.platform.operate.web.service.ITemporaryBloodService; import com.lyms.platform.operate.web.service.PatientWeightService; -import com.lyms.platform.operate.web.utils.LisHandleTask; import com.lyms.platform.operate.web.utils.ReportConfig; -import com.lyms.platform.pojo.*; +import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.pojo.TemporaryBloodModel; +import com.lyms.platform.pojo.XyPresentationModel; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; @@ -33,6 +37,8 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo @Autowired private MongoTemplate mongoTemplate; + @Autowired + private OrganizationGroupsFacade groupsFacade; @Autowired private ITemporaryBloodDao temporaryBloodDao; @@ -44,8 +50,14 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo @Autowired private BasicConfigService basicConfigService; + @Autowired + private HealthChargeFacade healthChargeFacade; + + @Autowired + private AutoMatchFacade autoMatchFacade; + @Override - public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel) { + public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel, Integer userId) { List models = mongoTemplate.findAll(TemporaryBloodModel.class); if (CollectionUtils.isNotEmpty(models)) { TemporaryBloodModel bloodModel1 = mongoTemplate.findOne(Query.query(Criteria.where("phone").is(bloodModel.getPhone())), TemporaryBloodModel.class); @@ -71,6 +83,8 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } } bloodModel.setRiskLevelId(JsonUtil.array2JsonString(riskLevelIdList)); + String hospitalId = autoMatchFacade.getHospitalId(userId); + bloodModel.setHospitalId(hospitalId); TemporaryBloodModel temporaryBloodModel = temporaryBloodDao.addTemporaryBlood(bloodModel); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId()); } else { @@ -160,10 +174,11 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } @Override - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) { boolean flag = false; - Criteria pCriteria = Criteria.where("yn").ne(0); - Criteria criteria = Criteria.where("yn").ne(0); + List hospital = groupsFacade.findGroupHospital(userId, false); + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); + Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key)); flag = true; @@ -275,10 +290,11 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } @Override - public BaseResponse getXyPresentation(String id) { + public BaseResponse getXyPresentation(String id, Integer userId) { //1.通过血压ID 查询到pnationId Map datas = new HashMap<>(); Map> series = new HashMap<>(); + String hospitalId = autoMatchFacade.getHospitalId(userId); //BloodPressure bloodPressure = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodId)), BloodPressure.class); TemporaryBloodModel bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodModel.class); //1.1回去bim值 String getBmi(String weight, String height); @@ -389,6 +405,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } datas.put("motion", motionList); } + healthChargeFacade.addHealthCharge(hospitalId, 3, id, 1, 1, userId); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas); } else { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("失败").setData("请检查数据是否填写完整！"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java index 9c8bed6..8b20894 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java @@ -12,6 +12,8 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.HealthChargeFacade; +import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; import com.lyms.platform.operate.web.service.ITemporaryBloodSugarService; import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.utils.ReportConfig; @@ -55,9 +57,13 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I private PatientWeightService patientWeightService; @Autowired private CommonService commonService; + @Autowired + private HealthChargeFacade healthChargeFacade; + @Autowired + private OrganizationGroupsFacade groupsFacade; @Override - public BaseResponse addAndUpdate(TemporaryBloodSugar bloodSugar) { + public BaseResponse addAndUpdate(TemporaryBloodSugar bloodSugar, Integer userId) { List bloodSugars = mongoTemplate.findAll(TemporaryBloodSugar.class); if (CollectionUtils.isNotEmpty(bloodSugars)) { TemporaryBloodSugar temporaryBloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("phone").is(bloodSugar.getPhone()).and("bloodSugarType").is(bloodSugar.getBloodSugarType())), TemporaryBloodSugar.class); @@ -79,6 +85,10 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I } bloodSugar.setRiskLevelId(JsonUtil.array2JsonString(riskLevelIdList)); + + String hospitalId = autoMatchFacade.getHospitalId(userId); + bloodSugar.setHospitalId(hospitalId); + TemporaryBloodSugar bloodSugar1 = temporaryBloodSugarDao.addTemporaryBloodSugar(bloodSugar); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(bloodSugar1.getId()); } @@ -158,10 +168,11 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I } @Override - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) { boolean flag = false; - Criteria pCriteria = Criteria.where("yn").ne(0); - Criteria criteria = Criteria.where("yn").ne(0); + List hospital = groupsFacade.findGroupHospital(userId, false); + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); + Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key)); flag = true; @@ -407,6 +418,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I resp.setData(data); resp.setErrorcode(ResponseCode.SUCCESS.getCode()); + healthChargeFacade.addHealthCharge(hospitalId, 2, id, 2, 1, userId); resp.setErrormsg("成功"); return resp; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java index c3a4284..e8adc80 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java @@ -13,6 +13,8 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ReflectionUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.HealthChargeFacade; +import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.service.TemporaryWeightService; import com.lyms.platform.operate.web.utils.CollectionUtils; @@ -62,6 +64,12 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo @Autowired private UsersService usersService; + @Autowired + private OrganizationGroupsFacade groupsFacade; + + @Autowired + private HealthChargeFacade healthChargeFacade; + @Override public BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId) { List weightModel1 = mongoTemplate.findAll(TemporaryWeightModel.class); @@ -85,6 +93,8 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo /* if (MapUtils.isNotEmpty(temporaryWeightModel.getDayWeights())) { dayWeights = temporaryWeightModel.getDayWeights(); }*/ + String hospitalId = autoMatchFacade.getHospitalId(userId); + weightModel.setHospitalId(hospitalId); dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), weightModel.getNowWeight()); weightModel.setDayWeights(dayWeights); weightModel.setBmi(patientWeightService.getBmi(weightModel.getBeforeWeight(), weightModel.getBeforeHeight())); @@ -106,6 +116,8 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo }*/ dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), weightModel.getNowWeight()); weightModel.setDayWeights(dayWeights); + String hospitalId = autoMatchFacade.getHospitalId(userId); + weightModel.setHospitalId(hospitalId); weightModel.setBmi(patientWeightService.getBmi(weightModel.getBeforeWeight(), weightModel.getBeforeHeight())); TemporaryWeightModel temporaryBloodModel = temporaryWeightDao.addTemporaryWeight(weightModel); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId()); @@ -179,8 +191,9 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo @Override public BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit, Integer userId) { boolean flag = false; - Criteria pCriteria = Criteria.where("yn").ne(0); - Criteria criteria = Criteria.where("yn").ne(0); + List hospital = groupsFacade.findGroupHospital(userId, false); + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); + Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key)); flag = true; @@ -387,6 +400,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo } } patientWeightService.setReport(map, weights, template.getBeforeWeight(), template.getBmi(), template.getDayWeights(), template.getBregmatic()); + healthChargeFacade.addHealthCharge(hospitalId, 1, id, 1, 2, userId); CollectionUtils.removeNullValue(map); return RespBuilder.buildSuccess(map); } @@ -586,6 +600,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo public BaseResponse getWeightsReport(String id, Integer userId, String rid) { Map> series = new HashMap<>(); Map> datas = new TreeMap<>(); + String hospitalId = autoMatchFacade.getHospitalId(userId); TemporaryWeightModel temporary = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class); String weight = temporary.getBeforeWeight(); Double heights = Double.valueOf(temporary.getBeforeHeight()).doubleValue() / 100; @@ -728,6 +743,8 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo if (datas.containsKey("3") && datas.containsKey("8")) { datas.put("2", datas.get("8")); } + + healthChargeFacade.addHealthCharge(hospitalId, 1, id, 2, 2, userId); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(this.getFirstOrNull(datas)); }