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 121f6bd..1d84a44 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 @@ -12,6 +12,9 @@ import java.util.Map; @Document(collection = "lyms_nutrition") public class BabyNutritionModel { + // yyMonth,营养月龄:1---36月 + private Integer yyMonth; + private String id; private Double height; @@ -506,4 +509,12 @@ public class BabyNutritionModel { public void setFeedType(String feedType) { this.feedType = feedType; } + + public Integer getYyMonth() { + return yyMonth; + } + + public void setYyMonth(Integer yyMonth) { + this.yyMonth = yyMonth; + } } 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 b2bc833..243c6b5 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 @@ -176,9 +176,9 @@ public class BabyNutritionController extends BaseController { @ResponseBody @TokenRequired public BaseObjectResponse queryQhfyBabyDietReport(@PathVariable("id") String id, HttpServletRequest request, @RequestParam("doctorId")String doctorId - , @RequestParam(required = false)String oid,@RequestParam(required = false)String rid, @RequestParam(required = false) Integer yyMonth + , @RequestParam(required = false)String oid,@RequestParam(required = false)String rid ) { - return babyNutritionFacade.queryQhfyBabyDietReport(id, getUserId(request), doctorId, oid, rid,yyMonth); + return babyNutritionFacade.queryQhfyBabyDietReport(id, getUserId(request), doctorId, oid, rid); } @@ -196,7 +196,7 @@ public class BabyNutritionController extends BaseController { { return babyNutritionFacade.queryBabyDietReport(id, null, null); } - return babyNutritionFacade.queryQhfyBabyDietReport(id, null, null,null,null,null); + return babyNutritionFacade.queryQhfyBabyDietReport(id, null, null,null,null); } @@ -204,16 +204,15 @@ public class BabyNutritionController extends BaseController { /** * 查询选择 month * @param id - * @param yyMonth //如果选择了营养月龄,就按照营养月龄出报告的评价和文字内容 * @param request * @return */ @RequestMapping(value = "/queryQhdDeitSelect", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse queryQhdDeitSelect(@RequestParam(required = true) String id, @RequestParam(required = false) Integer yyMonth, HttpServletRequest request + public BaseObjectResponse queryQhdDeitSelect(@RequestParam(required = true) String id,HttpServletRequest request ) { - return babyNutritionFacade.queryQhdDeitSelect(id, getUserId(request),yyMonth); + return babyNutritionFacade.queryQhdDeitSelect(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 df506bb..52c8920 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 @@ -165,6 +165,8 @@ public class BabyNutritionFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); BabyNutritionModel model = request.convertToDataModel(); + model.setYyMonth(request.getYyMonth()); + if (StringUtils.isNotEmpty(model.getId())) { model.setModified(new Date()); babyNutritionService.updateBabyNutrition(model, model.getId()); @@ -1890,7 +1892,7 @@ public class BabyNutritionFacade { /** * 秦皇岛市妇幼精简版儿童膳食报告 */ - public BaseObjectResponse queryQhfyBabyDietReport(String id, Integer userId, String doctorId,String oid,String rid,Integer yyMonth + public BaseObjectResponse queryQhfyBabyDietReport(String id, Integer userId, String doctorId,String oid,String rid ) { BaseObjectResponse objectResponse = new BaseObjectResponse(); Map data = new HashMap(); @@ -1937,18 +1939,18 @@ public class BabyNutritionFacade { Map weightRes = babyCheckFacade.getGrowthValueMapNew(DateUtil.getyyyy_MM_dd(baby.getBirth()) - , model.getWeight(), baby.getSex(), null, baby.getId(), DateUtil.getyyyy_MM_dd(model.getNutritiTime()),yyMonth); + , model.getWeight(), baby.getSex(), null, baby.getId(), DateUtil.getyyyy_MM_dd(model.getNutritiTime()),model.getYyMonth()); Map heightRes = babyCheckFacade.getGrowthValue1MapNew(DateUtil.getyyyy_MM_dd(baby.getBirth()) - , model.getHeight(), baby.getSex(), 1, null, DateUtil.getyyyy_MM_dd(model.getNutritiTime()),yyMonth); + , model.getHeight(), baby.getSex(), 1, null, DateUtil.getyyyy_MM_dd(model.getNutritiTime()),model.getYyMonth()); //体重评价 map.put("weightEvaluate", weightRes.get("res")); //身高评价 map.put("heightEvaluate", heightRes.get("res")); int month = DateUtil.getMonth(baby.getBirth(), model.getNutritiTime()); - if(yyMonth != null){ - month = yyMonth; //如果选择了营养月龄,就按照营养月龄出报告的评价和文字内容 + if(model.getYyMonth() != null){ + month = model.getYyMonth(); //如果选择了营养月龄,就按照营养月龄出报告的评价和文字内容 } if (month > 60) { return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("月龄范围没有报告"); @@ -2284,7 +2286,7 @@ public class BabyNutritionFacade { return objectResponse; } - public BaseObjectResponse queryQhdDeitSelect(String id, Integer userId,Integer yyMonth) { + public BaseObjectResponse queryQhdDeitSelect(String id, Integer userId) { BabyNutritionQuery babyQuery = new BabyNutritionQuery(); String hospitalId = autoMatchFacade.getHospitalId(userId); babyQuery.setHospitalId(hospitalId); @@ -2315,8 +2317,8 @@ public class BabyNutritionFacade { BabyModel baby = babyBookbuildingService.queryBabyBuildById(model.getBabyId()); int month = DateUtil.getMonth(baby.getBirth(), model.getNutritiTime()); - if(yyMonth != null){ - month = yyMonth; //如果选择了营养月龄,就按照营养月龄出报告的评价和文字内容 + if(model.getYyMonth() != null){ + month = model.getYyMonth(); //如果选择了营养月龄,就按照营养月龄出报告的评价和文字内容 } if (month > 60) { return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("月龄范围没有报告"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java index 01c650f..f6f30b8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java @@ -14,6 +14,8 @@ import java.util.Map; */ public class BabyNutritionRequest implements IBasicRequestConvert { + // yyMonth,营养月龄:1---36月 + private Integer yyMonth; private String id; @@ -548,4 +550,12 @@ public class BabyNutritionRequest implements IBasicRequestConvert