diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java index 790fe98..4142ad0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java @@ -36,7 +36,6 @@ public class BabyNutritionQuery extends BaseQuery implements IConvertToNativeQue private Date nutritiTimeStart; private Date nutritiTimeEnd; - private String interpretDoctorId; private List ids; @@ -67,10 +66,6 @@ public class BabyNutritionQuery extends BaseQuery implements IConvertToNativeQue condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } - if (null != interpretDoctorId) { - condition = condition.and("interpretDoctorId", interpretDoctorId, MongoOper.IS); - } - if (null != doctorId) { condition = condition.and("doctorId", doctorId, MongoOper.IS); @@ -104,15 +99,6 @@ public class BabyNutritionQuery extends BaseQuery implements IConvertToNativeQue return condition.toMongoQuery(); } - - public String getInterpretDoctorId() { - return interpretDoctorId; - } - - public void setInterpretDoctorId(String interpretDoctorId) { - this.interpretDoctorId = interpretDoctorId; - } - public Date getCreatedEnd() { return createdEnd; } 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 c8ca77c..29ab836 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,10 +122,9 @@ 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 + 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)); + return babyNutritionFacade.queryBabyNutritionReport(id, getUserId(request), doctorId); } /** @@ -134,9 +133,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 + public BaseObjectResponse queryBabyDietReport(@PathVariable("id") String id, HttpServletRequest request, @RequestParam("doctorId")String doctorId ) { - return babyNutritionFacade.queryBabyDietReport(id, getUserId(request)); + return babyNutritionFacade.queryBabyDietReport(id, getUserId(request), doctorId); } /** 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 1638448..c5ca350 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 @@ -242,10 +242,18 @@ public class BabyNutritionFacade { babyQuery.setBabyIds(babyIds); babyQuery.setLimit(limit); babyQuery.setPage(page); + + ArrayList arrayList = new ArrayList<>(); + if (StringUtils.isNotEmpty(interpretDoctorId)) { - babyQuery.setInterpretDoctorId(interpretDoctorId); + List models = mongoTemplate.find(Query.query(Criteria.where("doctorId").is(interpretDoctorId).and("healthType").is(5)), HealthChargeModel.class); + if (CollectionUtils.isNotEmpty(models)) { + for (HealthChargeModel model : models) { + arrayList.add(model.getBabyNutritionId()); + } + } } - ArrayList arrayList = new ArrayList<>(); + if (StringUtils.isNotEmpty(settleStatus)) { List models = mongoTemplate.find(Query.query(Criteria.where("status").is(Integer.parseInt(settleStatus)).and("healthType").is(5)), HealthChargeModel.class); if (CollectionUtils.isNotEmpty(models)) { @@ -363,7 +371,7 @@ public class BabyNutritionFacade { return null; } - public BaseObjectResponse queryBabyNutritionReport(String id, Integer userId) { + public BaseObjectResponse queryBabyNutritionReport(String id, Integer userId, String doctorId) { Map data = new HashMap(); @@ -660,7 +668,7 @@ public class BabyNutritionFacade { data.put("wlysitems", wlysitems); - healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, model.getInterpretDoctorId(), true, model.getId()); + healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, doctorId, true, model.getId()); } BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(data); @@ -1285,7 +1293,7 @@ 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(); @@ -1506,7 +1514,7 @@ public class BabyNutritionFacade { } - healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, model.getInterpretDoctorId(), true, model.getId()); + healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, doctorId, true, model.getId()); } objectResponse.setData(data); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);