jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c3c149cd00ad865cc464612d5c0fb8292b076309

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

健康统计-血糖、血压、体重

Showing 22 changed files with 208 additions and 44 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java View file @ c3c149c
... ... @@ -71,6 +71,19 @@
71 71 //0 未推送 1已经推送
72 72 private Integer sevenSend;
73 73  
  74 + /**
  75 + * 报表解读医生
  76 + */
  77 + private String doctorId;
  78 +
  79 + public String getDoctorId() {
  80 + return doctorId;
  81 + }
  82 +
  83 + public void setDoctorId(String doctorId) {
  84 + this.doctorId = doctorId;
  85 + }
  86 +
74 87 public Integer getExceptionSend() {
75 88 return exceptionSend;
76 89 }
platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java View file @ c3c149c
... ... @@ -47,6 +47,16 @@
47 47  
48 48 private String temporaryUserId;
49 49  
  50 + private String doctorId;
  51 +
  52 + public String getDoctorId() {
  53 + return doctorId;
  54 + }
  55 +
  56 + public void setDoctorId(String doctorId) {
  57 + this.doctorId = doctorId;
  58 + }
  59 +
50 60 public String getTemporaryUserId() {
51 61 return temporaryUserId;
52 62 }
platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java View file @ c3c149c
... ... @@ -47,6 +47,19 @@
47 47 //结算状态
48 48 private Integer status;
49 49  
  50 + /**
  51 + * 解读医生
  52 + */
  53 + private String doctorId;
  54 +
  55 + public String getDoctorId() {
  56 + return doctorId;
  57 + }
  58 +
  59 + public void setDoctorId(String doctorId) {
  60 + this.doctorId = doctorId;
  61 + }
  62 +
