From 5658c5d4d6052d3687f5a7856aec1cf0f99ce951 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Fri, 1 Apr 2022 15:06:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=8C=BB=E6=8C=87=E5=AF=BC=EF=BC=9A?=
 =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?-=E6=96=87=E7=AB=A0=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/MedicineArticleController.java  | 21 ++++++++-------
 .../operate/web/facade/MedicineArticleFacade.java  | 30 ++++++++++------------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MedicineArticleController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MedicineArticleController.java
index 1ada36b..180c9ea 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MedicineArticleController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MedicineArticleController.java
@@ -70,32 +70,31 @@ public class MedicineArticleController extends BaseController {
 
         return medicineArticleFacade.queryUpDate(id);
     }
+
     /**
-     * 儿保检查-根据文章类型查询
+     * 文章列表列表
      * @param modelQuery
      * @return
      */
     @ResponseBody
     @TokenRequired
-    @RequestMapping(value = "/queryBabyCheckArticleTypes",method = RequestMethod.GET)
-    public BaseResponse queryUpDate(MedicineArticleQuery modelQuery, HttpServletRequest request) {
-        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        return medicineArticleFacade.queryBabyCheckArticleTypes(modelQuery,loginState.getId());
+    @RequestMapping(value = "/queryListPage",method = RequestMethod.GET)
+    public BaseResponse queryListPage(MedicineArticleQuery modelQuery) {
+        return medicineArticleFacade.queryListPage(modelQuery);
     }
 
     /**
-     * 文章列表列表
+     * 儿保检查-根据文章类型查询
      * @param modelQuery
-     * @param request
      * @return
      */
     @ResponseBody
     @TokenRequired
-    @RequestMapping(value = "/queryListPage",method = RequestMethod.GET)
-    public BaseResponse queryListPage(MedicineArticleQuery modelQuery, HttpServletRequest request) {
-        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        return medicineArticleFacade.queryListPage(modelQuery,loginState.getId());
+    @RequestMapping(value = "/queryBabyCheckArticleTypes",method = RequestMethod.GET)
+    public BaseResponse queryUpDate(MedicineArticleQuery modelQuery) {
+        return medicineArticleFacade.queryBabyCheckArticleTypes(modelQuery);
     }
+
     /**
      * 儿童小程序接口-文章查询
      * @param id
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicineArticleFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicineArticleFacade.java
index 2207ff3..d102c13 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicineArticleFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicineArticleFacade.java
@@ -95,22 +95,7 @@ public class MedicineArticleFacade {
         return br;
     }
 
-    public BaseResponse queryBabyCheckArticleTypes(MedicineArticleQuery request, Integer userid) {
-        String hospitalId = autoMatchFacade.getHospitalId(userid);
-        request.setHospitalId(hospitalId);
-        request.setYn(YnEnums.YES.getId());
-        request.setNeed(null);
-        List<MedicineArticleModel> resultList=medicineArticleService.queryList(request, Sort.Direction.DESC,new String[]{"created"});
-        BaseObjectResponse br = new BaseObjectResponse();
-        br.setErrorcode(ErrorCodeConstants.SUCCESS);
-        br.setData(resultList);
-        br.setErrormsg("成功");
-        return br;
-    }
-
-    public BaseResponse queryListPage(MedicineArticleQuery request, Integer userid) {
-        String hospitalId = autoMatchFacade.getHospitalId(userid);
-        request.setHospitalId(hospitalId);
+    public BaseResponse queryListPage(MedicineArticleQuery request) {
         request.setYn(YnEnums.YES.getId());
         request.setNeed("true");
         if (request.getCreatedEnd() != null) {
@@ -120,7 +105,7 @@ public class MedicineArticleFacade {
         List<Map> result=new ArrayList<>();
         for (MedicineArticleModel model : resultList) {
             Map<String,Object> map= ReflectionUtils.beanToMap(model);//对象转map
-            map.put("hospitalName",couponMapper.getHospitalName(hospitalId));
+            map.put("hospitalName",couponMapper.getHospitalName(model.getHospitalId()));
             result.add(map);
         }
 
@@ -132,6 +117,17 @@ public class MedicineArticleFacade {
         return br;
     }
 
+    public BaseResponse queryBabyCheckArticleTypes(MedicineArticleQuery request) {
+        request.setYn(YnEnums.YES.getId());
+        request.setNeed(null);
+        List<MedicineArticleModel> resultList=medicineArticleService.queryList(request, Sort.Direction.DESC,new String[]{"created"});
+        BaseObjectResponse br = new BaseObjectResponse();
+        br.setErrorcode(ErrorCodeConstants.SUCCESS);
+        br.setData(resultList);
+        br.setErrormsg("成功");
+        return br;
+    }
+
     public BaseResponse queryArticleBabyApp(String id) {
         if(StringUtils.isEmpty(id)){
             return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("参数错误");
-- 
1.8.3.1