jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8b22f2e32bb3d4476d5c6c326c429f43c525c0de

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

体重、血糖、血压、儿童报告修改报告解读人

Showing 27 changed files with 81 additions and 224 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java View file @ 8b22f2e
... ... @@ -121,19 +121,6 @@
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   -
137 124 public List<String> getFoods() {
138 125 return foods;
139 126 }
platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java View file @ 8b22f2e
... ... @@ -71,19 +71,6 @@
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   -
87 74 public Integer getExceptionSend() {
88 75 return exceptionSend;
89 76 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java View file @ 8b22f2e
... ... @@ -122,8 +122,8 @@
122 122 @RequestMapping(value = "/queryBabyNutritionReport/{id}", method = RequestMethod.GET)
123 123 @ResponseBody
124 124 @TokenRequired
125   - public BaseObjectResponse queryBabyNutritionReport(@PathVariable("id") String id, HttpServletRequest request) {
126   - return babyNutritionFacade.queryBabyNutritionReport(id, getUserId(request));
  125 + public BaseObjectResponse queryBabyNutritionReport(@PathVariable("id") String id, HttpServletRequest request, @RequestParam("doctorId") String doctorId) {
  126 + return babyNutritionFacade.queryBabyNutritionReport(id, getUserId(request), doctorId);
127 127 }
128 128  
129 129 /**
... ... @@ -132,8 +132,8 @@
132 132 @RequestMapping(value = "/queryBabyDietReport/{id}", method = RequestMethod.GET)
133 133 @ResponseBody
134 134 @TokenRequired
135   - public BaseObjectResponse queryBabyDietReport(@PathVariable("id") String id, HttpServletRequest request) {
136   - return babyNutritionFacade.queryBabyDietReport(id, getUserId(request));
  135 + public BaseObjectResponse queryBabyDietReport(@PathVariable("id") String id, HttpServletRequest request, @RequestParam("doctorId")String doctorId) {
  136 + return babyNutritionFacade.queryBabyDietReport(id, getUserId(request), doctorId);
137 137 }
138 138  
139 139 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java View file @ 8b22f2e
... ... @@ -31,8 +31,8 @@
31 31 @ResponseBody
32 32 @RequestMapping(method = RequestMethod.POST)
33 33 @TokenRequired
34   - public BaseResponse addOrUpdate(BloodPressure bloodPressure, HttpServletRequest request, @RequestParam(value = "doctorId", required = false) String doctorId) {
35   - return bloodPressureService.addOrUpdate(getUserId(request), bloodPressure,doctorId);
  34 + public BaseResponse addOrUpdate(BloodPressure bloodPressure, HttpServletRequest request) {
  35 + return bloodPressureService.addOrUpdate(getUserId(request), bloodPressure);
36 36 }
37 37  
38 38 @ResponseBody
39 39  
... ... @@ -138,11 +138,11 @@
138 138 @ResponseBody
139 139 @RequestMapping(value = "/getXyPresentation/{bloodId}", method = RequestMethod.GET)
140 140 @TokenRequired
141   - public BaseResponse getXyPresentation(@PathVariable String bloodId,HttpServletRequest request) {
  141 + public BaseResponse getXyPresentation(@PathVariable String bloodId,@RequestParam String doctorId, HttpServletRequest request) {
142 142 if (StringUtils.isEmpty(bloodId) || "null".equals(bloodId)) {
143 143 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("bloodId参数不能为空");
144 144 }
145   - return bloodPressureService.getXyPresentation(bloodId,getUserId(request));
  145 + return bloodPressureService.getXyPresentation(bloodId,getUserId(request), doctorId);
146 146 }
147 147  
148 148 @Autowired
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java View file @ 8b22f2e
... ... @@ -120,9 +120,10 @@
120 120 @RequestMapping(value = "/getBloodSugarReport/{patientId}", method = RequestMethod.GET)
121 121 @TokenRequired
122 122 public BaseResponse getSysBloodSugarReport(@PathVariable String patientId,
123   - @RequestParam(value = "lbsId", required = false) String lbsId, HttpServletRequest httpServletRequest) {
  123 + @RequestParam(value = "lbsId", required = false) String lbsId, HttpServletRequest httpServletRequest,
  124 + @RequestParam(value = "doctorId") String doctorId) {
124 125 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
125   - return bloodSugarService.getSysBloodSugarReport(patientId, loginState.getId(), lbsId);
  126 + return bloodSugarService.getSysBloodSugarReport(patientId, loginState.getId(), lbsId, doctorId);
126 127 }
127 128  
128 129 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java View file @ 8b22f2e
... ... @@ -33,8 +33,8 @@
33 33 @ResponseBody
34 34 @RequestMapping(method = RequestMethod.POST)
35 35 @TokenRequired
36   - public BaseResponse addOrUpdate(@RequestParam(value = "doctorId", required = false) String doctorId, PatientWeight patientWeight, HttpServletRequest request) {
37   - return patientWeightService.addOrUpdate(getUserId(request), patientWeight, doctorId);
  36 + public BaseResponse addOrUpdate(PatientWeight patientWeight, HttpServletRequest request) {
  37 + return patientWeightService.addOrUpdate(getUserId(request), patientWeight);
38 38 }
39 39  
40 40 /**
41 41  
... ... @@ -94,8 +94,9 @@
94 94 public BaseResponse report(@PathVariable String id,
95 95 HttpServletRequest request,
96 96 @RequestParam(value = "rid", required = false) String rid,
  97 + @RequestParam(value = "doctorId") String doctorId,
97 98 String version) {
98   - return patientWeightService.report(id, getUserId(request), rid, version);
  99 + return patientWeightService.report(id, getUserId(request), rid, version, doctorId);
99 100 }
100 101  
101 102  
102 103  
... ... @@ -273,11 +274,11 @@
273 274 @TokenRequired
274 275 public BaseResponse getWeightsReport(@PathVariable String pid,
275 276 HttpServletRequest request,
276   - @RequestParam(value = "rid", required = false) String rid, String version) {
  277 + @RequestParam(value = "rid", required = false) String rid, String version,@RequestParam(value = "doctorId") String doctorId) {
277 278 if (pid.isEmpty() || "null".equals(pid)) {
278 279 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!");
279 280 }
280   - return patientWeightService.getWeightsReport(pid, getUserId(request), rid, version);
  281 + return patientWeightService.getWeightsReport(pid, getUserId(request), rid, version, doctorId);
281 282 }
282 283  
283 284  
284 285  
... ... @@ -292,11 +293,11 @@
292 293 @TokenRequired
293 294 public BaseResponse qhdReport(@PathVariable String pid,
294 295 HttpServletRequest request,
295   - @RequestParam(value = "rid", required = false) String rid, String version) {
  296 + @RequestParam(value = "rid", required = false) String rid, String version,@RequestParam(value = "doctorId") String doctorId) {
296 297 if (pid.isEmpty() || "null".equals(pid)) {
297 298 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!");
298 299 }
299   - return patientWeightService.qhdHighRiskReport(pid, getUserId(request), rid, version);
  300 + return patientWeightService.qhdHighRiskReport(pid, getUserId(request), rid, version, doctorId);
300 301 }
301 302  
302 303 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java View file @ 8b22f2e
... ... @@ -29,7 +29,7 @@
29 29 @TokenRequired
30 30 @ResponseBody
31 31 public BaseResponse addTemporaryBlood(@Valid @RequestBody TemporaryBloodModelRequest temporaryBloodModelRequest, HttpServletRequest request) {
32   - return temporaryBloodService.addTemporaryBlood(temporaryBloodModelRequest.getModel(), getUserId(request), temporaryBloodModelRequest.getDoctorId());
  32 + return temporaryBloodService.addTemporaryBlood(temporaryBloodModelRequest.getModel(), getUserId(request));
33 33 }
34 34  
35 35 @RequestMapping(value = "/update", method = RequestMethod.PUT)
36 36  
... ... @@ -70,11 +70,11 @@
70 70 @ResponseBody
71 71 @RequestMapping(value = "/presentation/{id}", method = RequestMethod.GET)
72 72 @TokenRequired
73   - public BaseResponse getXyPresentation(@PathVariable String id, HttpServletRequest request) {
  73 + public BaseResponse getXyPresentation(@PathVariable String id, HttpServletRequest request, @RequestParam(value = "doctorId") String doctorId) {
74 74 if (StringUtils.isEmpty(id) || "null".equals(id)) {
75 75 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id参数不能为空");
76 76 }
77   - return temporaryBloodService.getXyPresentation(id, getUserId(request));
  77 + return temporaryBloodService.getXyPresentation(id, getUserId(request), doctorId);
78 78 }
79 79  
80 80  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java View file @ 8b22f2e
... ... @@ -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, @RequestParam(value = "lbsId", required = false) String lbsId) {
  75 + , HttpServletRequest httpServletRequest, @RequestParam(value = "lbsId", required = false) String lbsId,@RequestParam(value = "doctorId") String doctorId ) {
76 76 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
77   - return bloodSugarService.getSysBloodSugarReport(id, loginState.getId(), lbsId);
  77 + return bloodSugarService.getSysBloodSugarReport(id, loginState.getId(), lbsId, doctorId);
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 @ 8b22f2e
... ... @@ -29,7 +29,7 @@
29 29 @TokenRequired
30 30 @ResponseBody
31 31 public BaseResponse addTemporaryWeight(@Valid @RequestBody TemporaryWeightRequest temporaryWeightRequest, HttpServletRequest request) {
32   - return temporaryWeightService.addTemporaryWeight(temporaryWeightRequest.getModel(), getUserId(request), temporaryWeightRequest.getDoctorId());
  32 + return temporaryWeightService.addTemporaryWeight(temporaryWeightRequest.getModel(), getUserId(request));
33 33 }
34 34  
35 35 @RequestMapping(value = "/update", method = RequestMethod.PUT)
36 36  
... ... @@ -78,11 +78,12 @@
78 78 @TokenRequired
79 79 public BaseResponse getWeightsReport(@PathVariable String id,
80 80 HttpServletRequest request,
81   - @RequestParam(value = "rid", required = false) String rid) {
  81 + @RequestParam(value = "rid", required = false) String rid,
  82 + @RequestParam(value = "doctorId") String doctorId) {
82 83 if (id.isEmpty() || "null".equals(id)) {
83 84 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!");
84 85 }
85   - return temporaryWeightService.getWeightsReport(id, getUserId(request), rid);
  86 + return temporaryWeightService.getWeightsReport(id, getUserId(request), rid, doctorId);
86 87 }
87 88  
88 89  
... ... @@ -97,8 +98,9 @@
97 98 @TokenRequired
98 99 public BaseResponse report(@PathVariable String id,
99 100 HttpServletRequest request,
100   - @RequestParam(value = "rid", required = false) String rid) {
101   - return temporaryWeightService.report(id, getUserId(request), rid);
  101 + @RequestParam(value = "rid", required = false) String rid,
  102 + @RequestParam(value = "doctorId") String doctorId) {
  103 + return temporaryWeightService.report(id, getUserId(request), rid, doctorId);
102 104 }
103 105  
104 106 protected Integer getUserId(HttpServletRequest request) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java View file @ 8b22f2e
... ... @@ -126,7 +126,7 @@
126 126 /**
127 127 * 手动执行自动任务
128 128 *
129   - * @return
  129 + * @return/all
130 130 */
131 131 @ResponseBody
132 132 @RequestMapping(value = "/dandleAutoReachDue", method = RequestMethod.GET)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ 8b22f2e
... ... @@ -322,7 +322,9 @@
322 322 map.put("recordTime", DateUtil.getyyyy_MM_dd(model.getNutritiTime()));
323 323  
324 324 // 新增报表解读人和结算状态
325   - String currInterpretDoctorId = model.getInterpretDoctorId();
  325 + HealthChargeModel chargeModel = mongoTemplate.findOne(Query.query(Criteria.where("babyNutritionId").is(model.getId())), HealthChargeModel.class);
  326 +
  327 + String currInterpretDoctorId = chargeModel.getDoctorId();
326 328 String interpretDoctorName = "";
327 329 if (StringUtils.isNotEmpty(currInterpretDoctorId)) {
328 330 Users users = usersService.getUsers(Integer.parseInt(currInterpretDoctorId));
... ... @@ -357,7 +359,7 @@
357 359 return null;
358 360 }
359 361  
360   - public BaseObjectResponse queryBabyNutritionReport(String id, Integer userId) {
  362 + public BaseObjectResponse queryBabyNutritionReport(String id, Integer userId, String doctorId) {
361 363  
362 364  
363 365 Map data = new HashMap();
... ... @@ -654,8 +656,7 @@
654 656  
655 657 data.put("wlysitems", wlysitems);
656 658  
657   - healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null,
658   - userId, model.getInterpretDoctorId(), true, model.getId());
  659 + healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, doctorId, true, model.getId());
659 660 }
660 661 BaseObjectResponse objectResponse = new BaseObjectResponse();
661 662 objectResponse.setData(data);
... ... @@ -1280,7 +1281,7 @@
1280 1281 /**
1281 1282 * 秦皇岛精简版儿童膳食报告
1282 1283 */
1283   - public BaseObjectResponse queryBabyDietReport(String id, Integer userId) {
  1284 + public BaseObjectResponse queryBabyDietReport(String id, Integer userId, String doctorId) {
1284 1285 BaseObjectResponse objectResponse = new BaseObjectResponse();
1285 1286 Map data = new HashMap();
1286 1287  
... ... @@ -1500,8 +1501,7 @@
1500 1501 }
1501 1502  
1502 1503  
1503   - healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null,
1504   - userId, model.getInterpretDoctorId(), true, model.getId());
  1504 + healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, doctorId, true, model.getId());