50 63 @Override
51 64 public MongoQuery convertToQuery() {
52 65 MongoCondition condition = MongoCondition.newInstance();
... ... @@ -86,6 +99,10 @@
86 99  
87 100 if (null != source) {
88 101 condition = condition.and("source", source, MongoOper.IS);
  102 + }
  103 +
  104 + if (null != doctorId) {
  105 + condition = condition.and("doctorId", doctorId, MongoOper.IS);
89 106 }
90 107  
91 108 Criteria c = null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java View file @ c3c149c
1 1 package com.lyms.platform.operate.web.controller;
2 2  
3   -import com.lyms.platform.biz.service.BpReportService;
4 3 import com.lyms.platform.common.annotation.TokenRequired;
5 4 import com.lyms.platform.common.base.BaseController;
6 5 import com.lyms.platform.common.constants.ErrorCodeConstants;
7   -import com.lyms.platform.common.enums.YnEnums;
8   -import com.lyms.platform.common.result.BaseListResponse;
9 6 import com.lyms.platform.common.result.BaseResponse;
10 7 import com.lyms.platform.common.result.RespBuilder;
11   -import com.lyms.platform.common.utils.DateUtil;
12 8 import com.lyms.platform.operate.web.facade.BpReportFacade;
13 9 import com.lyms.platform.operate.web.service.IBloodPressureService;
14   -import com.lyms.platform.operate.web.utils.CollectionUtils;
15 10 import com.lyms.platform.pojo.BloodPressure;
16   -import com.lyms.platform.pojo.BpReportModel;
17   -import com.lyms.platform.pojo.XyPresentationModel;
18   -import com.lyms.platform.query.BpReportQuery;
19 11 import org.apache.commons.lang.StringUtils;
20 12 import org.apache.commons.lang.math.NumberUtils;
21 13 import org.springframework.beans.factory.annotation.Autowired;
22 14 import org.springframework.stereotype.Controller;
23 15 import org.springframework.web.bind.annotation.*;
24 16  
25   -import javax.annotation.Resource;
26 17 import javax.servlet.http.HttpServletRequest;
27   -import java.util.*;
  18 +import java.util.Date;
  19 +import java.util.List;
28 20  
29 21 /**
30 22 * 血压
... ... @@ -39,8 +31,8 @@
39 31 @ResponseBody
40 32 @RequestMapping(method = RequestMethod.POST)
41 33 @TokenRequired
42   - public BaseResponse addOrUpdate(BloodPressure bloodPressure, HttpServletRequest request) {
43   - return bloodPressureService.addOrUpdate(getUserId(request), bloodPressure);
  34 + public BaseResponse addOrUpdate(BloodPressure bloodPressure, HttpServletRequest request, @RequestParam(value = "doctorId", required = false) String doctorId) {
  35 + return bloodPressureService.addOrUpdate(getUserId(request), bloodPressure,doctorId);
44 36 }
45 37  
46 38 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java View file @ c3c149c
... ... @@ -119,10 +119,10 @@
119 119 @ResponseBody
120 120 @RequestMapping(value = "/getBloodSugarReport/{patientId}", method = RequestMethod.GET)
121 121 @TokenRequired
122   - public BaseResponse getSysBloodSugarReport(@PathVariable String patientId
123   - ,HttpServletRequest httpServletRequest) {
  122 + public BaseResponse getSysBloodSugarReport(@PathVariable String patientId,
  123 + @RequestParam(value = "lbsId", required = false) String lbsId, HttpServletRequest httpServletRequest) {
124 124 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
125   - return bloodSugarService.getSysBloodSugarReport(patientId, loginState.getId());
  125 + return bloodSugarService.getSysBloodSugarReport(patientId, loginState.getId(), lbsId);
126 126 }
127 127  
128 128 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HealthChargeController.java View file @ c3c149c
... ... @@ -69,10 +69,11 @@
69 69 @RequestParam(required = false) Integer type,
70 70 @RequestParam(required = true) Integer page,
71 71 @RequestParam(required = true) Integer limit,
  72 + @RequestParam(required = false) String doctorId,
72 73 HttpServletRequest httpServletRequest) {
73 74 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
74 75  
75   - BaseResponse baseResponse =healthChargeFacade.getHealthCharges(healthType, hospitalId, time, source, status, type, page, limit, loginState.getId());
  76 + BaseResponse baseResponse =healthChargeFacade.getHealthCharges(healthType, hospitalId, time, source, status, type, page, limit, loginState.getId(), doctorId);
76 77 return baseResponse;
77 78 }
78 79  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java View file @ c3c149c
... ... @@ -5,8 +5,8 @@
5 5 import com.lyms.platform.common.base.LoginContext;
6 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
7 7 import com.lyms.platform.common.result.BaseResponse;
  8 +import com.lyms.platform.operate.web.request.TemporaryBloodModelRequest;
8 9 import com.lyms.platform.operate.web.service.ITemporaryBloodService;
9   -import com.lyms.platform.pojo.TemporaryBloodModel;
10 10 import org.apache.commons.lang.StringUtils;
11 11 import org.springframework.beans.factory.annotation.Autowired;
12 12 import org.springframework.stereotype.Controller;
... ... @@ -28,8 +28,8 @@
28 28 @RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST)
29 29 @TokenRequired
30 30 @ResponseBody
31   - public BaseResponse addTemporaryBlood(@Valid @RequestBody TemporaryBloodModel temporaryBloodModel, HttpServletRequest request) {
32   - return temporaryBloodService.addTemporaryBlood(temporaryBloodModel, getUserId(request));
  31 + public BaseResponse addTemporaryBlood(@Valid @RequestBody TemporaryBloodModelRequest temporaryBloodModelRequest, HttpServletRequest request) {
  32 + return temporaryBloodService.addTemporaryBlood(temporaryBloodModelRequest.getModel(), getUserId(request), temporaryBloodModelRequest.getDoctorId());
33 33 }
34 34  
35 35 @RequestMapping(value = "/update", method = RequestMethod.PUT)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java View file @ c3c149c
... ... @@ -72,9 +72,9 @@
72 72 @RequestMapping(value = "/getBloodSugarReport/{id}", method = RequestMethod.GET)
73 73 @TokenRequired
74 74 public BaseResponse getSysBloodSugarReport(@PathVariable String id
75   - , HttpServletRequest httpServletRequest) {
  75 + , HttpServletRequest httpServletRequest, @RequestParam(value = "lbsId", required = false) String lbsId) {
76 76 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
77   - return bloodSugarService.getSysBloodSugarReport(id, loginState.getId());
  77 + return bloodSugarService.getSysBloodSugarReport(id, loginState.getId(), lbsId);
78 78 }
79 79  
80 80 protected Integer getUserId(HttpServletRequest request) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java View file @ c3c149c
... ... @@ -7,6 +7,7 @@
7 7 import com.lyms.platform.common.constants.ErrorCodeConstants;
8 8 import com.lyms.platform.common.result.BaseObjectResponse;
9 9 import com.lyms.platform.common.result.BaseResponse;
  10 +import com.lyms.platform.operate.web.request.TemporaryWeightRequest;
10 11 import com.lyms.platform.operate.web.service.TemporaryWeightService;
11 12 import com.lyms.platform.pojo.TemporaryWeightModel;
12 13 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -27,8 +28,8 @@
27 28 @RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST)
28 29 @TokenRequired
29 30 @ResponseBody
30   - public BaseResponse addTemporaryWeight(@Valid @RequestBody TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) {
31   - return temporaryWeightService.addTemporaryWeight(temporaryWeightModel, getUserId(request));
  31 + public BaseResponse addTemporaryWeight(@Valid @RequestBody TemporaryWeightRequest temporaryWeightRequest, HttpServletRequest request) {
  32 + return temporaryWeightService.addTemporaryWeight(temporaryWeightRequest.getModel(), getUserId(request), temporaryWeightRequest.getDoctorId());
32 33 }
33 34  
34 35 @RequestMapping(value = "/update", method = RequestMethod.PUT)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java View file @ c3c149c
... ... @@ -14,6 +14,7 @@
14 14 import com.lyms.platform.operate.web.service.ITemporaryBloodService;
15 15 import com.lyms.platform.operate.web.service.ITemporaryBloodSugarService;
16 16 import com.lyms.platform.operate.web.service.TemporaryWeightService;
  17 +import com.lyms.platform.permission.model.Users;
17 18 import com.lyms.platform.permission.service.UsersService;
18 19 import com.lyms.platform.pojo.*;
19 20 import com.lyms.platform.query.ChargeRecordQuery;
... ... @@ -137,7 +138,7 @@
137 138 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
138 139 }
139 140  
140   - public BaseResponse getHealthCharges(Integer healthType, String hospitalId,String time,Integer source,Integer status,Integer type,Integer page,Integer limit,Integer userId)
  141 + public BaseResponse getHealthCharges(Integer healthType, String hospitalId,String time,Integer source,Integer status,Integer type,Integer page,Integer limit,Integer userId, String doctorId)
141 142 {
142 143  
143 144 List<Map> listData = new ArrayList<>();
... ... @@ -158,6 +159,9 @@
158 159 healthChargeQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
159 160 }
160 161 }
  162 + if (StringUtils.isNotEmpty(doctorId)){
  163 + healthChargeQuery.setDoctorId(doctorId);
  164 + }
161 165  
162 166 List<HealthChargeModel> list = healthChargeService.queryHealthChargeList(healthChargeQuery);
163 167  
164 168  
... ... @@ -166,11 +170,21 @@
166 170  
167 171 for (HealthChargeModel model : list)
168 172 {
  173 +
169 174 Map map = getData(model);
170 175 if (map == null)
171 176 {
172 177 continue;
173 178 }
  179 + String id = model.getDoctorId();
  180 + String name = "";
  181 + if (StringUtils.isNotEmpty(id)){
  182 + Users users = usersService.getUsers(Integer.parseInt(id));
  183 + name = users.getName();
  184 + }
  185 + // 解读医生名称
  186 + map.put("interpretName", name);
  187 +
174 188 listData.add(map);
175 189 }
176 190 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TemporaryBloodModelRequest.java View file @ c3c149c
  1 +package com.lyms.platform.operate.web.request;
  2 +
  3 +import com.lyms.platform.pojo.TemporaryBloodModel;
  4 +
  5 +/**
  6 + *
  7 + * @Author dongqin
  8 + * @Description
  9 + * @Date 18:22 2019/5/27
  10 + */
  11 +
  12 +public class TemporaryBloodModelRequest {
  13 +
  14 + private TemporaryBloodModel model;
  15 + private String doctorId;
  16 +
  17 + public TemporaryBloodModel getModel() {
  18 + return model;
  19 + }
  20 +
  21 + public void setModel(TemporaryBloodModel model) {
  22 + this.model = model;
  23 + }
  24 +
  25 + public String getDoctorId() {
  26 + return doctorId;
  27 + }
  28 +
  29 + public void setDoctorId(String doctorId) {
  30 + this.doctorId = doctorId;
  31 + }
  32 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TemporaryWeightRequest.java View file @ c3c149c
  1 +package com.lyms.platform.operate.web.request;
  2 +
  3 +import com.lyms.platform.pojo.TemporaryWeightModel;
  4 +
  5 +/**
  6 + *
  7 + * @Author dongqin
  8 + * @Description 临时体重管理
  9 + * @Date 11:19 2019/5/27
  10 + */
  11 +
  12 +public class TemporaryWeightRequest {
  13 +
  14 + private TemporaryWeightModel model;
  15 +
  16 + private String doctorId;
  17 +
  18 + public TemporaryWeightModel getModel() {
  19 + return model;
  20 + }
  21 +
  22 + public void setModel(TemporaryWeightModel model) {
  23 + this.model = model;
  24 + }
  25 +
  26 + public String getDoctorId() {
  27 + return doctorId;
  28 + }
  29 +
  30 + public void setDoctorId(String doctorId) {
  31 + this.doctorId = doctorId;
  32 + }
  33 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java View file @ c3c149c
... ... @@ -2,7 +2,6 @@
2 2  
3 3 import com.lyms.platform.common.result.BaseResponse;
4 4 import com.lyms.platform.pojo.BloodPressure;
5   -import com.lyms.platform.pojo.XyPresentationModel;
6 5  
7 6 import java.util.Date;
8 7 import java.util.List;
... ... @@ -10,7 +9,7 @@
10 9  
11 10 public interface IBloodPressureService extends IBaseService {
12 11  
13   - BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure);
  12 + BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure, String doctorId);
14 13  
15 14 BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId);
16 15  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java View file @ c3c149c
... ... @@ -31,7 +31,7 @@
31 31  
32 32 BaseResponse addWeightInfo(String id, String beforeWeight, String currentWeight);
33 33  
34   - BaseResponse getSysBloodSugarReport(String patientId,Integer userId);
  34 + BaseResponse getSysBloodSugarReport(String patientId,Integer userId, String lsbId);
35 35  
36 36 BaseResponse getBloodSugars(String doctorId, Integer type, Integer status, String keyword);
37 37  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java View file @ c3c149c
... ... @@ -8,7 +8,7 @@
8 8  
9 9 public interface ITemporaryBloodService extends IBaseService {
10 10  
11   - BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel, Integer userId);
  11 + BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel, Integer userId,String doctorId);
