From 2c0e14390b828c9e1bf69536373a00ba345850ef Mon Sep 17 00:00:00 2001
From: jishenfei <jishenfei>
Date: Wed, 19 Apr 2023 16:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E9=9C=80=E6=B1=824.?=
 =?UTF-8?q?18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/LhBabyEyeCheckController.java   | 20 +++++++++---------
 .../web/controller/OrganizationController.java     | 24 ++++++++++++++--------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java
index 6610d7f..294ce2e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java
@@ -53,30 +53,30 @@ public class LhBabyEyeCheckController extends BaseController {
     }
     /**
      * 搜索儿童体检套餐是否使用
-     * @param babyCheck
+     * @param checkMonthId
      * @param request
      * @return
      */
     @ResponseBody
     @TokenRequired
-    @RequestMapping(value = "/findisTJTC",method = RequestMethod.POST)
-    public BaseResponse findisTJTC(@RequestBody LhBabyEyeCheck babyCheck, HttpServletRequest request) {
+    @RequestMapping(value = "/findisTJTC")
+    public BaseResponse findisTJTC(@RequestParam("checkMonthId") String checkMonthId, HttpServletRequest request) {
 
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         LhBabyEyelCheckQuery babyQuery = new LhBabyEyelCheckQuery();
-        babyQuery.setCheckMonthId(babyCheck.getCheckMonthId());
+        babyQuery.setCheckMonthId(checkMonthId);
         List<LhBabyEyeCheck> lhBaby = lhBabyEyeCheckService.queryList(babyQuery, Sort.Direction.DESC,new String[]{"eyeCheckTime","created"});
         BaseObjectResponse br = new BaseObjectResponse();
         if (lhBaby.size()>1){
-            br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
-            br.setErrormsg("失败");
-            br.setData(babyCheck.getId());
-            return br;
-        }
             br.setErrorcode(ErrorCodeConstants.SUCCESS);
             br.setErrormsg("成功");
-            br.setData(babyCheck.getId());
+            br.setData(checkMonthId);
             return br;
+        }
+        br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
+        br.setErrormsg("失败");
+        br.setData(checkMonthId);
+        return br;
     }
 
     /**
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
index 6009237..6d94527 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
@@ -460,29 +460,37 @@ public class OrganizationController extends BaseController {
 //                        continue;
 //                    }
                     String hname = organization.getName();
-                    if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) {
-                        continue;
+                    if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) {
+                        if (!hname.equals("秦皇岛市妇幼保健院")){
+                            continue;
+                        }
                     }
                 } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("2")) {
                     String hname = organization.getName();
 //                    if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
 //                        continue;
 //                    }
-                    if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) {
-                        continue;
+                    if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) {
+                        if (!hname.equals("秦皇岛市妇幼保健院")){
+                            continue;
+                        }
                     }
                 } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("3")) {
                     String hname = organization.getName();
 //                    if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
 //                        continue;
 //                    }
-                    if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) {
-                        continue;
+                    if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) {
+                        if (!hname.equals("秦皇岛市妇幼保健院")){
+                            continue;
+                        }
                     }
                 }else if (users.getOrgId()==216){
                     String hname = organization.getName();
-                    if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) {
-                        continue;
+                    if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) {
+                        if (!hname.equals("秦皇岛市妇幼保健院")){
+                            continue;
+                        }
                     }
                 }
                 data.add(organization);
-- 
1.8.3.1