jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c9babc64bc54a8f77ea89df6e83435c45a06f536

Authored by zhangchao
1 parent b45dac2415
Exists in dev

#fix:优化孕期营养报告

Showing 2 changed files with 6 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java View file @ c9babc6
... ... @@ -107,13 +107,14 @@
107 107 @RequestMapping(method = RequestMethod.GET, value = "/wx/getPatientReport")
108 108 @ResponseBody
109 109 public BaseResponse getWxPatientReport(@RequestParam String rFactor,
110   - @RequestParam Integer week,
  110 + @RequestParam Integer week,
111 111 @RequestParam String hospitalId
112 112 ){
113 113 PregnancyReportQuery pregnancyReportQuery=new PregnancyReportQuery();
114 114 pregnancyReportQuery.setWeek(week);
115 115 pregnancyReportQuery.setHospitalId(hospitalId);
116   - pregnancyReportQuery.setrFactorList(StringUtils.covertToList(rFactor, String.class));
  116 + pregnancyReportQuery.setName(rFactor);
  117 + // pregnancyReportQuery.setrFactorList(StringUtils.covertToList(rFactor, String.class));
117 118 return pregnancyReportFacade.getWxPatientReport(pregnancyReportQuery);
118 119 }
119 120  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java View file @ c9babc6
... ... @@ -115,7 +115,8 @@
115 115 pregnancyReportQuery.setWeek(getWeek(week));
116 116 List<PregnancyReport> list= pregnancyReportService.queryPregnancyReport(pregnancyReportQuery);
117 117 if (CollectionUtils.isNotEmpty(list)){
118   - for (PregnancyReport pregnancyReport:list){
  118 + /*for (PregnancyReport pregnancyReport:list){*/
  119 + PregnancyReport pregnancyReport= list.get(0);
119 120 PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery();
120 121 postpartumReportQuery.setYn(1);
121 122 postpartumReportQuery.setHospitalId(hospitalId);
... ... @@ -129,7 +130,7 @@
129 130 if (CollectionUtils.isNotEmpty(mattersList)){
130 131 pregnancyReport.setMatters(mattersList.get(0).getMatters());
131 132 }
132   - }
  133 + //}
133 134 }
134 135 BaseListResponse baseResponse=new BaseListResponse();
135 136 baseResponse.setObject(list);