12 12  
13 13 BaseResponse deleteTemporaryBlood(String id);
14 14  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java View file @ c3c149c
... ... @@ -17,6 +17,6 @@
17 17  
18 18 BaseResponse info(String parentId, Integer type, Date time);
19 19  
20   - BaseResponse getSysBloodSugarReport(String patientId, Integer userId);
  20 + BaseResponse getSysBloodSugarReport(String patientId, Integer userId, String lbsId);
21 21 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java View file @ c3c149c
... ... @@ -6,7 +6,7 @@
6 6  
7 7 public interface TemporaryWeightService extends IBaseService {
8 8  
9   - BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId);
  9 + BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId, String doctorId);
10 10  
11 11 void updateTemporaryWeight(Query query, TemporaryWeightModel weightModel);
12 12  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ c3c149c
... ... @@ -27,7 +27,6 @@
27 27 import com.lyms.platform.permission.service.PatientServiceService;
28 28 import com.lyms.platform.permission.service.UsersService;
29 29 import com.lyms.platform.pojo.*;
30   -import com.lyms.platform.query.BloodSugarQuery;
31 30 import com.lyms.platform.query.PatientsQuery;
32 31 import org.apache.commons.lang.math.NumberUtils;
33 32 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -173,7 +172,8 @@
173 172 }
174 173 }
175 174  
176   - public BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure) {
  175 + @Override
  176 + public BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure, String doctorId) {
177 177 String hospitalId = autoMatchFacade.getHospitalId(userId);
178 178 Map<String, Object> temp = new LinkedHashMap<>();
179 179 bloodPressure.setModified(new Date());
... ... @@ -182,6 +182,7 @@
182 182 temp.put("pulse", bloodPressure.getPulse());
183 183 temp.put("timestamp", DateUtil.getyyyy_MM_dd_hms(new Date()));
184 184 temp.put("hospitalId", hospitalId);
  185 + temp.put("doctorId", doctorId);
185 186 // BloodPressure bp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(bloodPressure.getParentId()).and("yn").ne(0)), BloodPressure.class);
186 187 Patients p = mongoTemplate.findById(bloodPressure.getParentId(), Patients.class);
187 188 BloodPressure bp = null;
188 189  
... ... @@ -790,8 +791,20 @@
790 791 }
791 792 datas.put("motion", motionList);
792 793 }
  794 + Map<String, Map<String, Object>> infos = bloodPressure.getInfos();
  795 + String doctorId = "";
  796 + if (infos != null && infos.size() > 0){
  797 + String currentDateKey = DateUtil.getyyyy_MM_dd(new Date());
  798 + Map<String, Object> stringObjectMap = infos.get(currentDateKey);
  799 + if (stringObjectMap != null){
  800 + Object doctorIdObj = stringObjectMap.get("doctorId");
  801 + if (doctorIdObj != null){
  802 + doctorId = doctorIdObj.toString();
  803 + }
  804 + }
  805 + }
