From 5d7c20d959418fe325b86ad4f1e112115aaf21f9 Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Wed, 12 Nov 2025 09:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/lis8.0/updatedb_lis8.0.sql                | 12 ++++-
 .../transitPF/pojo/RegTransitSample.java      | 49 +++++++++++++++++++
 .../impl/RegTransitSampleServiceImpl.java     | 17 +++++--
 3 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/sql/lis8.0/updatedb_lis8.0.sql b/sql/lis8.0/updatedb_lis8.0.sql
index 061ccf6..85baf6a 100644
--- a/sql/lis8.0/updatedb_lis8.0.sql
+++ b/sql/lis8.0/updatedb_lis8.0.sql
@@ -184,7 +184,17 @@ CREATE TABLE [dbo].[reg_TransitSample](
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
     ) ON [PRIMARY];
 CREATE INDEX IX_reg_TransitSample_Barcode ON reg_TransitSample(Barcode);
-
+ALTER TABLE reg_TransitSample ADD CONSTRAINT UQ_reg_TransitSample_Barcode_OrderItemSerial UNIQUE (Barcode);
+alter table reg_TransitSample add TestDate datetime;
+alter table reg_TransitSample add ReportTime datetime;
+alter table reg_TransitSample add ReportUserCode varchar(50);
+alter table reg_TransitSample add ReportUserName varchar(50);
+alter table reg_TransitSample add SampleTrait varchar(50);
+alter table reg_TransitSample add ReportKindCode varchar(50);
+alter table reg_TransitSample add ReportKindName varchar(500);
+alter table reg_TransitSample add ReportDescrpt varchar(500);
+alter table reg_TransitSample add LisGroupCode varchar(50);
+alter table reg_TransitSample add LisGroupName varchar(50);
 
 end
 
diff --git a/transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSample.java b/transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSample.java
index c97b1f6..456cb82 100644
--- a/transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSample.java
+++ b/transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSample.java
@@ -237,7 +237,56 @@ public class RegTransitSample {
     private String update_by;
     private Date update_time;
     private String DataSource;
+    /**
+     * 检验目的，项目字段拼接
+     */
     private String checkPUR;
+    /**
+     * 检验日期
+     */
+    private Date TestDate;
+    /**
+     * 报告日期
+     */
+    private Date ReportTime;
+    /**
+     * 报告人代码
+     */
+    private String ReportUserCode;
+    /**
+     * 报告人姓名
+     */
+    private String ReportUserName;
+    /**
+     * 标本性状
+     * 01-无异常
+     * 02-溶血
+     * 03-脂血
+     * 04-黄疸
+     * 05-量少
+     */
+    private String SampleTrait;
+    /**
+     * 报告单类别编码
+     */
+    private String ReportKindCode;
+    /**
+     * 报告单类别名称
+     */
+    private String ReportKindName;
+    /**
+     * 报告描述
+     */
+    private String ReportDescrpt;
+    /**
+     * 检验分组编码
+     */
+    private String LisGroupCode;
+    /**
+     * 检验分组名称
+     */
+    private String LisGroupName;
+
 
 
     private String DateType;
diff --git a/transitPF/src/main/java/com/czlis/transitPF/service/impl/RegTransitSampleServiceImpl.java b/transitPF/src/main/java/com/czlis/transitPF/service/impl/RegTransitSampleServiceImpl.java
index 20e6313..6f9484a 100644
--- a/transitPF/src/main/java/com/czlis/transitPF/service/impl/RegTransitSampleServiceImpl.java
+++ b/transitPF/src/main/java/com/czlis/transitPF/service/impl/RegTransitSampleServiceImpl.java
@@ -65,8 +65,8 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService {
                 return delTransitSample(jsonStr);
             case "queryTransitSample":
                 return queryTransitSample(jsonStr);
-            case "test":
-                return test();
+//            case "test":
+//                return test();
             default:
                 return new Result("1","该接口还未实现！",method);
         }
@@ -100,6 +100,17 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService {
         }
         JSONObject reqMain = jsonObject.getJSONObject("req").getJSONObject("reqMain");
         RegTransitSample regTransitSample = JSONUtil.toBean(reqMain, RegTransitSample.class);
+        RegTransitSample regTransitSample1 = new RegTransitSample();
+        regTransitSample1.setBarcode(reqMain.getStr("Barcode"));
+        regTransitSample1.setSrcHospCode(reqMain.getStr("SrcHospCode"));
+        List<RegTransitSample> regTransitSample2List = regTransitSampleMapper.getRegTransitSample(regTransitSample1);
+        if(regTransitSample2List.size() > 0){
+            for (RegTransitSample transitSample : regTransitSample2List) {
+                String barcode = transitSample.getBarcode();
+                regTransitSampleMapper.delRegTransitSample(barcode);
+                regTransitSampleMapper.delRegTransitSampleDetail(barcode);
+            }
+        }
         JSONArray reqDetailList = jsonObject.getJSONObject("req").getJSONArray("reqDetail");
         String checkPUR = "";
         List<RegTransitSampleDetail> regTransitSampleDetailList = reqDetailList.toList(RegTransitSampleDetail.class);
@@ -129,7 +140,7 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService {
      */
     public Result delTransitSample(String jsonStr){
         JSONObject jsonObject = JSONUtil.parseObj(jsonStr);
-        String barcode = jsonObject.getStr("barcode");
+        String barcode = jsonObject.getJSONObject("reqMain").getStr("Barcode");
         regTransitSampleMapper.delRegTransitSample(barcode);
         regTransitSampleMapper.delRegTransitSampleDetail(barcode);
         return new Result("0","删除成功！");