From 7641836aa8995a6201460305dff8011dda90e983 Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Thu, 8 Aug 2019 09:54:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/pojo/BabyNutritionModel.java | 14 ++++++++++++++ .../web/controller/BabyNutritionController.java | 11 +++++++---- .../operate/web/facade/BabyNutritionFacade.java | 19 ++++++++++++------- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java index 1acc2a6..49c6e1c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java @@ -121,6 +121,20 @@ public class BabyNutritionModel { private String remark; + /** + * 解读医生 + */ + private String interpretDoctorId; + + public String getInterpretDoctorId() { + return interpretDoctorId; + } + + public void setInterpretDoctorId(String interpretDoctorId) { + this.interpretDoctorId = interpretDoctorId; + } + + public List getFoods() { return foods; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java index a5be049..c8ca77c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java @@ -122,8 +122,10 @@ public class BabyNutritionController extends BaseController { @RequestMapping(value = "/queryBabyNutritionReport/{id}", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse queryBabyNutritionReport(@PathVariable("id") String id, HttpServletRequest request, @RequestParam("doctorId") String doctorId) { - return babyNutritionFacade.queryBabyNutritionReport(id, getUserId(request), doctorId); + public BaseObjectResponse queryBabyNutritionReport(@PathVariable("id") String id, HttpServletRequest request//, @RequestParam("doctorId") String doctorId + ) { + //return babyNutritionFacade.queryBabyNutritionReport(id, getUserId(request), doctorId); + return babyNutritionFacade.queryBabyNutritionReport(id, getUserId(request)); } /** @@ -132,8 +134,9 @@ public class BabyNutritionController extends BaseController { @RequestMapping(value = "/queryBabyDietReport/{id}", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse queryBabyDietReport(@PathVariable("id") String id, HttpServletRequest request, @RequestParam("doctorId")String doctorId) { - return babyNutritionFacade.queryBabyDietReport(id, getUserId(request), doctorId); + public BaseObjectResponse queryBabyDietReport(@PathVariable("id") String id, HttpServletRequest request//, @RequestParam("doctorId")String doctorId + ) { + return babyNutritionFacade.queryBabyDietReport(id, getUserId(request)); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index dd180a9..1638448 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -321,10 +321,14 @@ public class BabyNutritionFacade { map.put("height", model.getHeight()); map.put("recordTime", DateUtil.getyyyy_MM_dd(model.getNutritiTime())); - // 新增报表解读人和结算状态 - HealthChargeModel chargeModel = mongoTemplate.findOne(Query.query(Criteria.where("babyNutritionId").is(model.getId())), HealthChargeModel.class); - String currInterpretDoctorId = chargeModel.getDoctorId(); + + + // 回退版本 + String currInterpretDoctorId = model.getInterpretDoctorId(); + // 新增报表解读人和结算状态 + /* HealthChargeModel chargeModel = mongoTemplate.findOne(Query.query(Criteria.where("babyNutritionId").is(model.getId())), HealthChargeModel.class); + String currInterpretDoctorId = chargeModel.getDoctorId();*/ String interpretDoctorName = ""; if (StringUtils.isNotEmpty(currInterpretDoctorId)) { Users users = usersService.getUsers(Integer.parseInt(currInterpretDoctorId)); @@ -359,7 +363,7 @@ public class BabyNutritionFacade { return null; } - public BaseObjectResponse queryBabyNutritionReport(String id, Integer userId, String doctorId) { + public BaseObjectResponse queryBabyNutritionReport(String id, Integer userId) { Map data = new HashMap(); @@ -656,7 +660,7 @@ public class BabyNutritionFacade { data.put("wlysitems", wlysitems); - healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, doctorId, true, model.getId()); + healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, model.getInterpretDoctorId(), true, model.getId()); } BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(data); @@ -1281,7 +1285,8 @@ public class BabyNutritionFacade { /** * 秦皇岛精简版儿童膳食报告 */ - public BaseObjectResponse queryBabyDietReport(String id, Integer userId, String doctorId) { + public BaseObjectResponse queryBabyDietReport(String id, Integer userId //String doctorId + ) { BaseObjectResponse objectResponse = new BaseObjectResponse(); Map data = new HashMap(); @@ -1501,7 +1506,7 @@ public class BabyNutritionFacade { } - healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, doctorId, true, model.getId()); + healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, model.getInterpretDoctorId(), true, model.getId()); } objectResponse.setData(data); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); -- 1.8.3.1