793 806  
794   - healthChargeFacade.addHealthCharge(bloodPressure.getHospitalId(), 3, bloodPressure.getParentId(), 1, 1, userId);
  807 + healthChargeFacade.addHealthCharge(bloodPressure.getHospitalId(), 3, bloodPressure.getParentId(), 1, 1, userId, doctorId);
795 808 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas);
796 809 } else {
797 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 @ c3c149c
... ... @@ -106,6 +106,10 @@
106 106 if(one != null) {
107 107 one.setModified(new Date());
108 108 one.setBloodSugar(bloodSugar.getBloodSugar());
  109 + String doctorId = bloodSugar.getDoctorId();
  110 + if (StringUtils.isNotEmpty(doctorId)){
  111 + one.setDoctorId(doctorId);
  112 + }
109 113 bloodSugarService.update(one);
110 114 return RespBuilder.buildSuccess(one.getId());
111 115 }
... ... @@ -1136,7 +1140,7 @@
1136 1140 }
1137 1141  
1138 1142 @Override
1139   - public BaseResponse getSysBloodSugarReport(String patientId, Integer userId) {
  1143 + public BaseResponse getSysBloodSugarReport(String patientId, Integer userId, String lsbId) {
1140 1144  
1141 1145 BaseObjectResponse resp = new BaseObjectResponse();
1142 1146  
... ... @@ -1262,8 +1266,12 @@
1262 1266 }
1263 1267 data.put("weekRange",weekRange);
1264 1268  
1265   -
1266   - healthChargeFacade.addHealthCharge(hospitalId, 2, patientId, 1, 1, userId);
  1269 + BloodSugar bloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("id").is(lsbId)), BloodSugar.class);
  1270 + String doctorId = "";
  1271 + if (bloodSugar != null){
  1272 + doctorId = bloodSugar.getDoctorId();
  1273 + }
  1274 + healthChargeFacade.addHealthCharge(hospitalId, 2, patientId, 1, 1, userId, doctorId);
