Sfoglia il codice sorgente

fix 无泵监控搜索不出来

A17404李放 3 anni fa
parent
commit
eb3fc9ef67

+ 1 - 1
nb-system/src/main/java/com/nb/bus/websocket/listener/DeviceInfoListener.java

@@ -170,7 +170,7 @@ public class DeviceInfoListener {
                     CompletableFuture.runAsync(()->patientService.getPatientInfoFromHis(device.getTenantId(),device.getFormatPatientCode(),10,false)
                             ,executor)
                             .exceptionally(t->{
-                                log.error("新的输注产生后,拉取病号【{}】信息失败,失败原因:【{}】",device.getFormatPatientCode(), ExceptionUtil.getExceptionMsg(t));
+                                log.warn("新的输注产生后,拉取病号【{}】信息失败,失败原因:【{}】",device.getFormatPatientCode(), ExceptionUtil.getExceptionMsg(t));
                                 return null;
                             });
                 }

+ 3 - 2
nb-system/src/main/resources/mapper/bus/BusClinicMapper.xml

@@ -84,8 +84,9 @@
     <select id="pageQuery" resultMap="queryResult" parameterType="com.nb.bus.service.dto.ClinicQuery">
         select
         p.id as patient_id,
-        p.code as patient_code,
+--         p.code as patient_code,
         c.id as clinic_id,
+        if(c.monitor_type=1,p.code,c.patient_code) as patient_code,
 --         c.patient_code as patient_code,
         c.patient_name as patient_name,
         c.ward as ward,
@@ -128,7 +129,7 @@
             </if>
         </where>
         ) as c
-        join (select * from bus_patient
+        left join (select * from bus_patient
         <where>
             <if test="query.patientCode!=null">
                 and code like concat('%',#{query.patientCode},'%')