From b888819a471a52ad78e0bf1338e369d749fec6cf Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Mon, 16 Mar 2026 11:56:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8F=E9=99=A2=E9=87=87=E8=A1=80=E3=80=82?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E5=92=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E4=BB=A5=E5=8F=8A=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/LabReqsteplogMapper.xml  |  2 ++
 .../zycx/service/impl/ZycxServiceImpl.java    | 20 +++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabReqsteplogMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabReqsteplogMapper.xml
index c654ba8..a6d4478 100644
--- a/lis-interfaceCommon/src/main/resources/mapper/LabReqsteplogMapper.xml
+++ b/lis-interfaceCommon/src/main/resources/mapper/LabReqsteplogMapper.xml
@@ -14,9 +14,11 @@
     <insert id="insertLabReqsteplog" parameterType="com.czlis.common.core.domain.entity.lis.LabReqsteplog">
         insert into lab_reqsteplog (sqh, xh, zt, userid,
                                     changedate, logdate, comname,
+                                    <if test="logdate != null">logdate,</if>
                                     comip, bz)
         values (#{sqh}, #{xh}, #{zt}, #{userid},
                 #{changedate}, #{logdate}, #{comname},
+                <if test="logdate != null">#{logdate},</if>
                 #{comip}, #{bz})
     </insert>
 
diff --git a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
index f9d1799..5a2609a 100644
--- a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
+++ b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
@@ -8,16 +8,14 @@ import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.LabIntersendList;
 import com.czlis.common.core.domain.entity.lis.LabReqdetail;
 import com.czlis.common.core.domain.entity.lis.LabReqmain;
+import com.czlis.common.core.domain.entity.lis.LabReqsteplog;
 import com.czlis.common.utils.SecurityUtils;
 import com.czlis.common.utils.ip.IpUtils;
 import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants;
 import com.czlis.interfaceCommon.pojo.entity.ReportParam;
 import com.czlis.interfaceCommon.pojo.inter.GetReqInterface;
 import com.czlis.interfaceCommon.pojo.inter.SetReqStatus;
-import com.czlis.interfaceCommon.utils.CommonUtil;
-import com.czlis.interfaceCommon.utils.LisInterfaceUtil;
-import com.czlis.interfaceCommon.utils.LisUtil;
-import com.czlis.interfaceCommon.utils.ReportUtil;
+import com.czlis.interfaceCommon.utils.*;
 import com.czlis.interfaceCommon.websocket.ChatWebSocketServer;
 import com.czlis.interfaceCommon.websocket.WebSocketInstrComm;
 import com.czlis.interfaceCommon.websocket.WebSocketMessage;
@@ -50,6 +48,8 @@ public class ZycxServiceImpl implements ZycxService {
     private ReportUtil reportUtil;
     @Autowired
     LabIntersendListMapper labIntersendListMapper;
+    @Autowired
+    LisWorkBase lisWorkBase;
 
     @Value("${lisinterface.sp:}")
     String sp;
@@ -151,6 +151,8 @@ public class ZycxServiceImpl implements ZycxService {
                     labReqmain.setZt("11");
                     labReqmain.setSqh(sqhOne);
                     commonUtil.updateLabReqmain(labReqmain);
+                    //写日志表
+                    lisWorkBase.setlabReqsteplog(sqhOne, "11", userid);
                 }
             }
 
@@ -159,8 +161,12 @@ public class ZycxServiceImpl implements ZycxService {
                 if(zt.equals("1") || zt.equals("8") || zt.equals("11")){
                     LabReqmain labReqmain = new LabReqmain();
                     labReqmain.setZt("12");
+                    labReqmain.setCysj(commonUtil.getCurrentTime());
+                    labReqmain.setCyr(userid);
                     labReqmain.setSqh(sqhOne);
                     commonUtil.updateLabReqmain(labReqmain);
+                    //写日志表
+                    lisWorkBase.setlabReqsteplog(sqhOne, "12", userid);
                 }
             }
 
@@ -169,8 +175,12 @@ public class ZycxServiceImpl implements ZycxService {
                 if(zt.equals("1") || zt.equals("8") || zt.equals("11") || zt.equals("12")){
                     LabReqmain labReqmain = new LabReqmain();
                     labReqmain.setZt("13");
+                    labReqmain.setBbsjr(userid);
+                    labReqmain.setBbsjsj(commonUtil.getCurrentTime());
                     labReqmain.setSqh(sqhOne);
                     commonUtil.updateLabReqmain(labReqmain);
+                    //写日志表
+                    lisWorkBase.setlabReqsteplog(sqhOne, "13", userid);
                 }
             }
 
@@ -182,6 +192,8 @@ public class ZycxServiceImpl implements ZycxService {
                     labReqmain.setZt("9");
                     labReqmain.setSqh(sqhOne);
                     commonUtil.updateLabReqmain(labReqmain);
+                    //写日志表
+                    lisWorkBase.setlabReqsteplog(sqhOne, "9", userid);
                 }
             }