1267 1275  
1268 1276 resp.setData(data);
1269 1277 resp.setErrorcode(ResponseCode.SUCCESS.getCode());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java View file @ c3c149c
... ... @@ -58,7 +58,7 @@
58 58  
59 59  
60 60 @Override
61   - public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodPressure, Integer userId) {
  61 + public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodPressure, Integer userId, String doctorId) {
62 62 String hospitalId = autoMatchFacade.getHospitalId(userId);
63 63 Map<String, Object> temp = new LinkedHashMap<>();
64 64 bloodPressure.setModified(new Date());
... ... @@ -67,6 +67,9 @@
67 67 temp.put("pulse", bloodPressure.getPulse());
68 68 temp.put("timestamp", DateUtil.getyyyy_MM_dd_hms(new Date()));
69 69 temp.put("hospitalId", hospitalId);
  70 + if (StringUtils.isNotEmpty(doctorId)){
  71 + temp.put("doctorId", doctorId);
  72 + }
70 73 TemporaryUserModel temporaryUserModel = mongoTemplate.findById(bloodPressure.getTemporaryUserId(), TemporaryUserModel.class);
71 74 TemporaryBloodModel bp = null;
72 75 if (temporaryUserModel != null) {
... ... @@ -385,7 +388,19 @@
385 388 }
386 389 datas.put("motion", motionList);
387 390 }
388   - healthChargeFacade.addHealthCharge(hospitalId, 3, temporaryBloo.getTemporaryUserId(), 1, 2, userId);
  391 + Map<String, Map<String, Object>> infos = temporaryBloo.getInfos();
  392 + String doctorId = "";
  393 + if (infos != null){
  394 + String currentDateKey = DateUtil.getyyyy_MM_dd(new Date());
  395 + Map<String, Object> stringObjectMap = infos.get(currentDateKey);
  396 + if (stringObjectMap != null){
  397 + Object doctorIdObj = stringObjectMap.get("doctorId");
  398 + if (doctorIdObj != null){
  399 + doctorId = doctorIdObj.toString();
  400 + }
  401 + }
  402 + }
  403 + healthChargeFacade.addHealthCharge(hospitalId, 3, temporaryBloo.getTemporaryUserId(), 1, 2, userId, doctorId);
