店铺异常问题、优化资质过期定时任务逻辑，处理店未回显数据问题

fs-service/src/main/java/com/fs/his/vo/FsDoctorListVO.java

@@ -129,4 +129,6 @@ public class FsDoctorListVO {
     private Long   prescribeDoctorId;
 
     private Long storeId;
+
+    private String signUrl;
 }

fs-service/src/main/java/com/fs/hisStore/param/FsStoreScrmInfoParam.java

@@ -261,4 +261,9 @@ public class FsStoreScrmInfoParam extends BaseEntity
      **/
     private Byte isMedicalLicenseExpiryPermanent;
 
+    /**
+     * 一类器械生产备案是否长期有效（1长期有效、0非长期有效）
+     **/
+    private Byte isMedicalDevice1ExpiryPermanent;
+
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreScrmServiceImpl.java

@@ -440,15 +440,6 @@ public class FsStoreScrmServiceImpl implements IFsStoreScrmService {
         FsStoreScrm updateStore = new FsStoreScrm();
         BeanUtils.copyProperties(fsStore, updateStore);
         updateStore.setUpdateTime(DateUtils.getNowDate());
-        //验证资质日期是否正常
-        LocalDate today = LocalDate.now(ZoneId.of("Asia/Shanghai"));
-        if (fsStore.getBusinessLicenseExpireEnd().isBefore(today) || fsStore.getDrugLicenseExpiryEnd().isBefore(today)
-                || fsStore.getMedicalDevice2ExpiryEnd().isBefore(today) || fsStore.getMedicalLicenseExpiryEnd().isBefore(today)) {
-            updateStore.setStatus(0);
-        } else {
-            updateStore.setStatus(1);
-        }
-
         return fsStoreMapper.updateFsStore(updateStore);
     }
 

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreDetailsScrmVo.java

@@ -272,4 +272,10 @@ public class FsStoreDetailsScrmVo extends BaseEntity
      * 医疗机构执业许可证是否长期有效（1长期有效、0非长期有效）
      **/
     private Byte isMedicalLicenseExpiryPermanent;
+
+    /**
+     * 一类器械生产备案是否长期有效（1长期有效、0非长期有效）
+     **/
+    private Byte isMedicalDevice1ExpiryPermanent;
+
 }

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

@@ -494,10 +494,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         fs_store_scrm
         WHERE
         `status` = 1
-        AND (business_license_expire_end < CURDATE() AND is_business_license_permanent != 1)
-        OR drug_license_expiry_end < CURDATE()
-        OR medical_device2_expiry_end < CURDATE()
-        OR medical_license_expiry_end < CURDATE()
+        AND (( business_license_expire_end < CURDATE() AND is_business_license_permanent != 1 )
+        OR (drug_license_expiry_end < CURDATE() AND is_drug_license_permanent != 1)
+        OR (medical_device2_expiry_end < CURDATE() AND is_medical_device2_expiry_permanent != 1)
+        OR (medical_license_expiry_end < CURDATE() AND is_medical_license_expiry_permanent != 1)
+        OR (medical_device1_expiry_end IS NOT NULL AND medical_device1_expiry_end < CURDATE() AND is_medical_device1_expiry_permanent != 1)
+        OR (medical_device3_expiry_end IS NOT NULL AND medical_device3_expiry_end < CURDATE() AND is_medical_device3_expiry_permanent != 1)
+        OR (food_license_expiry_end IS NOT NULL AND food_license_expiry_end < CURDATE() AND is_food_license_expiry_permanent != 1))
     </select>
 
     <update id="batchUpdateStoreStatusById">