From 0b4488d6dda5baf80884045792908cfb110867cb Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Fri, 9 May 2025 09:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8F=E9=99=A2=E9=87=87=E8=A1=80=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/domain/entity/LabPat.java     | 78 +++++++++++++++++++
 .../core/domain/entity/LabReqdetail.java      | 32 ++++++++
 .../common/core/domain/entity/LabReqmain.java | 75 ++++++++++++++++++
 .../common/core/domain/entity/LabResult.java  | 38 +++++++++
 .../resources/mapper/system/SysRoleMapper.xml |  4 +-
 .../czlis/zycx/controller/ZycxController.java |  5 +-
 .../com/czlis/zycx/mapper/ZycxMapper.java     |  3 +-
 .../com/czlis/zycx/service/ZycxService.java   |  3 +-
 .../zycx/service/impl/ZycxServiceImpl.java    |  5 +-
 zycx/src/main/resources/mapper/ZycxMapper.xml | 45 +----------
 10 files changed, 239 insertions(+), 49 deletions(-)
 create mode 100644 lis-common/src/main/java/com/czlis/common/core/domain/entity/LabPat.java
 create mode 100644 lis-common/src/main/java/com/czlis/common/core/domain/entity/LabReqdetail.java
 create mode 100644 lis-common/src/main/java/com/czlis/common/core/domain/entity/LabReqmain.java
 create mode 100644 lis-common/src/main/java/com/czlis/common/core/domain/entity/LabResult.java

diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabPat.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabPat.java
new file mode 100644
index 0000000..de4fcf9
--- /dev/null
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabPat.java
@@ -0,0 +1,78 @@
+package com.czlis.common.core.domain.entity;
+
+
+import com.czlis.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabPat extends BaseEntity {
+    private Date jyrq;
+    private String yq;
+    private String ybh;
+    private String yblx;
+    private String fb;
+    private String ksdh;
+    private String sjys;
+    private String hdys;
+    private String yhdh;
+    private String brdh;
+    private String brxm;
+    private String brxb;
+    private String brly;
+    private String ch;
+    private Integer nl;
+    private String nldw;
+    private String sqh;
+    private Date sqsj;
+    private Date dysj;
+    private String dybz;
+    private String jgbz;
+    private String bbbz;
+    private String zd;
+    private String bz;
+    private String bz1;
+    private String zjf;
+    private Date cyrq;
+    private String bq;
+    private String czybh;
+    private String cjbw;
+    private String jymd;
+    private String lastuser;
+    private Date lastdt;
+    private String confirmer;
+    private Date confirmdt;
+    private String mzdy;
+    private String fslx;
+    private String ybzt;
+    private String instrid;
+    private String jzbz;
+    private String sbbr;
+   // private String qrr;
+   // private Date qrsj;
+    private String alarmflag;
+    private String alarmconfirm;
+    private Date alarmconfirmdt;
+    private String mzh;
+    private String yljg;
+    private String finish;
+    private String send_flag;
+    private String sfzh;
+    private String phone;
+    private String phone1;
+    private String addr;
+    private String zjlx;
+    private String upload;
+    private String wyh;
+
+
+
+
+
+
+}
diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabReqdetail.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabReqdetail.java
new file mode 100644
index 0000000..8d9c9af
--- /dev/null
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabReqdetail.java
@@ -0,0 +1,32 @@
+package com.czlis.common.core.domain.entity;
+
+import com.czlis.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class LabReqdetail extends BaseEntity {
+    private String sqh;
+    private Integer xh;
+    private String sqxmdh;
+    private String sqxmmc;
+    private Integer sl;
+    private BigDecimal dj;
+    private String zt;
+    private String jjzt;
+    private String bz1;
+    private String bz2;
+    private BigDecimal costs;
+    private Integer numbk1;
+    private Integer numbk2;
+    private Date dtbk1;
+    private Date dtbk2;
+    private String bz3;
+
+}
diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabReqmain.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabReqmain.java
new file mode 100644
index 0000000..8054a3d
--- /dev/null
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabReqmain.java
@@ -0,0 +1,75 @@
+package com.czlis.common.core.domain.entity;
+
+import com.czlis.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class LabReqmain extends BaseEntity {
+    private String sqh;
+    private String ksdh;
+    private String sqys;
+    private Date sqsj;
+    private String jsys;
+    private Date jssj;
+    private String zt;
+    private String jjzt;
+    private String brly;
+    private String brdh;
+    private String brxm;
+    private String brxb;
+    private Date brsr;
+    private String bz1;
+    private String bz2;
+    private String bz3;
+    private String jzbz;
+    private String txm;
+    private String ch;
+    private String yblx;
+    private String zxys;
+    private Date zxsj;
+    private String bgddh;
+    private BigDecimal costs;
+    private Integer nl;
+    private String nldw;
+    private String zd;
+    private Date cysj;
+    private Date cksj;
+    private String yljg;
+    private String kh;
+    private String klx;
+    private Date jzsj;
+    private String jymd;
+    private String sfzh;
+    private String phone;
+    private String phone1;
+    private Date confirmtime;
+    private String confirmer;
+    private String cyr;
+    private String addr;
+    private String fb;
+    private String bbsjr;
+    private Date bbsjsj;
+    //@TableField(exist = false)
+    private String czid;
+   // @TableField(exist = false)
+    private String czmc;
+   // @TableField(exist = false)
+    private String jzjlid;
+  //  @TableField(exist = false)
+    private String hzdh;
+  //  @TableField(exist = false)
+    private String zxks;
+  //  @TableField(exist = false)
+    private String hosid;
+    private String lstd;
+    private String jcptbz;
+    private String slzq;
+    private Date sjsj;
+}
diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabResult.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabResult.java
new file mode 100644
index 0000000..dbf4659
--- /dev/null
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabResult.java
@@ -0,0 +1,38 @@
+package com.czlis.common.core.domain.entity;
+
+
+import com.czlis.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabResult extends BaseEntity {
+    private Date jyrq;
+    private String yq;
+    private String ybh;
+    private String xmdh;
+    private String csjg;
+    private String od;
+    private String cutoff;
+    private String jgbz;
+    private String bz1;
+    private String bz2;
+    private String yhdh;
+    private String textresult;
+    private String instrid;
+    private Date operdt;
+    private String operna;
+    private String refs;
+    private String flag;
+    private String dw;
+    private String result_flag;
+    private String alarm_flag;
+    private String redo_flag;
+    private String sqxmdh;
+
+}
diff --git a/lis-system/src/main/resources/mapper/system/SysRoleMapper.xml b/lis-system/src/main/resources/mapper/system/SysRoleMapper.xml
index f06a9b5..30c859b 100644
--- a/lis-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/lis-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
-		select top 1 distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
+		select  distinct top 1 r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
 						r.status, r.del_flag, r.create_time, r.remark
 		from sys_role r
 				 left join sys_user_role ur on ur.role_id = r.role_id