1505 1505 }
1506 1506 objectResponse.setData(data);
1507 1507 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java View file @ 8b22f2e
... ... @@ -188,7 +188,6 @@
188 188 model.setFruits(fruits);
189 189 model.setFoods(foods);
190 190 model.setRemark(remark);
191   - model.setInterpretDoctorId(interpretDoctorId);
192 191 return model;
193 192 }
194 193  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TemporaryBloodModelRequest.java View file @ 8b22f2e
... ... @@ -12,7 +12,6 @@
12 12 public class TemporaryBloodModelRequest {
13 13  
14 14 private TemporaryBloodModel model;
15   - private String doctorId;
16 15  
17 16 public TemporaryBloodModel getModel() {
18 17 return model;
... ... @@ -22,12 +21,5 @@
22 21 this.model = model;
23 22 }
24 23  
25   - public String getDoctorId() {
26   - return doctorId;
27   - }
28   -
29   - public void setDoctorId(String doctorId) {
30   - this.doctorId = doctorId;
31   - }
32 24 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TemporaryWeightRequest.java View file @ 8b22f2e
... ... @@ -13,22 +13,12 @@
13 13  
14 14 private TemporaryWeightModel model;
15 15  
16   - private String doctorId;
17   -
18 16 public TemporaryWeightModel getModel() {
19 17 return model;
20 18 }
21 19  
22 20 public void setModel(TemporaryWeightModel model) {
23 21 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 22 }
33 23 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java View file @ 8b22f2e
... ... @@ -184,7 +184,6 @@
184 184 setFruits(model.getFruits());
185 185 setFoods(model.getFoods());
186 186 setRemark(model.getRemark());
187   - setInterpretDoctorId(model.getInterpretDoctorId());
188 187 return this;
189 188 }
190 189  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java View file @ 8b22f2e
... ... @@ -9,7 +9,7 @@
9 9  
10 10 public interface IBloodPressureService extends IBaseService {
11 11  
12   - BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure, String doctorId);
  12 + BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure);
