优化提示

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

@@ -785,26 +785,9 @@ 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 medicalDevice2 IS NOT NULL
+                        WHEN medical_device2 IS NOT NULL
                             AND medical_device2_expiry_end IS NOT NULL
                             AND medical_device2_expiry_end < CURDATE()
                             AND is_medical_device2_expiry_permanent != 1
@@ -812,7 +795,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         ELSE ''
                         END,
                     CASE
-                        WHEN medicalDevice2 IS NOT NULL
+                        WHEN medical_device2 IS NOT NULL
                             AND medical_device2_expiry_end IS NOT NULL
                             AND medical_device2_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 3 MONTH)
                             AND is_medical_device2_expiry_permanent != 1
@@ -821,7 +804,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         END,
                 -- 三类器械经营许可证
                     CASE
-                        WHEN medicalDevice3 IS NOT NULL
+                        WHEN medical_device3 IS NOT NULL
                             AND medical_device3_expiry_end IS NOT NULL
                             AND medical_device3_expiry_end < CURDATE()
                             AND is_medical_device3_expiry_permanent != 1
@@ -829,7 +812,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         ELSE ''
                         END,
                     CASE
-                        WHEN medicalDevice3 IS NOT NULL
+                        WHEN medical_device3 IS NOT NULL
                             AND medical_device3_expiry_end IS NOT NULL
                             AND medical_device3_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 3 MONTH)
                             AND is_medical_device3_expiry_permanent != 1
@@ -868,18 +851,13 @@ 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 (medicalDevice2 IS NOT NULL
+                OR (medical_device2 IS NOT NULL
                 AND medical_device2_expiry_end IS NOT NULL
                 AND (medical_device2_expiry_end < CURDATE() OR medical_device2_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 3 MONTH))
                 AND is_medical_device2_expiry_permanent != 1)
                 -- 三类器械经营许可证
-                OR (medicalDevice3 IS NOT NULL
+                OR (medical_device3 IS NOT NULL
                 AND medical_device3_expiry_end IS NOT NULL
                 AND (medical_device3_expiry_end < CURDATE() OR medical_device3_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 3 MONTH))
                 AND is_medical_device3_expiry_permanent != 1)