18339543638 3 lat temu
rodzic
commit
9b89c651fb

+ 2 - 4
nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/config/HospitalFinishMonitorConfigHandler.java

@@ -96,8 +96,7 @@ public class HospitalFinishMonitorConfigHandler extends AbstractHospitalConfigHa
                 .timestamp(new Date())
                 .build();
 
-//        lastNoSignalFinish = new DelayMessage(Value.simple(body), HandlerConstant.CLINIC_AUTO_FINISH, DelayMessageProperties.of(TimeUnit.DAYS, config.getNoSignalInterval()));
-        lastNoSignalFinish = new DelayMessage(Value.simple(body), HandlerConstant.CLINIC_AUTO_FINISH, DelayMessageProperties.of(TimeUnit.SECONDS, config.getNoSignalInterval()));
+        lastNoSignalFinish = new DelayMessage(Value.simple(body), HandlerConstant.CLINIC_AUTO_FINISH, DelayMessageProperties.of(TimeUnit.DAYS, config.getNoSignalInterval()));
         delayMessageManager.add(lastNoSignalFinish);
     }
 
@@ -127,8 +126,7 @@ public class HospitalFinishMonitorConfigHandler extends AbstractHospitalConfigHa
                     .tenantId(source.getTenantId())
                     .timestamp(new Date())
                     .build();
-//            lastShutDownFinish = new DelayMessage(Value.simple(body), HandlerConstant.CLINIC_AUTO_FINISH, DelayMessageProperties.of(TimeUnit.DAYS, config.getShutDownInterval()));
-            lastShutDownFinish = new DelayMessage(Value.simple(body), HandlerConstant.CLINIC_AUTO_FINISH, DelayMessageProperties.of(TimeUnit.SECONDS, config.getShutDownInterval()));
+            lastShutDownFinish = new DelayMessage(Value.simple(body), HandlerConstant.CLINIC_AUTO_FINISH, DelayMessageProperties.of(TimeUnit.DAYS, config.getShutDownInterval()));
             delayMessageManager.add(lastShutDownFinish);
         }
     }

+ 1 - 1
nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusClinicService.java

@@ -97,7 +97,6 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
                 .in(BusClinicEntity::getId,clinicIds)
                 .set(BusClinicEntity::getFinished,true)
                 .set(BusClinicEntity::getEndTime,finishTime));
-        wsPublishUtils.publishMonitorTotalCount(tenantId);
         List<BusClinicEntity> clinics = this.listByIds(clinicIds);
         clinics.parallelStream()
                 .forEach(clinic->{
@@ -105,6 +104,7 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
                     ClinicFinishedEvent event = new ClinicFinishedEvent(this, tenantId, clinic.getId(), clinic.getPatientId());
                     SpringUtil.publishEvent(event);
                 });
+        wsPublishUtils.publishMonitorTotalCount(tenantId);
     }
 
     /**