@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
-		select top 1 distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
+		select distinct top 1  r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
 						r.status, r.del_flag, r.create_time, r.remark
 		from sys_role r
 				 left join sys_user_role ur on ur.role_id = r.role_id
diff --git a/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java b/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java
index 2aea5bd..92ee37c 100644
--- a/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java
+++ b/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java
@@ -2,6 +2,7 @@ package com.czlis.zycx.controller;
 
 import com.czlis.common.core.controller.BaseController;
 import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.LabReqmain;
 import com.czlis.common.core.page.TableDataInfo;
 import com.czlis.zycx.pojo.Web_getBarcode;
 import com.czlis.zycx.service.ZycxService;
@@ -31,9 +32,9 @@ public class ZycxController extends BaseController {
     @ApiOperation("获取申请单")
     @GetMapping("/query")
     //@PreAuthorize("@ss.hasPermi('zycx:interface:query')")
-    public TableDataInfo getSQDInfo(Web_getBarcode webGetBarcode){
+    public TableDataInfo getSQDInfo(LabReqmain labReqmain){
         startPage();
-        List<Web_getBarcode> sqdInfoList = zycxService.getSQDInfo(webGetBarcode);
+        List<LabReqmain> sqdInfoList = zycxService.getSQDInfo(labReqmain);
         return getDataTable(sqdInfoList);
     }
 
diff --git a/zycx/src/main/java/com/czlis/zycx/mapper/ZycxMapper.java b/zycx/src/main/java/com/czlis/zycx/mapper/ZycxMapper.java
index a53e33d..f35369b 100644
--- a/zycx/src/main/java/com/czlis/zycx/mapper/ZycxMapper.java
+++ b/zycx/src/main/java/com/czlis/zycx/mapper/ZycxMapper.java
@@ -1,5 +1,6 @@
 package com.czlis.zycx.mapper;
 
+import com.czlis.common.core.domain.entity.LabReqmain;
 import com.czlis.zycx.pojo.Web_getBarcode;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -8,5 +9,5 @@ import java.util.List;
 
 public interface ZycxMapper {
 
-    List<Web_getBarcode> getSQDInfo(Web_getBarcode web_getBarcode);
+    List<LabReqmain> getSQDInfo(LabReqmain labReqmain);
 }
diff --git a/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java b/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java
index 2f53549..e8dd06c 100644
--- a/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java
+++ b/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java
@@ -1,11 +1,12 @@
 package com.czlis.zycx.service;
 
 import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.LabReqmain;
 import com.czlis.common.core.page.TableDataInfo;
 import com.czlis.zycx.pojo.Web_getBarcode;
 
 import java.util.List;
 
 public interface ZycxService {
-    List<Web_getBarcode> getSQDInfo(Web_getBarcode webGetBarcode);
+    List<LabReqmain> getSQDInfo(LabReqmain labReqmain);
 }
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 8be538e..3c2ac48 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
@@ -1,6 +1,7 @@
 package com.czlis.zycx.service.impl;
 
 import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.LabReqmain;
 import com.czlis.zycx.mapper.ZycxMapper;
 import com.czlis.zycx.pojo.Web_getBarcode;
 import com.czlis.zycx.service.ZycxService;
@@ -20,8 +21,8 @@ public class ZycxServiceImpl implements ZycxService {
 
 
     @Override
-    public List<Web_getBarcode> getSQDInfo(Web_getBarcode webGetBarcode) {
-        return zycxMapper.getSQDInfo(webGetBarcode);
+    public List<LabReqmain> getSQDInfo(LabReqmain labReqmain) {
+        return zycxMapper.getSQDInfo(labReqmain);
     }
 
 }
diff --git a/zycx/src/main/resources/mapper/ZycxMapper.xml b/zycx/src/main/resources/mapper/ZycxMapper.xml
index ec6d0e9..1846bfd 100644
--- a/zycx/src/main/resources/mapper/ZycxMapper.xml
+++ b/zycx/src/main/resources/mapper/ZycxMapper.xml
@@ -4,49 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.czlis.zycx.mapper.ZycxMapper">
 
-
-	
-	<sql id="selectWeb_getBarcodeVo">
-        SELECT sqh,ksdh,sqys,sqsj,jsys,jssj,zt,jjzt,brly,brdh,brxm,brxb,brsr,bz1,bz2,bz3,jzbz,txm,ch,yblx,zxys,zxsj,bgddh,costs,nl,nldw,zd,cysj,cksj,ckzj,ckyh,djry,inputman,powerman,contactman
-             ,refsqh,cyr,bbsjr,bbsjsj,performby,sbbr,inzt,libpos,inlibtime,inlibman,outlibtime,outlibman,refused,confirmtime,confirmer,cybl,bbsjbl,yljg
-             ,kh
-             ,klx
-             ,jzsj
-             ,jymd
-             ,sfzh
-             ,phone
-             ,phone1
-             ,cyjs
-             ,jswc
-             ,yqdh
-             ,sjsj
-             ,send_flag
-             ,addr
-             ,lstd
-             ,ssrq
-             ,slzq
-             ,cyblsj
-             ,bbsjblsj
-             ,bgddhname
-             ,bkcolor
-             ,sflbjc
-             ,sampletips
-             ,ksname
-             ,sqysname
-             ,jsysname
-             ,brlyname
-             ,brxbname
-             ,yblxname
-             ,zxysname
-             ,cyrname
-             ,Bbsjrname
-             ,confirmername
-             ,yljgname
-        FROM web_getBarcode
+	<sql id="selectLabReqmainVo">
+        select * from lab_reqmain where 1=1
     </sql>
 
-    <select id="getSQDInfo" parameterType="com.czlis.zycx.pojo.Web_getBarcode" resultType="com.czlis.zycx.pojo.Web_getBarcode">
-        <include refid="selectWeb_getBarcodeVo"></include>
+    <select id="getSQDInfo" parameterType="com.czlis.common.core.domain.entity.LabReqmain" resultType="com.czlis.common.core.domain.entity.LabReqmain">
+        <include refid="selectLabReqmainVo"></include>
          <if test="sqh != null and sqh != ''"> and sqh = #{sqh}</if>
          <if test="zt != null and zt != ''"> and zt = #{zt}</if>
          <if test="ksdh != null and ksdh != ''"> and ksdh = #{ksdh}</if>