18339543638 3 éve
szülő
commit
c240409e5b

+ 2 - 1
nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/IClinicClient.java

@@ -1,6 +1,7 @@
 package com.nb.web.api.feign;
 
 import com.nb.web.api.entity.BusClinicEntity;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author lifang
@@ -52,7 +53,7 @@ public interface IClinicClient {
      * @param source
      * @return void
      */
-    void setCurrentClinicByHis(BusClinicEntity source);
+    void setCurrentClinicByHis(BusClinicEntity source, boolean totalChanged);
 
     void update(String id, BusClinicEntity clinic);
 }

+ 2 - 2
nb-service/iot-service/src/main/java/com/nb/mq/listener/RabbitMqListener.java

@@ -75,9 +75,9 @@ public class RabbitMqListener {
 
         if(!sameClinic){
             //为了避免网络延迟,开始时间往前推1个小时
-            clinic.setStartTime(DateUtil.offsetHour(new Date(),-1));
+            clinic.setStartTime(DateUtil.offsetHour(new Date(),0));
             clinic=clinicClient.insertFromHis(clinic);
-            clinicClient.setCurrentClinicByHis(clinic);
+            clinicClient.setCurrentClinicByHis(clinic,Boolean.TRUE.equals(existClinic.getFinished()));
         }else {
             clinic.setStartTime(existClinic.getStartTime());
             clinicClient.update(existClinic.getId(),clinic);

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

@@ -198,9 +198,14 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
      * @param source
      * @return void
      */
-    @Override
     @Transactional(rollbackFor = Exception.class)
     public void setCurrentClinicByHis(BusClinicEntity source){
+       this.setCurrentClinicByHis(source,false);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void setCurrentClinicByHis(BusClinicEntity source,boolean totalChanged){
         Assert.hasText(source.getId(),"LocalBusClinicService.setCurrentClinic方法调用时,source参数id不能为空");
         Assert.hasText(source.getPatientId(),"LocalBusClinicService.setCurrentClinic方法调用时,source参数patientId不能为空");
         Assert.hasText(source.getTenantId(),"LocalBusClinicService.setCurrentClinic方法调用时,source参数tenantId不能为空");
@@ -245,6 +250,9 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
         PatientOperator operator = patientRegistry.getOperator(source.getTenantId(), source.getPatientCode());
         operator.setClinicId(source.getId());
         wsPublishUtils.publishPatientMonitor(source.getPatientId(),source.getTenantId());
+        if(totalChanged){
+            wsPublishUtils.publishMonitorTotalCount(source.getTenantId());
+        }
     }
 
     @Override