From 45e511fe87a7b838a084ce524c8566d20e56059a Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期二, 22 四月 2025 18:20:35 +0800
Subject: [PATCH] 04-22 zhs 测试
---
smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java | 7 +++++++
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 3 ++-
smartor/src/main/java/com/smartor/domain/PatMedInhosp.java | 7 +++++++
smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml | 4 +++-
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
index 6c4da5e..c108280 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
@@ -430,4 +430,11 @@
@ApiModelProperty(value = "涓撶梾闅忚寤鸿")
private String fuspecialadvice;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ @Excel(name = " 璇佷欢鍙风爜 ")
+ private String idcardno;
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
index 6bc238c..9c1129f 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
@@ -212,4 +212,11 @@
@ApiModelProperty(value = "缁撴潫灏辫瘖鏃堕棿")
private Date endTime;
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ @Excel(name = " 璇佷欢鍙风爜 ")
+ private String idcardno;
+
}
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 36d4062..053c52c 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -197,7 +197,8 @@
b.futypecode,
b.futypedesc,
b.fuadvice,
- b.fuspecialadvice
+ b.fuspecialadvice,
+ a.idcardno
FROM
pat_med_inhosp b
JOIN
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index 6b2edb7..71fa63d 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -35,6 +35,7 @@
<result property="guid" column="guid"/>
<result property="patno" column="patno"/>
<result property="diagcheckFlag" column="diagcheck_flag"/>
+ <result property="idcardno" column="idcardno"/>
<result property="remark" column="remark"/>
</resultMap>
@@ -108,7 +109,8 @@
pmo.patname,
CONCAT(pa.age,pa.age_unit,pa.age2,pa.age_unit2) AS age,
pa.telcode,
- pmo.mainsuit
+ pmo.mainsuit,
+ pa.idcardno
from pat_med_outhosp pmo left join pat_archive pa on pmo.patid = pa.id
<where>
pmo.del_flag=0
--
Gitblit v1.9.3