13 13  
14 14 BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId);
15 15  
... ... @@ -29,6 +29,6 @@
29 29  
30 30 BaseResponse getBloodPressures(String doctorId, Integer type, Integer status, String keyword);
31 31  
32   - BaseResponse getXyPresentation(String id,Integer userId);
  32 + BaseResponse getXyPresentation(String id,Integer userId, String doctorId);
33 33 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java View file @ 8b22f2e
... ... @@ -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, String lsbId);
  34 + BaseResponse getSysBloodSugarReport(String patientId,Integer userId, String lsbId, String doctorId);
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 @ 8b22f2e
... ... @@ -8,7 +8,7 @@
8 8  
9 9 public interface ITemporaryBloodService extends IBaseService {
10 10  
11   - BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel, Integer userId,String doctorId);
  11 + BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel, Integer userId);
12 12  
13 13 BaseResponse deleteTemporaryBlood(String id);
14 14  
... ... @@ -19,6 +19,6 @@
19 19  
20 20 BaseResponse info(String id, Date startDate);
21 21  
22   - BaseResponse getXyPresentation(String bloodId, Integer userId);
  22 + BaseResponse getXyPresentation(String bloodId, Integer userId, String doctorId);
23 23 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java View file @ 8b22f2e
... ... @@ -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, String lbsId);
  20 + BaseResponse getSysBloodSugarReport(String patientId, Integer userId, String lbsId, String doctorId);