389 404 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas);
390 405 } else {
391 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 @ c3c149c
... ... @@ -70,6 +70,10 @@
70 70 if (one != null) {
71 71 one.setModified(new Date());
72 72 one.setBloodSugar(bloodSugar.getBloodSugar());
  73 + String doctorId = bloodSugar.getDoctorId();
  74 + if (StringUtils.isNotEmpty(doctorId)){
  75 + one.setDoctorId(doctorId);
  76 + }
73 77 temporaryBloodSugarDao.updateTemporaryBloodSugar(Query.query(Criteria.where("_id").is(one.getId())), one);
74 78 return RespBuilder.buildSuccess(one.getId());
75 79 }
... ... @@ -290,7 +294,7 @@
290 294  
291 295  
292 296 @Override
293   - public BaseResponse getSysBloodSugarReport(String id, Integer userId) {
  297 + public BaseResponse getSysBloodSugarReport(String id, Integer userId, String lbsId) {
294 298 BaseObjectResponse resp = new BaseObjectResponse();
295 299 //穿临时用户id
296 300 TemporaryUserModel temporaryUserModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryUserModel.class);
297 301  
... ... @@ -399,8 +403,13 @@
399 403 }
400 404 data.put("weekRange", weekRange);
401 405  
  406 + TemporaryBloodSugar temporaryBloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(lbsId)), TemporaryBloodSugar.class);
  407 + String doctorId = "";
  408 + if (temporaryBloodSugar != null){
  409 + doctorId = temporaryBloodSugar.getDoctorId();
  410 + }
