Commit 7641836aa8995a6201460305dff8011dda90e983
1 parent
9f0093b8e5
Exists in
master
and in
6 other branches
回退版本
Showing 3 changed files with 33 additions and 11 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java
View file @
7641836
... | ... | @@ -121,6 +121,20 @@ |
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 | 138 | public List<String> getFoods() { |
125 | 139 | return foods; |
126 | 140 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java
View file @
7641836
... | ... | @@ -122,8 +122,10 @@ |
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, @RequestParam("doctorId") String doctorId) { | |
126 | - return babyNutritionFacade.queryBabyNutritionReport(id, getUserId(request), doctorId); | |
125 | + public BaseObjectResponse queryBabyNutritionReport(@PathVariable("id") String id, HttpServletRequest request//, @RequestParam("doctorId") String doctorId | |
126 | + ) { | |
127 | + //return babyNutritionFacade.queryBabyNutritionReport(id, getUserId(request), doctorId); | |
128 | + return babyNutritionFacade.queryBabyNutritionReport(id, getUserId(request)); | |
127 | 129 | } |
128 | 130 | |
129 | 131 | /** |
... | ... | @@ -132,8 +134,9 @@ |
132 | 134 | @RequestMapping(value = "/queryBabyDietReport/{id}", method = RequestMethod.GET) |
133 | 135 | @ResponseBody |
134 | 136 | @TokenRequired |
135 | - public BaseObjectResponse queryBabyDietReport(@PathVariable("id") String id, HttpServletRequest request, @RequestParam("doctorId")String doctorId) { | |
136 | - return babyNutritionFacade.queryBabyDietReport(id, getUserId(request), doctorId); | |
137 | + public BaseObjectResponse queryBabyDietReport(@PathVariable("id") String id, HttpServletRequest request//, @RequestParam("doctorId")String doctorId | |
138 | + ) { | |
139 | + return babyNutritionFacade.queryBabyDietReport(id, getUserId(request)); | |
137 | 140 | } |
138 | 141 | |
139 | 142 | /** |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
View file @
7641836
... | ... | @@ -321,10 +321,14 @@ |
321 | 321 | map.put("height", model.getHeight()); |
322 | 322 | map.put("recordTime", DateUtil.getyyyy_MM_dd(model.getNutritiTime())); |
323 | 323 | |
324 | - // 新增报表解读人和结算状态 | |
325 | - HealthChargeModel chargeModel = mongoTemplate.findOne(Query.query(Criteria.where("babyNutritionId").is(model.getId())), HealthChargeModel.class); | |
326 | 324 | |
327 | - String currInterpretDoctorId = chargeModel.getDoctorId(); | |
325 | + | |
326 | + | |
327 | + // 回退版本 | |
328 | + String currInterpretDoctorId = model.getInterpretDoctorId(); | |
329 | + // 新增报表解读人和结算状态 | |
330 | + /* HealthChargeModel chargeModel = mongoTemplate.findOne(Query.query(Criteria.where("babyNutritionId").is(model.getId())), HealthChargeModel.class); | |
331 | + String currInterpretDoctorId = chargeModel.getDoctorId();*/ | |
328 | 332 | String interpretDoctorName = ""; |
329 | 333 | if (StringUtils.isNotEmpty(currInterpretDoctorId)) { |
330 | 334 | Users users = usersService.getUsers(Integer.parseInt(currInterpretDoctorId)); |
... | ... | @@ -359,7 +363,7 @@ |
359 | 363 | return null; |
360 | 364 | } |
361 | 365 | |
362 | - public BaseObjectResponse queryBabyNutritionReport(String id, Integer userId, String doctorId) { | |
366 | + public BaseObjectResponse queryBabyNutritionReport(String id, Integer userId) { | |
363 | 367 | |
364 | 368 | |
365 | 369 | Map data = new HashMap(); |
... | ... | @@ -656,7 +660,7 @@ |
656 | 660 | |
657 | 661 | data.put("wlysitems", wlysitems); |
658 | 662 | |
659 | - healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, doctorId, true, model.getId()); | |
663 | + healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, model.getInterpretDoctorId(), true, model.getId()); | |
660 | 664 | } |
661 | 665 | BaseObjectResponse objectResponse = new BaseObjectResponse(); |
662 | 666 | objectResponse.setData(data); |
... | ... | @@ -1281,7 +1285,8 @@ |
1281 | 1285 | /** |
1282 | 1286 | * 秦皇岛精简版儿童膳食报告 |
1283 | 1287 | */ |
1284 | - public BaseObjectResponse queryBabyDietReport(String id, Integer userId, String doctorId) { | |
1288 | + public BaseObjectResponse queryBabyDietReport(String id, Integer userId //String doctorId | |
1289 | + ) { | |
1285 | 1290 | BaseObjectResponse objectResponse = new BaseObjectResponse(); |
1286 | 1291 | Map data = new HashMap(); |
1287 | 1292 | |
... | ... | @@ -1501,7 +1506,7 @@ |
1501 | 1506 | } |
1502 | 1507 | |
1503 | 1508 | |
1504 | - healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, doctorId, true, model.getId()); | |
1509 | + healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, model.getInterpretDoctorId(), true, model.getId()); | |
1505 | 1510 | } |
1506 | 1511 | objectResponse.setData(data); |
1507 | 1512 | objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |