From 9f2fdafa17032b347696fd5dd8b7f6cf3c6d5150 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 16 十月 2024 16:11:04 +0800
Subject: [PATCH] 修改客户采样查询条件 恢复确认采样代码

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 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 108d774..13eefb4 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
@@ -115,6 +115,24 @@
      */
     private String jyxh;
 
+    /**
+     * 鏍囨湰浠g爜
+     */
+    private String specimenTypeCode;
+
+    /**
+     * 鏄惁涓哄悎骞堕」鐩� 1鏄� 0鍚�
+     */
+    private Integer isMerge;
+
+    public Integer getIsMerge() {
+        return isMerge;
+    }
+
+    public void setIsMerge(Integer isMerge) {
+        this.isMerge = isMerge;
+    }
+
     public String getSpecimenTypeCode() {
         return specimenTypeCode;
     }
@@ -122,8 +140,6 @@
     public void setSpecimenTypeCode(String specimenTypeCode) {
         this.specimenTypeCode = specimenTypeCode;
     }
-
-    private String specimenTypeCode;
 
     public String getParentId() {
         return parentId;

--
Gitblit v1.8.0