21 21 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java View file @ 8b22f2e
... ... @@ -25,7 +25,7 @@
25 25  
26 26 BaseResponse lifeStyle();
27 27  
28   - BaseResponse addOrUpdate(Integer userId, PatientWeight patientWeight, String doctorId);
  28 + BaseResponse addOrUpdate(Integer userId, PatientWeight patientWeight);
29 29  
30 30 BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId);
31 31  
... ... @@ -35,7 +35,7 @@
35 35  
36 36 BaseResponse delete(String id);
37 37  
38   - BaseResponse report(String id, Integer userId, String rid, String version);
  38 + BaseResponse report(String id, Integer userId, String rid, String version, String doctorId);
39 39  
40 40  
41 41 BaseResponse wxReport(String pid);
42 42  
... ... @@ -60,9 +60,9 @@
60 60  
61 61 public void getSeries(Map<String, Object> series, String bmiStr, String bregmatic);
62 62  
63   - BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version);
  63 + BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version, String doctorId);
64 64  
65   - BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version);
  65 + BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version, String doctorId);
66 66  
67 67 public void setReport(Map<String, Object> restMap, Map<Integer, String> weights, String beforeWeight,
68 68 String bmi, Map<String, String> dayWeights, String bregmatic);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java View file @ 8b22f2e
... ... @@ -6,7 +6,7 @@
6 6  
7 7 public interface TemporaryWeightService extends IBaseService {
8 8  
9   - BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId, String doctorId);
  9 + BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId);
10 10  
11 11 void updateTemporaryWeight(Query query, TemporaryWeightModel weightModel);
12 12  
13 13  
... ... @@ -18,9 +18,9 @@
18 18  
19 19 BaseResponse info(String id);
20 20  
21   - BaseResponse getWeightsReport(String phone, Integer userId, String rid);
  21 + BaseResponse getWeightsReport(String phone, Integer userId, String rid, String doctorId);
