From 79cfe4dee3830a939c1bd3daa388f6f0fb9299b4 Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Wed, 22 Apr 2026 10:00:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=B6=E5=8C=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lis-system/src/main/java/com/czlis/system/RuoYiApplication.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lis-system/src/main/java/com/czlis/system/RuoYiApplication.java b/lis-system/src/main/java/com/czlis/system/RuoYiApplication.java
index ed5dcd6..30c1f20 100644
--- a/lis-system/src/main/java/com/czlis/system/RuoYiApplication.java
+++ b/lis-system/src/main/java/com/czlis/system/RuoYiApplication.java
@@ -16,6 +16,7 @@ import org.springframework.context.annotation.ComponentScan;
 public class RuoYiApplication {
     public static void main(String[] args) {
         // System.setProperty("spring.devtools.restart.enabled", "false");
+        System.setProperty("user.timezone", "Etc/GMT-8");
         SpringApplication.run(RuoYiApplication.class, args);
         System.out.println("项目启动成功！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！");
     }

From 42ed699e0ac8eac10600e50f70fbcccdbda7841a Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Fri, 24 Apr 2026 11:30:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=80=80=E6=A3=80=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/domain/entity/lis/LabReqmain.java    |   3 +
 .../resources/mapper/LabReqdetailMapper.xml   |  25 +++--
 .../work/CancelCheckController.java           |  75 +++++++++++++
 .../mapper/work/CancelCheckMapper.java        |   9 ++
 .../czlis/liswork/pojo/VO/CancelCheckVO.java  |  14 +++
 .../liswork/service/CancelCheckService.java   |  18 +++
 .../impl/work/CancelCheckServiceImpl.java     | 103 ++++++++++++++++++
 .../mapper/work/CancelCheckMapper.xml         |  17 +++
 8 files changed, 254 insertions(+), 10 deletions(-)
 create mode 100644 liswork/src/main/java/com/czlis/liswork/controller/work/CancelCheckController.java
 create mode 100644 liswork/src/main/java/com/czlis/liswork/mapper/work/CancelCheckMapper.java
 create mode 100644 liswork/src/main/java/com/czlis/liswork/pojo/VO/CancelCheckVO.java
 create mode 100644 liswork/src/main/java/com/czlis/liswork/service/CancelCheckService.java
 create mode 100644 liswork/src/main/java/com/czlis/liswork/service/impl/work/CancelCheckServiceImpl.java
 create mode 100644 liswork/src/main/resources/mapper/work/CancelCheckMapper.xml

diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabReqmain.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabReqmain.java
index 7ad5d30..964a9cb 100644
--- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabReqmain.java
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabReqmain.java
@@ -131,4 +131,7 @@ public class LabReqmain extends BaseEntity {
     private String qsyljg;
     @ApiModelProperty(value = "采集部位")
     private String cjbw;
+
+    private Date st;
+    private Date et;
 }
diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabReqdetailMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabReqdetailMapper.xml
index 459da17..7343ddd 100644
--- a/lis-interfaceCommon/src/main/resources/mapper/LabReqdetailMapper.xml
+++ b/lis-interfaceCommon/src/main/resources/mapper/LabReqdetailMapper.xml
@@ -32,16 +32,21 @@
     </insert>
 
     <update id="update">
-        update lab_reqdetail set sqh = #{sqh}
-        <if test="xh != null">xh = #{xh},</if>
-        <if test="sqxmdh != null">sqxmdh = #{sqxmdh},</if>
-        <if test="sqxmmc != null">sqxmmc = #{sqxmmc},</if>
-        <if test="sl != null">sl = #{sl},</if>
-        <if test="dj != null">dj = #{dj}</if>
-        <if test="zt != null and zt != ''">zt = #{zt}</if>
-        <if test="jjzt != null and jjzt != ''">jjzt = #{jjzt}</if>
-        <if test="bz1 != null and bz1 != ''">bz1 = #{bz1}</if>
-        <if test="bz2 != null and bz2 != ''">bz2 = #{bz2}</if>
+        update lab_reqdetail
+        <set>
+            <if test="xh != null">xh = #{xh},</if>
+            <if test="sqxmdh != null">sqxmdh = #{sqxmdh},</if>
+            <if test="sqxmmc != null">sqxmmc = #{sqxmmc},</if>
+            <if test="sl != null">sl = #{sl},</if>
+            <if test="dj != null">dj = #{dj},</if>
+            <if test="zt != null and zt != ''">zt = #{zt},</if>
+            <if test="jjzt != null and jjzt != ''">jjzt = #{jjzt},</if>
+            <if test="bz1 != null and bz1 != ''">bz1 = #{bz1},</if>
+            <if test="bz2 != null and bz2 != ''">bz2 = #{bz2},</if>
+            sqh = #{sqh}
+        </set>
+        where sqh = #{sqh}
+        <if test="xh != null"> and xh = #{xh}</if>
     </update>
 
     <select id="getLabReqdetailOne" resultType="com.czlis.common.core.domain.entity.lis.LabReqdetail">
diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/CancelCheckController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/CancelCheckController.java
new file mode 100644
index 0000000..8e06ff9
--- /dev/null
+++ b/liswork/src/main/java/com/czlis/liswork/controller/work/CancelCheckController.java
@@ -0,0 +1,75 @@
+package com.czlis.liswork.controller.work;
+
+import com.czlis.common.core.controller.BaseController;
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.LabReqmain;
+import com.czlis.common.core.page.TableDataInfo;
+import com.czlis.liswork.pojo.VO.CancelCheckVO;
+import com.czlis.liswork.service.CancelCheckService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 退检
+ */
+@RestController
+@RequestMapping("/cancelCheck")
+@Slf4j
+@Api(tags = "退检")
+public class CancelCheckController extends BaseController {
+
+    @Autowired
+    CancelCheckService cancelCheckService;
+
+
+    @ApiOperation("查询数据列表")
+    @GetMapping("/queryList")
+    public TableDataInfo queryList(LabReqmain labReqmain){
+        startPage();
+        List<LabReqmain> labReqmainList = cancelCheckService.queryList(labReqmain);
+        return getDataTable(labReqmainList);
+    }
+
+    @ApiOperation("获取明细数据")
+    @GetMapping("/queryDetail")
+    public Result queryDetail(LabReqmain labReqmain){
+        String sqh = labReqmain.getSqh();
+        if(sqh == null || sqh.equals("")) return new Result("-1","入参申请单号不能为空！");
+        String zt = labReqmain.getZt();
+        if (zt == null || zt.equals("")) return new Result("-1","入参状态不能为空！");
+        //这里管理员确认不了，先默认允许退费
+//        String cancalfeeadmin = commonUtil.getComOptValue("HISOPT", "sp_cancalfeeadmin");
+//        if(cancalfeeadmin == null) cancalfeeadmin = "";
+//        if(cancalfeeadmin.equals("1")){
+//            return new Result("-1","非管理员不允许退费!");
+//        }
+        if(zt.equals("4")) return new Result("-1","已经审核的报告禁止退检，请先解除审核再退检！");
+        if(zt.equals("9")) return new Result("-1","已经作废的报告禁止退检！");
+        return cancelCheckService.queryDetail(labReqmain);
+    }
+
+    @ApiOperation("退检")
+    @GetMapping("/confirm")
+    public Result cancelCheck(CancelCheckVO cancelCheckVO){
+        String sqh = cancelCheckVO.getSqh();
+        if(sqh == null || sqh.equals("")) return new Result("-1","申请单号sqh不能为空！");
+        String userId = cancelCheckVO.getUserId();
+        if(userId == null) cancelCheckVO.setUserId(getUsername());
+        return cancelCheckService.cancelCheck(cancelCheckVO);
+    }
+
+    @ApiOperation("拒绝退费")
+    @GetMapping("/refuse")
+    public Result refuse(CancelCheckVO cancelCheckVO){
+        return cancelCheckService.refuse(cancelCheckVO);
+    }
+
+
+}
diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/work/CancelCheckMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/work/CancelCheckMapper.java
new file mode 100644
index 0000000..9baee5d
--- /dev/null
+++ b/liswork/src/main/java/com/czlis/liswork/mapper/work/CancelCheckMapper.java
@@ -0,0 +1,9 @@
+package com.czlis.liswork.mapper.work;
+
+import com.czlis.common.core.domain.entity.lis.LabReqmain;
+
+import java.util.List;
+
+public interface CancelCheckMapper {
+    List<LabReqmain> query(LabReqmain labReqmain);
+}
diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/VO/CancelCheckVO.java b/liswork/src/main/java/com/czlis/liswork/pojo/VO/CancelCheckVO.java
new file mode 100644
index 0000000..6081c05
--- /dev/null
+++ b/liswork/src/main/java/com/czlis/liswork/pojo/VO/CancelCheckVO.java
@@ -0,0 +1,14 @@
+package com.czlis.liswork.pojo.VO;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CancelCheckVO {
+    private String sqh;
+    private String tfyy;
+    private String userId;
+}
diff --git a/liswork/src/main/java/com/czlis/liswork/service/CancelCheckService.java b/liswork/src/main/java/com/czlis/liswork/service/CancelCheckService.java
new file mode 100644
index 0000000..b897b59
--- /dev/null
+++ b/liswork/src/main/java/com/czlis/liswork/service/CancelCheckService.java
@@ -0,0 +1,18 @@
+package com.czlis.liswork.service;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.LabReqmain;
+import com.czlis.liswork.pojo.VO.CancelCheckVO;
+
+import java.util.List;
+
+public interface CancelCheckService {
+    List<LabReqmain> queryList(LabReqmain labReqmain);
+
+    Result queryDetail(LabReqmain labReqmain);
+
+    Result cancelCheck(CancelCheckVO cancelCheckVO);
+
+    Result refuse(CancelCheckVO cancelCheckVO);
+
+}
diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/work/CancelCheckServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/work/CancelCheckServiceImpl.java
new file mode 100644
index 0000000..5ffd469
--- /dev/null
+++ b/liswork/src/main/java/com/czlis/liswork/service/impl/work/CancelCheckServiceImpl.java
@@ -0,0 +1,103 @@
+package com.czlis.liswork.service.impl.work;
+
+import com.czlis.common.core.domain.Result;
+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.ip.IpUtils;
+import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants;
+import com.czlis.interfaceCommon.mapper.LabReqdetailMapper;
+import com.czlis.interfaceCommon.mapper.LabReqsteplogMapper;
+import com.czlis.interfaceCommon.pojo.inter.DayMessage;
+import com.czlis.interfaceCommon.utils.CommonUtil;
+import com.czlis.interfaceCommon.utils.LisInterfaceUtil;
+import com.czlis.liswork.mapper.work.CancelCheckMapper;
+import com.czlis.liswork.pojo.VO.CancelCheckVO;
+import com.czlis.liswork.service.CancelCheckService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+public class CancelCheckServiceImpl implements CancelCheckService {
+
+    @Autowired
+    CancelCheckMapper cancelCheckMapper;
+    @Autowired
+    private CommonUtil commonUtil;
+    @Autowired
+    LisInterfaceUtil lisInterfaceUtil;
+    @Autowired
+    LabReqsteplogMapper labReqsteplogMapper;
+    @Autowired
+    LabReqdetailMapper labReqdetailMapper;
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    @Override
+    public List<LabReqmain> queryList(LabReqmain labReqmain) {
+        return cancelCheckMapper.query(labReqmain);
+    }
+
+    @Override
+    public Result queryDetail(LabReqmain labReqmain) {
+        List<LabReqdetail> labReqdetailList = commonUtil.getLabReqdetailList(labReqmain.getSqh());
+        return new Result("0","获取数据成功！",labReqdetailList);
+    }
+
+    @Override
+    public Result cancelCheck(CancelCheckVO cancelCheckVO) {
+        //调用接口
+        DayMessage dayMessage = new DayMessage();
+        dayMessage.setMsgid("123");
+        dayMessage.setMsg(cancelCheckVO.getSqh());
+        Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.DAYMESSAGE, dayMessage);
+        if(!result.getCode().equals("0")) return new Result("-1","退检失败："+result.getMsg());
+
+        //修改状态
+        applicationContext.getBean(CancelCheckServiceImpl.class).updateStatus(cancelCheckVO.getSqh());
+
+
+        //写日志
+        Integer labReqsteplogMax = labReqsteplogMapper.getLabReqsteplogMax(cancelCheckVO.getSqh());
+        LabReqsteplog labReqsteplog = new LabReqsteplog();
+        labReqsteplog.setSqh(cancelCheckVO.getSqh());
+        labReqsteplog.setXh(labReqsteplogMax + 1);
+        labReqsteplog.setZt("9");
+        labReqsteplog.setUserid(cancelCheckVO.getUserId());
+        labReqsteplog.setChangedate(commonUtil.getCurrentTime());
+        labReqsteplog.setComip(IpUtils.getIpAddr());
+        labReqsteplog.setBz(cancelCheckVO.getTfyy());
+        labReqsteplogMapper.insertLabReqsteplog(labReqsteplog);
+        return new Result("0","退检成功！");
+    }
+
+    @Override
+    public Result refuse(CancelCheckVO cancelCheckVO) {
+        //调用接口
+        DayMessage dayMessage = new DayMessage();
+        dayMessage.setMsgid("995");
+        dayMessage.setMsg(cancelCheckVO.getSqh());
+        return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.DAYMESSAGE, dayMessage);
+    }
+
+
+    @Transactional
+    public void updateStatus(String sqh){
+        LabReqmain labReqmain = new LabReqmain();
+        labReqmain.setZt("9");
+        labReqmain.setJjzt("0");
+        labReqmain.setSqh(sqh);
+        commonUtil.updateLabReqmain(labReqmain);
+        LabReqdetail labReqdetail = new LabReqdetail();
+        labReqdetail.setZt("9");
+        labReqdetail.setSqh(sqh);
+        labReqdetailMapper.update(labReqdetail);
+    }
+
+
+
+}
diff --git a/liswork/src/main/resources/mapper/work/CancelCheckMapper.xml b/liswork/src/main/resources/mapper/work/CancelCheckMapper.xml
new file mode 100644
index 0000000..5a92e20
--- /dev/null
+++ b/liswork/src/main/resources/mapper/work/CancelCheckMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.czlis.liswork.mapper.work.CancelCheckMapper">
+    <select id="query" resultType="com.czlis.common.core.domain.entity.lis.LabReqmain">
+       select * from lab_reqmain where
+        <![CDATA[sqsj >= #{st} and sqsj <= #{et}]]>
+        <if test="brdh != null and brdh != ''">and brdh = #{brdh}</if>
+        <if test="brxm != null and brxm != ''">and brxm like '%'+#{brxm}+'%' </if>
+        <if test="sqh != null and sqh != ''">and sqh = #{sqh}</if>
+        <if test="ksdh != null and ksdh != ''">and ksdh = #{ksdh}</if>
+        <if test="brly != null and brly != ''">and brly = #{brly}</if>
+        <if test="powerman != null and powerman != ''">and powerman = #{powerman}</if>
+        <if test="zt != null and zt != ''">and zt = #{zt}</if>
+    </select>
+
+</mapper>

From d43aaa9e837f5129d92cb8398b4d2bbb42ed1226 Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Sat, 9 May 2026 15:36:03 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=80=E6=A3=80=E6=A8=A1=E5=9D=97,?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czlis/liswork/service/impl/ReportItemServiceImpl.java   | 2 ++
 .../liswork/service/impl/work/CancelCheckServiceImpl.java   | 1 +
 liswork/src/main/resources/mapper/ReportItemMapper.xml      | 6 ++++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java
index 2437775..2c515fa 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java
@@ -189,6 +189,8 @@ public class ReportItemServiceImpl implements ReportItemService {
                 if(xmRefNewRow.getXmid() == null || xmRefNewRow.getXmid().equals("")) xmRefNewRow.setXmid(xmInfoNew.getXmid());
                 XmRefNew newXmRef = new XmRefNew();
                 newXmRef.setXmid(xmRefNewRow.getXmid());
+                newXmRef.setXh(xmRefNewRow.getXh());
+                newXmRef.setYq(xmRefNewRow.getYq());
                 List<XmRefNew> xmRefNews = reportItemMapper.queryXmRefNew(newXmRef);
                 if(xmRefNews.size() > 0){
                     reportItemMapper.updateXmRefNewRow(xmRefNewRow);
diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/work/CancelCheckServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/work/CancelCheckServiceImpl.java
index 5ffd469..182298a 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/impl/work/CancelCheckServiceImpl.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/impl/work/CancelCheckServiceImpl.java
@@ -63,6 +63,7 @@ public class CancelCheckServiceImpl implements CancelCheckService {
 
         //写日志
         Integer labReqsteplogMax = labReqsteplogMapper.getLabReqsteplogMax(cancelCheckVO.getSqh());
+        if(labReqsteplogMax == null) labReqsteplogMax = 0;
         LabReqsteplog labReqsteplog = new LabReqsteplog();
         labReqsteplog.setSqh(cancelCheckVO.getSqh());
         labReqsteplog.setXh(labReqsteplogMax + 1);
diff --git a/liswork/src/main/resources/mapper/ReportItemMapper.xml b/liswork/src/main/resources/mapper/ReportItemMapper.xml
index 7ad97c4..1daa58e 100644
--- a/liswork/src/main/resources/mapper/ReportItemMapper.xml
+++ b/liswork/src/main/resources/mapper/ReportItemMapper.xml
@@ -374,11 +374,13 @@
 
     <delete id="deleteXmTextResult">
         delete from xm_textresult_new where xmid = #{xmid}
+        <if test="xh != null">and xh = #{xh}</if>
     </delete>
 
     <delete id="deleteXmRefNew">
         delete from xm_ref_new where xmid = #{xmid}
         <if test="xh != null">and xh = #{xh}</if>
+        <if test="yq != null and yq != ''">and yq = #{yq}</if>
     </delete>
 
     <delete id="deleteXmValNew">
@@ -466,9 +468,9 @@
             <if test="zd != null and zd != ''">zd = #{zd},</if>
             <if test="instrid != null and instrid != ''">instrid = #{instrid},</if>
             <if test="yq != null and yq != ''">yq = #{yq},</if>
-            xmid = #{xmid},xmdh = #{xmdh},xh = #{xh}
+            xmid = #{xmid},xmdh = #{xmdh}
         </set>
-        where xmid = #{xmid}
+        where xmid = #{xmid} and xh = #{xh} and yq = #{yq}
     </update>
 
     <update id="updateXmValNewRow">