From 43727df73e52cc00a1f1aee3c20a1aec8db1b92f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 27 二月 2025 08:45:25 +0800
Subject: [PATCH] 修改查询

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java |  111 +++++++++++++++++--------------------------------------
 1 files changed, 34 insertions(+), 77 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java
index 2ccbe50..1f979f9 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -11,6 +12,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -21,10 +23,9 @@
  * @author ltkj_璧典匠璞�&鏉庢牸
  * @date 2023-04-11
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel(value = "閲囨牱绠$悊")
-@AllArgsConstructor
-@NoArgsConstructor
 public class TjSampling extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -38,6 +39,9 @@
     @Excel(name = "浣撴鍙�")
     @ApiModelProperty(value = "浣撴鍙�")
     private String tjNum;
+
+    @TableField(exist = false)
+    private String cardId;
 
     /**
      * 閲囨牱缂栧彿
@@ -108,6 +112,7 @@
     /**
      * 鍚堝苟鍚庣殑鐖秈d
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String parentId;
 
     /**
@@ -115,86 +120,35 @@
      */
     private String jyxh;
 
-    public String getParentId() {
-        return parentId;
-    }
+    /**
+     * 鏍囨湰浠g爜
+     */
+    private String specimenTypeCode;
 
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
+    /**
+     * 鏄惁涓哄悎骞堕」鐩� 1鏄� 0鍚�
+     */
+    private Integer isMerge;
 
-    public String getJyxh() {
-        return jyxh;
-    }
+    /**
+     * lis妫�楠岄」鐩唬鐮�
+     */
+    private String jyxmdm;
 
-    public void setJyxh(String jyxh) {
-        this.jyxh = jyxh;
-    }
+    /**
+     * 琛ュ綍椤圭洰鏍囧織缂栫爜
+     */
+    private String jxbz;
 
-    public void setId(String id) {
-        this.id = id;
-    }
+    /**
+     * 鏄惁鏀粯
+     */
+    private Integer isPay;
 
-    public String getId() {
-        return id;
-    }
-
-    public void setSamplingNumber(String samplingNumber) {
-        this.samplingNumber = samplingNumber;
-    }
-
-    public String getSamplingNumber() {
-        return samplingNumber;
-    }
-
-    public void setCusId(String cusId) {
-        this.cusId = cusId;
-    }
-
-    public String getCusId() {
-        return cusId;
-    }
-
-    public void setApplicationTime(Date applicationTime) {
-        this.applicationTime = applicationTime;
-    }
-
-    public Date getApplicationTime() {
-        return applicationTime;
-    }
-
-
-    public void setTjTime(Date tjTime) {
-        this.tjTime = tjTime;
-    }
-
-    public Date getTjTime() {
-        return tjTime;
-    }
-
-    public void setSpecimenType(String specimenType) {
-        this.specimenType = specimenType;
-    }
-
-    public String getSpecimenType() {
-        return specimenType;
-    }
-
-    public void setProId(String proId) {
-        this.proId = proId;
-    }
-
-    public String getProId() {
-        return proId;
-    }
-
-    public void setProName(String proName) {
-        this.proName = proName;
-    }
-
-    public String getProName() {
-        return proName;
-    }
+    /**
+     * 鏄惁鎴愬姛鍙戝嚭鐢宠
+     */
+    private Integer isApply;
 
     @Override
     public String toString() {
@@ -215,6 +169,9 @@
                 .append("deleted", getDeleted())
                 .append("parentId", getParentId())
                 .append("jyxh", getJyxh())
+                .append("specimenTypeCode", getSpecimenTypeCode())
+                .append("isPay", getIsPay())
+                .append("isApply", getIsApply())
                 .toString();
     }
 }

--
Gitblit v1.8.0