22 22  
23   - BaseResponse report(String id, Integer userId, String rid);
  23 + BaseResponse report(String id, Integer userId, String rid, String doctorId);
24 24  
25 25 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ 8b22f2e
... ... @@ -173,7 +173,7 @@
173 173 }
174 174  
175 175 @Override
176   - public BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure, String doctorId) {
  176 + public BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure) {
177 177 String hospitalId = autoMatchFacade.getHospitalId(userId);
178 178 Map<String, Object> temp = new LinkedHashMap<>();
179 179 bloodPressure.setModified(new Date());
... ... @@ -182,7 +182,6 @@
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);
186 185 // BloodPressure bp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(bloodPressure.getParentId()).and("yn").ne(0)), BloodPressure.class);
187 186 Patients p = mongoTemplate.findById(bloodPressure.getParentId(), Patients.class);
188 187 BloodPressure bp = null;
... ... @@ -678,7 +677,7 @@
678 677 }
679 678  
680 679 @Override
681   - public BaseResponse getXyPresentation(String bloodId, Integer userId) {
  680 + public BaseResponse getXyPresentation(String bloodId, Integer userId, String doctorId) {
682 681 //1.通过血压ID 查询到pnationId
683 682 Map<String, Object> datas = new HashMap<>();
684 683 Map<String, Map<Integer, Double>> series = new HashMap<>();
... ... @@ -790,18 +789,6 @@
790 789 }
791 790 }
792 791 datas.put("motion", motionList);
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 792 }
806 793  
807 794 healthChargeFacade.addHealthCharge(bloodPressure.getHospitalId(), 3, bloodPressure.getParentId(), 1, 1, userId, doctorId, false);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ 8b22f2e
... ... @@ -106,10 +106,6 @@
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   - }
113 109 bloodSugarService.update(one);
114 110 return RespBuilder.buildSuccess(one.getId());
115 111 }
... ... @@ -1056,7 +1052,7 @@
1056 1052 }
1057 1053  
1058 1054 @Override
1059   - public BaseResponse getSysBloodSugarReport(String patientId, Integer userId, String lsbId) {
  1055 + public BaseResponse getSysBloodSugarReport(String patientId, Integer userId, String lsbId, String doctorId) {
1060 1056  
1061 1057 String version = null;
1062 1058 BaseObjectResponse resp = new BaseObjectResponse();
... ... @@ -1166,30 +1162,6 @@
1166 1162 }
1167 1163 data.put("weekRange", weekRange);
1168 1164  
1169   - // 添加报告解读人
1170   - List<BloodSugar> bloodSugars = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("created").gt(DateUtil.getYMDTime())), BloodSugar.class);
1171   - List<Date> dateList = new ArrayList<>();
1172   - if (CollectionUtils.isNotEmpty(bloodSugars)) {
1173   - for (BloodSugar sugar : bloodSugars) {
1174   - Date created = sugar.getCreated();
1175   - if (created != null) {
1176   - String dbCreated = DateUtil.getyyyy_MM_dd(created);
1177   - String currentDate = DateUtil.getyyyy_MM_dd(new Date());
1178   - if (dbCreated.equals(currentDate)) {
1179   - dateList.add(created);
1180   - }
1181   - }
1182   - }
1183   - }
1184   - String doctorId = "";
1185   - if (CollectionUtils.isNotEmpty(dateList)) {
1186   - Date maxDate = Collections.max(dateList);
1187   - List<BloodSugar> sugarList = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("created").is(maxDate)), BloodSugar.class);
1188   - if (CollectionUtils.isNotEmpty(sugarList)) {
1189   - BloodSugar bloodSugar = sugarList.get(0);
1190   - doctorId = bloodSugar.getDoctorId();
1191   - }
1192   - }
1193 1165 healthChargeFacade.addHealthCharge(hospitalId, 2, patientId, 1, 1, userId, doctorId, false);
1194 1166  
1195 1167 resp.setData(data);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 8b22f2e
... ... @@ -108,7 +108,7 @@
108 108  
109 109  
110 110 @Override
111   - public BaseResponse addOrUpdate(Integer userId, PatientWeight patientWeight, String doctorId) {
  111 + public BaseResponse addOrUpdate(Integer userId, PatientWeight patientWeight) {
112 112 String hospitalId = autoMatchFacade.getHospitalId(userId);
113 113 String nowWeight = patientWeight.getNowWeight();
114 114 Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class);
... ... @@ -173,7 +173,7 @@
173 173 map.put("hospitalName", couponMapper.getHospitalName(hospitalId));
174 174 map.put("date", ymdDate);
175 175 map.put("nowWeight", nowWeight);
176   - map.put("doctorId", doctorId);
  176 + /*map.put("doctorId", doctorId);*/
177 177  
178 178 }
179 179 }
... ... @@ -183,7 +183,7 @@
183 183 m.put("hospitalName", couponMapper.getHospitalName(hospitalId));
184 184 m.put("date", ymdDate);
185 185 m.put("nowWeight", nowWeight);
186   - m.put("doctorId", doctorId);
  186 + /*m.put("doctorId", doctorId);*/