402 411  
403   - healthChargeFacade.addHealthCharge(hospitalId, 2, id, 1, 2, userId);
  412 + healthChargeFacade.addHealthCharge(hospitalId, 2, id, 1, 2, userId, doctorId);
404 413  
405 414 resp.setData(data);
406 415 resp.setErrorcode(ResponseCode.SUCCESS.getCode());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java View file @ c3c149c
... ... @@ -75,7 +75,7 @@
75 75 private CouponMapper couponMapper;
76 76  
77 77 @Override
78   - public BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId) {
  78 + public BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId, String doctorId) {
79 79 String hospitalId = autoMatchFacade.getHospitalId(userId);
80 80 String nowWeight = weightModel.getNowWeight();
81 81 TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(weightModel.getTemporaryUserId())), TemporaryUserModel.class);
... ... @@ -103,6 +103,8 @@
103 103 map.put("hospitalName", couponMapper.getHospitalName(hospitalId));
104 104 map.put("date", ymdDate);
105 105 map.put("nowWeight", nowWeight);
  106 + // 报表解读人
  107 + map.put("doctorId", doctorId);
106 108 }
107 109 }
108 110 if (flag) {
... ... @@ -111,6 +113,7 @@
111 113 m.put("hospitalName", couponMapper.getHospitalName(hospitalId));
112 114 m.put("date", ymdDate);
113 115 m.put("nowWeight", nowWeight);
  116 + m.put("doctorId", doctorId);
114 117 dayWeights2.add(m);
115 118 }
116 119 pw.setDayWeights2(dayWeights2);
... ... @@ -133,6 +136,7 @@
133 136 m.put("hospitalName", couponMapper.getHospitalName(hospitalId));
134 137 m.put("date", DateUtil.getyyyy_MM_dd(new Date()));
135 138 m.put("nowWeight", nowWeight);
  139 + m.put("doctorId", doctorId);
136 140 dayWeights2.add(m);
137 141 weightModel.setDayWeights2(dayWeights2);
138 142  
139 143  
... ... @@ -484,9 +488,10 @@
484 488 }
485 489 patientWeightService.setReport(map, weights, temporaryUser.getBeforeWeight(), temporaryWeight.getBmi(), temporaryWeight.getDayWeights(), temporaryUser.getBregmatic());
486 490 CollectionUtils.removeNullValue(map);
  491 + List<Map<String, Object>> dayWeights2 = temporaryWeight.getDayWeights2();
  492 + String doctorId = patientWeightService.getDoctorId(dayWeights2);
487 493  
488   -
489   - healthChargeFacade.addHealthCharge(hospitalId, 1, temporaryWeight.getTemporaryUserId(), 1, 2, userId);
  494 + healthChargeFacade.addHealthCharge(hospitalId, 1, temporaryWeight.getTemporaryUserId(), 1, 2, userId, doctorId);
490 495 return RespBuilder.buildSuccess(map);
491 496 }
492 497 return RespBuilder.buildSuccess();
493 498  
... ... @@ -829,8 +834,10 @@
829 834 if (datas.containsKey("3") && datas.containsKey("8")) {
830 835 datas.put("2", datas.get("8"));
831 836 }
  837 + List<Map<String, Object>> dayWeights2 = temporary.getDayWeights2();
  838 + String doctorId = patientWeightService.getDoctorId(dayWeights2);
832 839  
833   - healthChargeFacade.addHealthCharge(hospitalId, 1, temporary.getTemporaryUserId(), 2, 2, userId);
  840 + healthChargeFacade.addHealthCharge(hospitalId, 1, temporary.getTemporaryUserId(), 2, 2, userId, doctorId);
834 841 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(this.getFirstOrNull(datas));
835 842 }
836 843