修改店铺提醒，一类器械不提示

fs-admin/src/main/java/com/fs/web/controller/system/SysUserController.java

@@ -293,16 +293,6 @@ public class SysUserController extends BaseController
     @Log(title = "总后台：商家证件即将过期或已过期提醒", businessType = BusinessType.OTHER)
     @GetMapping("/storeRecommendNotice")
     public R storeRecommendNotice(){
-//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        //判断是否有权限
-//        if(userService.checkUserAuthority(loginUser.getUserId())){
-//            //有权限则进入判断是否协议过期
-//            List<String> storeList=storeScrmService.queryValidStoreQualifications();
-//            if(!storeList.isEmpty()){
-//                //拼接提示语句
-//                return R.ok().put("code",200).put("data",storeList);
-//            }
-//        }
         //有权限则进入判断是否协议过期
         List<String> storeList=storeScrmService.queryValidStoreQualifications();
         if(!storeList.isEmpty()){

fs-service/src/main/resources/mapper/hisStore/FsStoreScrmMapper.xml

@@ -629,23 +629,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             THEN '药品经营许可证3个月内过期，请注意更新；'
                         ELSE ''
                         END,
-                -- 一类器械生产备案
-                    CASE
-                        WHEN medical_device1 IS NOT NULL
-                            AND medical_device1_expiry_end IS NOT NULL
-                            AND medical_device1_expiry_end < CURDATE()
-                            AND is_medical_device1_expiry_permanent != 1
-            THEN '一类器械生产备案已过期，需要商家更新；'
-                        ELSE ''
-                        END,
-                    CASE
-                        WHEN medical_device1 IS NOT NULL
-                            AND medical_device1_expiry_end IS NOT NULL
-                            AND medical_device1_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 3 MONTH)
-                            AND is_medical_device1_expiry_permanent != 1
-            THEN '一类器械生产备案3个月内过期，请注意更新；'
-                        ELSE ''
-                        END,
                 -- 二类医疗器械备案
                     CASE
                         WHEN medical_device2 IS NOT NULL
@@ -728,11 +711,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND drug_license_expiry_end IS NOT NULL
                 AND (drug_license_expiry_end < CURDATE() OR drug_license_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 3 MONTH))
                 AND is_drug_license_permanent != 1)
-                -- 一类器械生产备案
-                OR (medical_device1 IS NOT NULL
-                AND medical_device1_expiry_end IS NOT NULL
-                AND (medical_device1_expiry_end < CURDATE() OR medical_device1_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 3 MONTH))
-                AND is_medical_device1_expiry_permanent != 1)
                 -- 二类医疗器械备案
                 OR (medical_device2 IS NOT NULL
                 AND medical_device2_expiry_end IS NOT NULL