187 187 dayWeights2.add(m);
188 188 }
189 189 pw.setDayWeights2(dayWeights2);
... ... @@ -213,7 +213,7 @@
213 213 m.put("hospitalName", couponMapper.getHospitalName(hospitalId));
214 214 m.put("date", DateUtil.getyyyy_MM_dd(new Date()));
215 215 m.put("nowWeight", nowWeight);
216   - m.put("doctorId", doctorId);
  216 + /*m.put("doctorId", doctorId);*/
217 217 dayWeights2.add(m);
218 218 patientWeight.setDayWeights2(dayWeights2);
219 219  
... ... @@ -631,7 +631,7 @@
631 631 }
632 632  
633 633 @Override
634   - public BaseResponse report(String id, Integer userId, String rid, String version) {
  634 + public BaseResponse report(String id, Integer userId, String rid, String version, String doctorId) {
635 635 String hospitalId = autoMatchFacade.getHospitalId(userId);
636 636 Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId));
637 637  
... ... @@ -761,9 +761,6 @@
761 761 setReport(map, weights, patientWeight.getBeforeWeight(), patientWeight.getBmi(), patientWeight.getDayWeights(), patientWeight.getBregmatic());
762 762 CollectionUtils.removeNullValue(map);
763 763  
764   - List<Map<String, Object>> dayWeights2 = patientWeight.getDayWeights2();
765   - String doctorId = getDoctorId(dayWeights2);
766   -
767 764 healthChargeFacade.addHealthCharge(hospitalId, 1, patientWeight.getPatientId(), 1, 1, userId, doctorId, false);
768 765 PatientWeight patientWeight1 = new PatientWeight();
769 766 patientWeight1.setPrintingTime(new Date());
... ... @@ -2147,7 +2144,7 @@
2147 2144 }
2148 2145  
2149 2146 @Override
2150   - public BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version) {
  2147 + public BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version, String doctorId) {
2151 2148 Map<String, Map<Integer, Double>> series = new HashMap<>();
2152 2149 Map<String, Map<String, Object>> datas = new TreeMap<>();
2153 2150 PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(pid)), PatientWeight.class);
... ... @@ -2284,7 +2281,7 @@
2284 2281 }
2285 2282 }
2286 2283 if (datas.size() == 0) {
2287   - BaseResponse baseResponse = this.report(pid, userId, rid, version);
  2284 + BaseResponse baseResponse = this.report(pid, userId, rid, version, doctorId);
2288 2285 return baseResponse;
2289 2286 }
2290 2287 //同时出现高血压和肝硬化或肝功能不全则按照肝硬化或肝功能不全
... ... @@ -2292,23 +2289,6 @@
2292 2289 datas.put("2", datas.get("8"));
2293 2290 }
2294 2291  
2295   - List<Map<String, Object>> dayWeights2 = patientWeight.getDayWeights2();
2296   - String doctorId = "";
2297   - if (CollectionUtils.isNotEmpty(dayWeights2)) {
2298   - for (Map map : dayWeights2) {
2299   - Object data = map.get("data");
2300   - if (data != null) {
2301   - String dbData = data.toString();
2302   - String currentDate = DateUtil.getyyyy_MM_dd(new Date());
2303   - if (dbData.equals(currentDate)) {
2304   - Object doctorIdObj = map.get("doctorId");
2305   - if (doctorId != null) {
2306   - doctorId = (String) doctorIdObj;
2307   - }
2308   - }
2309   - }
2310   - }
2311   - }
2312 2292 healthChargeFacade.addHealthCharge(patientWeight.getHospitalId(), 1, patientWeight.getPatientId(), 2, 1, userId, doctorId, false);
2313 2293  
2314 2294 PatientWeight patientWeight1 = new PatientWeight();
... ... @@ -2321,7 +2301,7 @@
2321 2301 * 秦皇岛高危报告
2322 2302 */
2323 2303 @Override
2324   - public BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version) {
  2304 + public BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version, String doctorId) {
2325 2305 Map<String, Map<Integer, Double>> series = new HashMap<>();
2326 2306 Map<String, Map<String, Object>> datas = new TreeMap<>();
2327 2307 PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(pid)), PatientWeight.class);
... ... @@ -2422,7 +2402,7 @@
2422 2402 }
2423 2403 }
2424 2404 if (datas.size() == 0) {
2425   - BaseResponse baseResponse = this.report(pid, userId, rid, "1");
  2405 + BaseResponse baseResponse = this.report(pid, userId, rid, "1", doctorId);
2426 2406 return baseResponse;
2427 2407 }
2428 2408 /*//同时出现高血压和肝硬化或肝功能不全则按照肝硬化或肝功能不全
... ... @@ -2430,7 +2410,7 @@
2430 2410 datas.put("2", datas.get("8"));
2431 2411 }*/
2432 2412  
2433   - List<Map<String, Object>> dayWeights2 = patientWeight.getDayWeights2();
  2413 + /*List<Map<String, Object>> dayWeights2 = patientWeight.getDayWeights2();
2434 2414 String doctorId = "";
2435 2415 if (CollectionUtils.isNotEmpty(dayWeights2)) {
2436 2416 for (Map map : dayWeights2) {
... ... @@ -2446,7 +2426,7 @@
2446 2426 }
2447 2427 }
2448 2428 }
2449   - }
  2429 + }*/
