From 62982407a8115c3103a2ca2059d19fd04aa9120d Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Tue, 31 Mar 2026 14:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8D=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interfaceCommon/websocket/WebSocketMsgServiceImpl.java   | 5 ++++-
 .../transitPF/service/impl/RegRequestInfoServiceImpl.java    | 2 ++
 .../transitPF/service/impl/RegTransitSampleServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/RegRequestInfoMapper.xml       | 4 +---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/websocket/WebSocketMsgServiceImpl.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/websocket/WebSocketMsgServiceImpl.java
index 8a256c0..6390ce6 100644
--- a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/websocket/WebSocketMsgServiceImpl.java
+++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/websocket/WebSocketMsgServiceImpl.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.transitPlatForm.common.core.redis.RedisCache;
 import com.transitPlatForm.common.utils.spring.SpringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.websocket.Session;
 import java.util.ArrayList;
@@ -15,6 +16,7 @@ import java.util.concurrent.TimeUnit;
  * WebSocket消息处理业务实现类
  */
 @Service
+@Slf4j
 public class WebSocketMsgServiceImpl implements WebSocketMsgService {
 
     @Override
@@ -251,7 +253,8 @@ public class WebSocketMsgServiceImpl implements WebSocketMsgService {
         }
         // 4. 新增：解析并添加多IP列表
         this.addIpList(dataStrMap,senderId);
-        System.out.println("setClientInfo成功：用户属性更新完成，senderId=" + senderId);
+        //System.out.println("setClientInfo成功：用户属性更新完成，senderId=" + senderId);
+        log.info("setClientInfo成功：用户属性更新完成，senderId={}", senderId);
     }
     /**
      * 解析客户端传递的多IP列表，并同步更新IP→userId索引
diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java
index 063ca89..61f2c7f 100644
--- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java
+++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java
@@ -554,7 +554,9 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
         String UserId = ChatWebSocketServer.getUserIdByIp(ip);
         if (UserId == null || "".equals(UserId)) {
             String webid = getLocalid();
+            log.info("webid:{}",webid);
             UserId = ChatWebSocketServer.getUsersByWebId(webid);
+            log.info("UserId:{}",UserId);
             if (UserId != null && !"".equals(UserId)) {
                 return new Result("0", "客户端插件正常");
             }
diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java
index d829be6..0204061 100644
--- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java
+++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java
@@ -150,7 +150,7 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService {
                     if (statusSample.equals("30")) return new Result("-1", "该标本已经送检！");
                     if (statusSample.equals("10")) return new Result("-1","该条码还没有打印，不允许送出！");
                     if (Integer.parseInt(statusSample) > 30)
-                        return new Result("-1", barcode+"标本已经签收或者上机，不能再进行送检操作！");
+                        return new Result("-1", barcode+"标本已经签收或者上机或者已审核或者作废，不能再进行送检操作！");
                     regTransitSample.setDstHospCode(dstHospCode);
                     regTransitSample.setDstHospName(dstHospName);
                     regTransitSample.setSendPackTime(commonUtil.getCurrentTime());  //
diff --git a/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml b/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml
index aaaeaf3..d47339e 100644
--- a/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml
+++ b/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml
@@ -7,9 +7,7 @@
         <![CDATA[select *,CONVERT(VARCHAR(20), OrderTime, 23) as OrderDate  from reg_apply where OrderTime >= #{begdate} and OrderTime <= #{enddate} ]]>
         <if test="patId != null and patId != ''"> and PatId = #{patId}</if>
         <if test="brxm != null and brxm != ''">and PatName like '%'+#{brxm}+'%'</if>
-        <if test="status == 1">and Status in ('10','20','30','40')</if>
-        <if test="status == 2">and Status in ('50','60')</if>
-        <if test="status == 3">and Status in ('70','80')</if>
+        <if test="status != null ">and Status  = #{status}</if>
         <if test="SrcHospCode != null and SrcHospCode != ''">and SrcHospCode = #{SrcHospCode}</if>
         order by OrderTime desc
     </select>