jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 710e19d947afe8e59339e59b6f519986cee471a2

Authored by zhangchao
1 parent c9babc64bc
Exists in dev

#fix:孕期营养报告，新增详情及患者报告接口，增加报告名称字段

Showing 2 changed files with 21 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java View file @ 710e19d
... ... @@ -77,14 +77,15 @@
77 77 @RequestMapping(method = RequestMethod.GET, value = "/getPatientReport")
78 78 @ResponseBody
79 79 @TokenRequired
80   - public BaseResponse getPatientReport(@RequestParam(required = false) String rFactor,
  80 + public BaseResponse getPatientReport(@RequestParam(required = false) String name,
81 81 @RequestParam(required = false) Integer week,
82 82 @RequestParam(required = false) Integer weightType,
83 83 HttpServletRequest request){
84 84 PregnancyReportQuery pregnancyReportQuery=new PregnancyReportQuery();
85 85 pregnancyReportQuery.setWeek(week);
86 86 pregnancyReportQuery.setWeightType(weightType);
87   - pregnancyReportQuery.setrFactorList(StringUtils.covertToList(rFactor, String.class));
  87 + pregnancyReportQuery.setName(name);
  88 + //pregnancyReportQuery.setrFactorList(StringUtils.covertToList(rFactor, String.class));
88 89 return pregnancyReportFacade.getPatientReport(pregnancyReportQuery,getUserId(request));
89 90 }
90 91  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java View file @ 710e19d
... ... @@ -69,7 +69,21 @@
69 69 List<PregnancyReport> list= pregnancyReportService.queryPregnancyReport(pregnancyReportQuery);
70 70 BaseResponse baseResponse=new BaseResponse();
71 71 if (CollectionUtils.isNotEmpty(list)){
72   - baseResponse.setObject(list);
  72 + PregnancyReport pregnancyReport= list.get(0);
  73 + PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery();
  74 + postpartumReportQuery.setYn(1);
  75 + postpartumReportQuery.setHospitalId(pregnancyReportQuery.getHospitalId());
  76 + postpartumReportQuery.setWeek(week);
  77 + Integer riskType=1;
  78 + if (pregnancyReport.getRiskFactorName().contains("健康")){
  79 + riskType=0;
  80 + }
  81 + postpartumReportQuery.setRiskType(riskType);
  82 + List<PregnancyReportMatters> mattersList= pregnancyReportMattersService.queryPregnancyReport(postpartumReportQuery);
  83 + if (CollectionUtils.isNotEmpty(mattersList)){
  84 + pregnancyReport.setMatters(mattersList.get(0).getMatters());
  85 + }
  86 + baseResponse.setObject(pregnancyReport);
73 87 }
74 88 baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
75 89 baseResponse.setErrormsg("成功");
... ... @@ -115,8 +129,8 @@
115 129 pregnancyReportQuery.setWeek(getWeek(week));
116 130 List<PregnancyReport> list= pregnancyReportService.queryPregnancyReport(pregnancyReportQuery);
117 131 if (CollectionUtils.isNotEmpty(list)){
118   - /*for (PregnancyReport pregnancyReport:list){*/
119   - PregnancyReport pregnancyReport= list.get(0);
  132 + for (PregnancyReport pregnancyReport:list){
  133 + //PregnancyReport pregnancyReport= list.get(0);
120 134 PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery();
121 135 postpartumReportQuery.setYn(1);
122 136 postpartumReportQuery.setHospitalId(hospitalId);
... ... @@ -130,7 +144,7 @@
130 144 if (CollectionUtils.isNotEmpty(mattersList)){
131 145 pregnancyReport.setMatters(mattersList.get(0).getMatters());
132 146 }
133   - //}
  147 + }
134 148 }
135 149 BaseListResponse baseResponse=new BaseListResponse();
136 150 baseResponse.setObject(list);