2450 2430 healthChargeFacade.addHealthCharge(patientWeight.getHospitalId(), 1, patientWeight.getPatientId(), 2, 1, userId, doctorId, false);
2451 2431  
2452 2432 PatientWeight patientWeight1 = new PatientWeight();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java View file @ 8b22f2e
... ... @@ -58,7 +58,7 @@
58 58  
59 59  
60 60 @Override
61   - public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodPressure, Integer userId, String doctorId) {
  61 + public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodPressure, Integer userId) {
62 62 String hospitalId = autoMatchFacade.getHospitalId(userId);
63 63 Map<String, Object> temp = new LinkedHashMap<>();
64 64 bloodPressure.setModified(new Date());
... ... @@ -67,9 +67,7 @@
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 71 TemporaryUserModel temporaryUserModel = mongoTemplate.findById(bloodPressure.getTemporaryUserId(), TemporaryUserModel.class);
74 72 TemporaryBloodModel bp = null;
75 73 if (temporaryUserModel != null) {
... ... @@ -272,7 +270,7 @@
272 270 }
273 271  
274 272 @Override
275   - public BaseResponse getXyPresentation(String id, Integer userId) {
  273 + public BaseResponse getXyPresentation(String id, Integer userId, String doctorId) {
276 274 //1.通过血压ID 查询到pnationId
277 275 Map<String, Object> datas = new HashMap<>();
278 276 Map<String, Map<Integer, Double>> series = new HashMap<>();
... ... @@ -387,18 +385,6 @@
387 385 }
388 386 }
389 387 datas.put("motion", motionList);
390   - }
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 388 }
403 389 healthChargeFacade.addHealthCharge(hospitalId, 3, temporaryBloo.getTemporaryUserId(), 1, 2, userId, doctorId, false);
404 390 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java View file @ 8b22f2e
... ... @@ -294,7 +294,7 @@
294 294  
295 295  
296 296 @Override
297   - public BaseResponse getSysBloodSugarReport(String id, Integer userId, String lbsId) {
  297 + public BaseResponse getSysBloodSugarReport(String id, Integer userId, String lbsId, String doctorId) {
298 298  
299 299 String version = null;
300 300 BaseObjectResponse resp = new BaseObjectResponse();
... ... @@ -404,31 +404,6 @@
404 404 weekRange = "3";
405 405 }
406 406 data.put("weekRange", weekRange);
407   -
408   - // 添加报告解读人
409   - List<TemporaryBloodSugar> bloodSugars = mongoTemplate.find(Query.query(Criteria.where("temporaryUserId").is(id).and("created").gt(DateUtil.getYMDTime())), TemporaryBloodSugar.class);
410   - List<Date> dateList = new ArrayList<>();
411   - if (CollectionUtils.isNotEmpty(bloodSugars)) {
412   - for (TemporaryBloodSugar sugar : bloodSugars) {
413   - Date created = sugar.getCreated();
414   - if (created != null) {
415   - String dbCreated = DateUtil.getyyyy_MM_dd(created);
416   - String currentDate = DateUtil.getyyyy_MM_dd(new Date());
417   - if (dbCreated.equals(currentDate)) {
418   - dateList.add(created);
419   - }
420   - }
421   - }
422   - }
423   - String doctorId = "";
424   - if (CollectionUtils.isNotEmpty(dateList)) {
425   - Date maxDate = Collections.max(dateList);
426   - List<TemporaryBloodSugar> sugarList = mongoTemplate.find(Query.query(Criteria.where("temporaryUserId").is(id).and("created").is(maxDate)), TemporaryBloodSugar.class);
427   - if (CollectionUtils.isNotEmpty(sugarList)) {
428   - TemporaryBloodSugar bloodSugar = sugarList.get(0);
429   - doctorId = bloodSugar.getDoctorId();
430   - }
431   - }
432 407  
433 408 healthChargeFacade.addHealthCharge(hospitalId, 2, id, 1, 2, userId, doctorId, false);
434 409  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java View file @ 8b22f2e
... ... @@ -75,7 +75,7 @@
75 75 private CouponMapper couponMapper;
76 76  
77 77 @Override
78   - public BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId, String doctorId) {
  78 + public BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId) {
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);
... ... @@ -104,7 +104,7 @@
104 104 map.put("date", ymdDate);
105 105 map.put("nowWeight", nowWeight);
106 106 // 报表解读人
107   - map.put("doctorId", doctorId);
  107 + /*map.put("doctorId", doctorId);*/
