From 0f5da45abcd2b1cba6b95dbb38ab6d64cd30b165 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 16 十月 2024 15:58:18 +0800
Subject: [PATCH] 增加是否为合并项目字段
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java | 20 ++++++++++++++++++--
ltkj-hosp/src/main/resources/mapper/hosp/TjSamplingMapper.xml | 11 ++++++++++-
2 files changed, 28 insertions(+), 3 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;
+ /**
+ * 鏍囨湰浠ｇ爜
+ */
+ 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;
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjSamplingMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjSamplingMapper.xml
index aeea9d6..dd74835 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjSamplingMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjSamplingMapper.xml
@@ -23,6 +23,7 @@
<result property="parentId" column="parent_id"/>
<result property="jyxh" column="jyxh"/>
<result property="specimenTypeCode" column="specimen_type_code"/>
+ <result property="isMerge" column="is_merge"/>
</resultMap>
<sql id="selectTjSamplingVo">
@@ -43,7 +44,8 @@
deleted,
parent_id,
jyxh,
- specimen_type_code
+ specimen_type_code,
+ is_merge
from tj_sampling
</sql>
@@ -125,6 +127,8 @@
</if>
<if test="specimenTypeCode != null">specimen_type_code,
</if>
+ <if test="isMerge != null">is_merge,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},
@@ -162,6 +166,8 @@
<if test="jyxh != null">#{jyxh},
</if>
<if test="specimenTypeCode != null">#{specimenTypeCode},
+ </if>
+ <if test="isMerge != null">#{isMerge},
</if>
</trim>
</insert>
@@ -219,6 +225,9 @@
<if test="specimenTypeCode != null">specimen_type_code =
#{specimenTypeCode},
</if>
+ <if test="isMerge != null">is_merge =
+ #{isMerge},
+ </if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.8.0