diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java index 70e8d3c..9c2c431 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java @@ -71,6 +71,19 @@ public class BloodSugar extends BaseModel { //0 未推送 1已经推送 private Integer sevenSend; + /** + * 报表解读医生 + */ + private String doctorId; + + public String getDoctorId() { + return doctorId; + } + + public void setDoctorId(String doctorId) { + this.doctorId = doctorId; + } + public Integer getExceptionSend() { return exceptionSend; } 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 5315723..04f1bc3 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 @@ -47,6 +47,16 @@ public class TemporaryBloodSugar extends BaseModel { private String temporaryUserId; + private String doctorId; + + public String getDoctorId() { + return doctorId; + } + + public void setDoctorId(String doctorId) { + this.doctorId = doctorId; + } + public String getTemporaryUserId() { return temporaryUserId; } 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 7ca91aa..6753acb 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 @@ -47,6 +47,19 @@ public class HealthChargeQuery extends BaseQuery implements IConvertToNativeQuer //结算状态 private Integer status; + /** + * 解读医生 + */ + private String doctorId; + + public String getDoctorId() { + return doctorId; + } + + public void setDoctorId(String doctorId) { + this.doctorId = doctorId; + } + @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -88,6 +101,10 @@ public class HealthChargeQuery extends BaseQuery implements IConvertToNativeQuer condition = condition.and("source", source, MongoOper.IS); } + if (null != doctorId) { + condition = condition.and("doctorId", doctorId, MongoOper.IS); + } + Criteria c = null; if (null != createdStart && createdEnd != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java index 6c5e1d1..9d3a81f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java @@ -1,30 +1,22 @@ package com.lyms.platform.operate.web.controller; -import com.lyms.platform.biz.service.BpReportService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.RespBuilder; -import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.BpReportFacade; import com.lyms.platform.operate.web.service.IBloodPressureService; -import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.pojo.BloodPressure; -import com.lyms.platform.pojo.BpReportModel; -import com.lyms.platform.pojo.XyPresentationModel; -import com.lyms.platform.query.BpReportQuery; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.*; +import java.util.Date; +import java.util.List; /** * 血压 @@ -39,8 +31,8 @@ public class BloodPressureController extends BaseController { @ResponseBody @RequestMapping(method = RequestMethod.POST) @TokenRequired - public BaseResponse addOrUpdate(BloodPressure bloodPressure, HttpServletRequest request) { - return bloodPressureService.addOrUpdate(getUserId(request), bloodPressure); + public BaseResponse addOrUpdate(BloodPressure bloodPressure, HttpServletRequest request, @RequestParam(value = "doctorId", required = false) String doctorId) { + return bloodPressureService.addOrUpdate(getUserId(request), bloodPressure,doctorId); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java index a440cd1..4e410b7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java @@ -119,10 +119,10 @@ public class BloodSugarController extends BaseController { @ResponseBody @RequestMapping(value = "/getBloodSugarReport/{patientId}", method = RequestMethod.GET) @TokenRequired - public BaseResponse getSysBloodSugarReport(@PathVariable String patientId - ,HttpServletRequest httpServletRequest) { + public BaseResponse getSysBloodSugarReport(@PathVariable String patientId, + @RequestParam(value = "lbsId", required = false) String lbsId, HttpServletRequest httpServletRequest) { LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); - return bloodSugarService.getSysBloodSugarReport(patientId, loginState.getId()); + return bloodSugarService.getSysBloodSugarReport(patientId, loginState.getId(), lbsId); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HealthChargeController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HealthChargeController.java index bee6a25..d174160 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HealthChargeController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HealthChargeController.java @@ -69,10 +69,11 @@ public class HealthChargeController extends BaseController{ @RequestParam(required = false) Integer type, @RequestParam(required = true) Integer page, @RequestParam(required = true) Integer limit, + @RequestParam(required = false) String doctorId, HttpServletRequest httpServletRequest) { LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); - BaseResponse baseResponse =healthChargeFacade.getHealthCharges(healthType, hospitalId, time, source, status, type, page, limit, loginState.getId()); + BaseResponse baseResponse =healthChargeFacade.getHealthCharges(healthType, hospitalId, time, source, status, type, page, limit, loginState.getId(), doctorId); return baseResponse; } 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 7a76537..51db65c 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 @@ -5,8 +5,8 @@ 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.request.TemporaryBloodModelRequest; import com.lyms.platform.operate.web.service.ITemporaryBloodService; -import com.lyms.platform.pojo.TemporaryBloodModel; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -28,8 +28,8 @@ public class TemporaryBloodController extends BaseController { @RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST) @TokenRequired @ResponseBody - public BaseResponse addTemporaryBlood(@Valid @RequestBody TemporaryBloodModel temporaryBloodModel, HttpServletRequest request) { - return temporaryBloodService.addTemporaryBlood(temporaryBloodModel, getUserId(request)); + public BaseResponse addTemporaryBlood(@Valid @RequestBody TemporaryBloodModelRequest temporaryBloodModelRequest, HttpServletRequest request) { + return temporaryBloodService.addTemporaryBlood(temporaryBloodModelRequest.getModel(), getUserId(request), temporaryBloodModelRequest.getDoctorId()); } @RequestMapping(value = "/update", method = RequestMethod.PUT) 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 eee94e6..d3a0598 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 @@ -72,9 +72,9 @@ public class TemporaryBloodSugarController extends BaseController { @RequestMapping(value = "/getBloodSugarReport/{id}", method = RequestMethod.GET) @TokenRequired public BaseResponse getSysBloodSugarReport(@PathVariable String id - , HttpServletRequest httpServletRequest) { + , HttpServletRequest httpServletRequest, @RequestParam(value = "lbsId", required = false) String lbsId) { LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); - return bloodSugarService.getSysBloodSugarReport(id, loginState.getId()); + return bloodSugarService.getSysBloodSugarReport(id, loginState.getId(), lbsId); } protected Integer getUserId(HttpServletRequest request) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java index c990c87..5be5444 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java @@ -7,6 +7,7 @@ import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.request.TemporaryWeightRequest; import com.lyms.platform.operate.web.service.TemporaryWeightService; import com.lyms.platform.pojo.TemporaryWeightModel; import org.springframework.beans.factory.annotation.Autowired; @@ -27,8 +28,8 @@ public class TemporaryWeightController extends BaseController { @RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST) @TokenRequired @ResponseBody - public BaseResponse addTemporaryWeight(@Valid @RequestBody TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) { - return temporaryWeightService.addTemporaryWeight(temporaryWeightModel, getUserId(request)); + public BaseResponse addTemporaryWeight(@Valid @RequestBody TemporaryWeightRequest temporaryWeightRequest, HttpServletRequest request) { + return temporaryWeightService.addTemporaryWeight(temporaryWeightRequest.getModel(), getUserId(request), temporaryWeightRequest.getDoctorId()); } @RequestMapping(value = "/update", method = RequestMethod.PUT) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java index e6904ad..90d3891 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java @@ -14,6 +14,7 @@ import com.lyms.platform.operate.web.request.HealthChargeRequest; import com.lyms.platform.operate.web.service.ITemporaryBloodService; import com.lyms.platform.operate.web.service.ITemporaryBloodSugarService; import com.lyms.platform.operate.web.service.TemporaryWeightService; +import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.ChargeRecordQuery; @@ -137,7 +138,7 @@ public class HealthChargeFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - public BaseResponse getHealthCharges(Integer healthType, String hospitalId,String time,Integer source,Integer status,Integer type,Integer page,Integer limit,Integer userId) + public BaseResponse getHealthCharges(Integer healthType, String hospitalId,String time,Integer source,Integer status,Integer type,Integer page,Integer limit,Integer userId, String doctorId) { List listData = new ArrayList<>(); @@ -158,6 +159,9 @@ public class HealthChargeFacade { healthChargeQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); } } + if (StringUtils.isNotEmpty(doctorId)){ + healthChargeQuery.setDoctorId(doctorId); + } List list = healthChargeService.queryHealthChargeList(healthChargeQuery); @@ -166,11 +170,21 @@ public class HealthChargeFacade { for (HealthChargeModel model : list) { + Map map = getData(model); if (map == null) { continue; } + String id = model.getDoctorId(); + String name = ""; + if (StringUtils.isNotEmpty(id)){ + Users users = usersService.getUsers(Integer.parseInt(id)); + name = users.getName(); + } + // 解读医生名称 + map.put("interpretName", name); + listData.add(map); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TemporaryBloodModelRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TemporaryBloodModelRequest.java new file mode 100644 index 0000000..c777ff0 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TemporaryBloodModelRequest.java @@ -0,0 +1,32 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.pojo.TemporaryBloodModel; + +/** + * + * @Author dongqin + * @Description + * @Date 18:22 2019/5/27 + */ + +public class TemporaryBloodModelRequest { + + private TemporaryBloodModel model; + private String doctorId; + + public TemporaryBloodModel getModel() { + return model; + } + + public void setModel(TemporaryBloodModel model) { + this.model = model; + } + + public String getDoctorId() { + return doctorId; + } + + public void setDoctorId(String doctorId) { + this.doctorId = doctorId; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TemporaryWeightRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TemporaryWeightRequest.java new file mode 100644 index 0000000..c937618 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TemporaryWeightRequest.java @@ -0,0 +1,33 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.pojo.TemporaryWeightModel; + +/** + * + * @Author dongqin + * @Description 临时体重管理 + * @Date 11:19 2019/5/27 + */ + +public class TemporaryWeightRequest { + + private TemporaryWeightModel model; + + private String doctorId; + + public TemporaryWeightModel getModel() { + return model; + } + + public void setModel(TemporaryWeightModel model) { + this.model = model; + } + + public String getDoctorId() { + return doctorId; + } + + public void setDoctorId(String doctorId) { + this.doctorId = doctorId; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java index 9baa717..f68a1d3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java @@ -2,7 +2,6 @@ package com.lyms.platform.operate.web.service; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.pojo.BloodPressure; -import com.lyms.platform.pojo.XyPresentationModel; import java.util.Date; import java.util.List; @@ -10,7 +9,7 @@ import java.util.Map; public interface IBloodPressureService extends IBaseService { - BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure); + BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure, String doctorId); BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java index 1362694..b5fdcaf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java @@ -31,7 +31,7 @@ public interface IBloodSugarService extends IBaseService { BaseResponse addWeightInfo(String id, String beforeWeight, String currentWeight); - BaseResponse getSysBloodSugarReport(String patientId,Integer userId); + BaseResponse getSysBloodSugarReport(String patientId,Integer userId, String lsbId); BaseResponse getBloodSugars(String doctorId, Integer type, Integer status, String keyword); 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 eb7b668..8037c30 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 @@ -8,7 +8,7 @@ import java.util.Date; public interface ITemporaryBloodService extends IBaseService { - BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel, Integer userId); + BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel, Integer userId,String doctorId); BaseResponse deleteTemporaryBlood(String id); 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 5febd72..750a18e 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 @@ -17,5 +17,5 @@ public interface ITemporaryBloodSugarService extends IBaseService { BaseResponse info(String parentId, Integer type, Date time); - BaseResponse getSysBloodSugarReport(String patientId, Integer userId); + BaseResponse getSysBloodSugarReport(String patientId, Integer userId, String lbsId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java index 5fd86d6..3513846 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java @@ -6,7 +6,7 @@ import org.springframework.data.mongodb.core.query.Query; public interface TemporaryWeightService extends IBaseService { - BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId); + BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId, String doctorId); void updateTemporaryWeight(Query query, TemporaryWeightModel weightModel); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index beaca17..eceba19 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -27,7 +27,6 @@ import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.PatientServiceService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.BloodSugarQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -173,7 +172,8 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } } - public BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure) { + @Override + public BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure, String doctorId) { String hospitalId = autoMatchFacade.getHospitalId(userId); Map temp = new LinkedHashMap<>(); bloodPressure.setModified(new Date()); @@ -182,6 +182,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP temp.put("pulse", bloodPressure.getPulse()); temp.put("timestamp", DateUtil.getyyyy_MM_dd_hms(new Date())); temp.put("hospitalId", hospitalId); + temp.put("doctorId", doctorId); // BloodPressure bp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(bloodPressure.getParentId()).and("yn").ne(0)), BloodPressure.class); Patients p = mongoTemplate.findById(bloodPressure.getParentId(), Patients.class); BloodPressure bp = null; @@ -790,8 +791,20 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } datas.put("motion", motionList); } + Map> infos = bloodPressure.getInfos(); + String doctorId = ""; + if (infos != null && infos.size() > 0){ + String currentDateKey = DateUtil.getyyyy_MM_dd(new Date()); + Map stringObjectMap = infos.get(currentDateKey); + if (stringObjectMap != null){ + Object doctorIdObj = stringObjectMap.get("doctorId"); + if (doctorIdObj != null){ + doctorId = doctorIdObj.toString(); + } + } + } - healthChargeFacade.addHealthCharge(bloodPressure.getHospitalId(), 3, bloodPressure.getParentId(), 1, 1, userId); + healthChargeFacade.addHealthCharge(bloodPressure.getHospitalId(), 3, bloodPressure.getParentId(), 1, 1, userId, doctorId); 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/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index 343b9a8..12f841e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -106,6 +106,10 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga if(one != null) { one.setModified(new Date()); one.setBloodSugar(bloodSugar.getBloodSugar()); + String doctorId = bloodSugar.getDoctorId(); + if (StringUtils.isNotEmpty(doctorId)){ + one.setDoctorId(doctorId); + } bloodSugarService.update(one); return RespBuilder.buildSuccess(one.getId()); } @@ -1136,7 +1140,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga } @Override - public BaseResponse getSysBloodSugarReport(String patientId, Integer userId) { + public BaseResponse getSysBloodSugarReport(String patientId, Integer userId, String lsbId) { BaseObjectResponse resp = new BaseObjectResponse(); @@ -1262,8 +1266,12 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga } data.put("weekRange",weekRange); - - healthChargeFacade.addHealthCharge(hospitalId, 2, patientId, 1, 1, userId); + BloodSugar bloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("id").is(lsbId)), BloodSugar.class); + String doctorId = ""; + if (bloodSugar != null){ + doctorId = bloodSugar.getDoctorId(); + } + healthChargeFacade.addHealthCharge(hospitalId, 2, patientId, 1, 1, userId, doctorId); resp.setData(data); resp.setErrorcode(ResponseCode.SUCCESS.getCode()); 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 65bdbe4..a2bdcc1 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 @@ -58,7 +58,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo @Override - public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodPressure, Integer userId) { + public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodPressure, Integer userId, String doctorId) { String hospitalId = autoMatchFacade.getHospitalId(userId); Map temp = new LinkedHashMap<>(); bloodPressure.setModified(new Date()); @@ -67,6 +67,9 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo temp.put("pulse", bloodPressure.getPulse()); temp.put("timestamp", DateUtil.getyyyy_MM_dd_hms(new Date())); temp.put("hospitalId", hospitalId); + if (StringUtils.isNotEmpty(doctorId)){ + temp.put("doctorId", doctorId); + } TemporaryUserModel temporaryUserModel = mongoTemplate.findById(bloodPressure.getTemporaryUserId(), TemporaryUserModel.class); TemporaryBloodModel bp = null; if (temporaryUserModel != null) { @@ -385,7 +388,19 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } datas.put("motion", motionList); } - healthChargeFacade.addHealthCharge(hospitalId, 3, temporaryBloo.getTemporaryUserId(), 1, 2, userId); + Map> infos = temporaryBloo.getInfos(); + String doctorId = ""; + if (infos != null){ + String currentDateKey = DateUtil.getyyyy_MM_dd(new Date()); + Map stringObjectMap = infos.get(currentDateKey); + if (stringObjectMap != null){ + Object doctorIdObj = stringObjectMap.get("doctorId"); + if (doctorIdObj != null){ + doctorId = doctorIdObj.toString(); + } + } + } + healthChargeFacade.addHealthCharge(hospitalId, 3, temporaryBloo.getTemporaryUserId(), 1, 2, userId, doctorId); 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 4ee2494..502baeb 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 @@ -70,6 +70,10 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I if (one != null) { one.setModified(new Date()); one.setBloodSugar(bloodSugar.getBloodSugar()); + String doctorId = bloodSugar.getDoctorId(); + if (StringUtils.isNotEmpty(doctorId)){ + one.setDoctorId(doctorId); + } temporaryBloodSugarDao.updateTemporaryBloodSugar(Query.query(Criteria.where("_id").is(one.getId())), one); return RespBuilder.buildSuccess(one.getId()); } @@ -290,7 +294,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I @Override - public BaseResponse getSysBloodSugarReport(String id, Integer userId) { + public BaseResponse getSysBloodSugarReport(String id, Integer userId, String lbsId) { BaseObjectResponse resp = new BaseObjectResponse(); //穿临时用户id TemporaryUserModel temporaryUserModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryUserModel.class); @@ -399,8 +403,13 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I } data.put("weekRange", weekRange); + TemporaryBloodSugar temporaryBloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(lbsId)), TemporaryBloodSugar.class); + String doctorId = ""; + if (temporaryBloodSugar != null){ + doctorId = temporaryBloodSugar.getDoctorId(); + } - healthChargeFacade.addHealthCharge(hospitalId, 2, id, 1, 2, userId); + healthChargeFacade.addHealthCharge(hospitalId, 2, id, 1, 2, userId, doctorId); resp.setData(data); resp.setErrorcode(ResponseCode.SUCCESS.getCode()); 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 8b8be70..1ebb0e5 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 @@ -75,7 +75,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo private CouponMapper couponMapper; @Override - public BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId) { + public BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId, String doctorId) { String hospitalId = autoMatchFacade.getHospitalId(userId); String nowWeight = weightModel.getNowWeight(); TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(weightModel.getTemporaryUserId())), TemporaryUserModel.class); @@ -103,6 +103,8 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo map.put("hospitalName", couponMapper.getHospitalName(hospitalId)); map.put("date", ymdDate); map.put("nowWeight", nowWeight); + // 报表解读人 + map.put("doctorId", doctorId); } } if (flag) { @@ -111,6 +113,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo m.put("hospitalName", couponMapper.getHospitalName(hospitalId)); m.put("date", ymdDate); m.put("nowWeight", nowWeight); + m.put("doctorId", doctorId); dayWeights2.add(m); } pw.setDayWeights2(dayWeights2); @@ -133,6 +136,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo m.put("hospitalName", couponMapper.getHospitalName(hospitalId)); m.put("date", DateUtil.getyyyy_MM_dd(new Date())); m.put("nowWeight", nowWeight); + m.put("doctorId", doctorId); dayWeights2.add(m); weightModel.setDayWeights2(dayWeights2); @@ -484,9 +488,10 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo } patientWeightService.setReport(map, weights, temporaryUser.getBeforeWeight(), temporaryWeight.getBmi(), temporaryWeight.getDayWeights(), temporaryUser.getBregmatic()); CollectionUtils.removeNullValue(map); + List> dayWeights2 = temporaryWeight.getDayWeights2(); + String doctorId = patientWeightService.getDoctorId(dayWeights2); - - healthChargeFacade.addHealthCharge(hospitalId, 1, temporaryWeight.getTemporaryUserId(), 1, 2, userId); + healthChargeFacade.addHealthCharge(hospitalId, 1, temporaryWeight.getTemporaryUserId(), 1, 2, userId, doctorId); return RespBuilder.buildSuccess(map); } return RespBuilder.buildSuccess(); @@ -829,8 +834,10 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo if (datas.containsKey("3") && datas.containsKey("8")) { datas.put("2", datas.get("8")); } + List> dayWeights2 = temporary.getDayWeights2(); + String doctorId = patientWeightService.getDoctorId(dayWeights2); - healthChargeFacade.addHealthCharge(hospitalId, 1, temporary.getTemporaryUserId(), 2, 2, userId); + healthChargeFacade.addHealthCharge(hospitalId, 1, temporary.getTemporaryUserId(), 2, 2, userId, doctorId); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(this.getFirstOrNull(datas)); }