108 108 }
109 109 }
110 110 if (flag) {
... ... @@ -113,7 +113,7 @@
113 113 m.put("hospitalName", couponMapper.getHospitalName(hospitalId));
114 114 m.put("date", ymdDate);
115 115 m.put("nowWeight", nowWeight);
116   - m.put("doctorId", doctorId);
  116 + /*m.put("doctorId", doctorId);*/
117 117 dayWeights2.add(m);
118 118 }
119 119 pw.setDayWeights2(dayWeights2);
... ... @@ -136,7 +136,7 @@
136 136 m.put("hospitalName", couponMapper.getHospitalName(hospitalId));
137 137 m.put("date", DateUtil.getyyyy_MM_dd(new Date()));
138 138 m.put("nowWeight", nowWeight);
139   - m.put("doctorId", doctorId);
  139 + /*m.put("doctorId", doctorId);*/
140 140 dayWeights2.add(m);
141 141 weightModel.setDayWeights2(dayWeights2);
142 142  
... ... @@ -420,7 +420,7 @@
420 420 * 体重标准报告
421 421 */
422 422 @Override
423   - public BaseResponse report(String id, Integer userId, String rid) {
  423 + public BaseResponse report(String id, Integer userId, String rid, String doctorId) {
424 424 String version = null;
425 425  
426 426 String hospitalId = autoMatchFacade.getHospitalId(userId);
... ... @@ -503,8 +503,10 @@
503 503 patientWeightService.setReport(map, weights, temporaryUser.getBeforeWeight(), temporaryWeight.getBmi(), temporaryWeight.getDayWeights(), temporaryUser.getBregmatic());
504 504 CollectionUtils.removeNullValue(map);
505 505 List<Map<String, Object>> dayWeights2 = temporaryWeight.getDayWeights2();
506   - String doctorId = patientWeightService.getDoctorId(dayWeights2);
507   - healthChargeFacade.addHealthCharge(hospitalId, 1, temporaryWeight.getTemporaryUserId(), 1, 2, userId, doctorId, false);
  506 + //String doctorId = patientWeightService.getDoctorId(dayWeights2);
  507 + if (doctorId != null) {
  508 + healthChargeFacade.addHealthCharge(hospitalId, 1, temporaryWeight.getTemporaryUserId(), 1, 2, userId, doctorId, false);
  509 + }
508 510  
509 511 TemporaryWeightModel patientWeight1 = new TemporaryWeightModel();
510 512 patientWeight1.setPrintingTime(new Date());
... ... @@ -705,7 +707,7 @@
705 707 }
706 708  
707 709 @Override
708   - public BaseResponse getWeightsReport(String id, Integer userId, String rid) {
  710 + public BaseResponse getWeightsReport(String id, Integer userId, String rid, String doctorId) {
709 711 Map<String, Map<Integer, Double>> series = new HashMap<>();
710 712 Map<String, Map<String, Object>> datas = new TreeMap<>();
711 713 String hospitalId = autoMatchFacade.getHospitalId(userId);
712 714  
... ... @@ -845,16 +847,13 @@
845 847  
846 848 // }
847 849 if (datas.size() == 0) {
848   - BaseResponse baseResponse = this.report(id, userId, rid);
  850 + BaseResponse baseResponse = this.report(id, userId, rid, doctorId);
849 851 return baseResponse;
850 852 }
851 853 //同时出现高血压和肝硬化或肝功能不全则按照肝硬化或肝功能不全
852 854 if (datas.containsKey("3") && datas.containsKey("8")) {
853 855 datas.put("2", datas.get("8"));
854 856 }
855   - List<Map<String, Object>> dayWeights2 = temporary.getDayWeights2();
856   - String doctorId = patientWeightService.getDoctorId(dayWeights2);
857   -
858 857 healthChargeFacade.addHealthCharge(hospitalId, 1, temporary.getTemporaryUserId(), 2, 2, userId, doctorId, false);
859 858 TemporaryWeightModel patientWeight1 = new TemporaryWeightModel();
860 859 patientWeight1.setPrintingTime(new Date());