jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5658c5d4d6052d3687f5a7856aec1cf0f99ce951

Authored by shiyang
1 parent 8b4a8dc6c7
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

中医指导：儿童小程序接口-文章查询优化

Showing 2 changed files with 23 additions and 28 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MedicineArticleController.java View file @ 5658c5d
... ... @@ -70,32 +70,31 @@
70 70  
71 71 return medicineArticleFacade.queryUpDate(id);
72 72 }
  73 +
73 74 /**
74   - * 儿保检查-根据文章类型查询
  75 + * 文章列表列表
75 76 * @param modelQuery
76 77 * @return
77 78 */
78 79 @ResponseBody
79 80 @TokenRequired
80   - @RequestMapping(value = "/queryBabyCheckArticleTypes",method = RequestMethod.GET)
81   - public BaseResponse queryUpDate(MedicineArticleQuery modelQuery, HttpServletRequest request) {
82   - LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
83   - return medicineArticleFacade.queryBabyCheckArticleTypes(modelQuery,loginState.getId());
  81 + @RequestMapping(value = "/queryListPage",method = RequestMethod.GET)
  82 + public BaseResponse queryListPage(MedicineArticleQuery modelQuery) {
  83 + return medicineArticleFacade.queryListPage(modelQuery);
84 84 }
85 85  
86 86 /**
87   - * 文章列表列表
  87 + * 儿保检查-根据文章类型查询
88 88 * @param modelQuery
89   - * @param request
90 89 * @return
91 90 */
92 91 @ResponseBody
93 92 @TokenRequired
94   - @RequestMapping(value = "/queryListPage",method = RequestMethod.GET)
95   - public BaseResponse queryListPage(MedicineArticleQuery modelQuery, HttpServletRequest request) {
96   - LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
97   - return medicineArticleFacade.queryListPage(modelQuery,loginState.getId());
  93 + @RequestMapping(value = "/queryBabyCheckArticleTypes",method = RequestMethod.GET)
  94 + public BaseResponse queryUpDate(MedicineArticleQuery modelQuery) {
  95 + return medicineArticleFacade.queryBabyCheckArticleTypes(modelQuery);
98 96 }
  97 +
99 98 /**
100 99 * 儿童小程序接口-文章查询
101 100 * @param id
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicineArticleFacade.java View file @ 5658c5d
... ... @@ -95,23 +95,8 @@
95 95 return br;
96 96 }
97 97  
98   - public BaseResponse queryBabyCheckArticleTypes(MedicineArticleQuery request, Integer userid) {
99   - String hospitalId = autoMatchFacade.getHospitalId(userid);
100   - request.setHospitalId(hospitalId);
  98 + public BaseResponse queryListPage(MedicineArticleQuery request) {
101 99 request.setYn(YnEnums.YES.getId());
102   - request.setNeed(null);
103   - List<MedicineArticleModel> resultList=medicineArticleService.queryList(request, Sort.Direction.DESC,new String[]{"created"});
104   - BaseObjectResponse br = new BaseObjectResponse();
105   - br.setErrorcode(ErrorCodeConstants.SUCCESS);
106   - br.setData(resultList);
107   - br.setErrormsg("成功");
108   - return br;
109   - }
110   -
111   - public BaseResponse queryListPage(MedicineArticleQuery request, Integer userid) {
112   - String hospitalId = autoMatchFacade.getHospitalId(userid);
113   - request.setHospitalId(hospitalId);
114   - request.setYn(YnEnums.YES.getId());
115 100 request.setNeed("true");
116 101 if (request.getCreatedEnd() != null) {
117 102 request.setCreatedEnd(DateUtil.getDayLastSecond(request.getCreatedEnd()));
... ... @@ -120,7 +105,7 @@
120 105 List<Map> result=new ArrayList<>();
121 106 for (MedicineArticleModel model : resultList) {
122 107 Map<String,Object> map= ReflectionUtils.beanToMap(model);//对象转map
123   - map.put("hospitalName",couponMapper.getHospitalName(hospitalId));
  108 + map.put("hospitalName",couponMapper.getHospitalName(model.getHospitalId()));
124 109 result.add(map);
125 110 }
126 111  
... ... @@ -128,6 +113,17 @@
128 113 br.setErrorcode(ErrorCodeConstants.SUCCESS);
129 114 br.setData(result);
130 115 br.setPageInfo(request.getPageInfo());
  116 + br.setErrormsg("成功");
  117 + return br;
  118 + }
  119 +
  120 + public BaseResponse queryBabyCheckArticleTypes(MedicineArticleQuery request) {
  121 + request.setYn(YnEnums.YES.getId());
  122 + request.setNeed(null);
  123 + List<MedicineArticleModel> resultList=medicineArticleService.queryList(request, Sort.Direction.DESC,new String[]{"created"});
  124 + BaseObjectResponse br = new BaseObjectResponse();
  125 + br.setErrorcode(ErrorCodeConstants.SUCCESS);
  126 + br.setData(resultList);
131 127 br.setErrormsg("成功");
132 128 return br;
133 129 }