From c24d16a37523a49080392610357872ce580cbc38 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 26 十月 2026 14:03:33 +0800
Subject: [PATCH] 代码提交
---
ruoyi-common/src/main/java/com/ruoyi/common/core/service/dto/VisitSubtaskDraft.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/dto/VisitSubtaskDraft.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/dto/VisitSubtaskDraft.java
index 811a500..42b9ee3 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/dto/VisitSubtaskDraft.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/dto/VisitSubtaskDraft.java
@@ -58,6 +58,17 @@
private Long inhospid;
/** 浣忛櫌娴佹按鍙� */
private String serialnum;
+ /**
+ * 灏辫瘖缂栧彿 鈥斺�� 钀藉簱鍒� {@code service_subtask.hospno}锛�"瀵瑰簲鐨� outhospno銆乮nhospno"锛夈��
+ * <p>
+ * 鍑洪櫌閾捐矾鐨勫彇鍊兼槸 {@code pat_med_inhosp.inhospno}锛堥棬璇婇摼璺槸
+ * {@code pat_med_outhosp.outhospno}锛岃 {@link OuthospSubtaskDraft}锛夈��
+ * <p>
+ * 鈿狅笍 杩欎釜瀛楁鍘熷厛鍙瓨鍦ㄤ簬 {@link OuthospSubtaskDraft}锛岃�屽嚭闄㈢殑
+ * {@code addSubTaskByRule} 閾捐矾浠庝笉璁惧畠 鈫� {@code service_subtask.hospno} 涓�鐩磋惤绌恒��
+ * 鐜板湪鎻愬埌鐖剁被锛屼袱鏉￠摼璺叡鐢ㄥ悓涓�涓浇浣撱��
+ */
+ private String hospno;
// ==================== 鍖绘姢锛堝師 patMedInhosp锛� ====================
/** 璐ｄ换鎶ゅ＋ID */
@@ -74,10 +85,20 @@
private String managementDoctorCode;
// ==================== 绉戝/鐥呭尯锛堝師 patMedInhosp锛宼ype 4/5 浼氭敼鍐欙級 ====================
- /** 绉戝缂栫爜锛坱ype 1/2/3 鍙� leave 缁村害锛泃ype 4/5 鍙栧叆闄㈢淮搴︼級 */
+ // 2026-11锛歴ervice_subtask 鐨� deptcode/deptname 鍒楁敼鍚嶄负 leaveldeptcode/leaveldeptname锛�
+ // 鍘� sendlimit* 绌洪棽鍒楀鐢ㄤ负銆屽湪闄㈢淮搴︺�嶇殑 hospitaldistrictcode/name锛堝湪闄㈢梾鍖猴級銆乨eptcode/name锛堝湪闄㈢瀹わ級銆�
+ /** 鍑洪櫌绉戝缂栫爜锛堣惤 service_subtask.leaveldeptcode锛涘師瀛楁鍚� deptcode锛� */
+ private String leaveldeptcode;
+ /** 鍑洪櫌绉戝鍚嶇О锛堣惤 service_subtask.leaveldeptname锛涘師瀛楁鍚� deptname锛� */
+ private String leaveldeptname;
+ /** 鍦ㄩ櫌绉戝缂栫爜锛堣惤 service_subtask.deptcode锛� */
private String deptcode;
- /** 绉戝鍚嶇О */
+ /** 鍦ㄩ櫌绉戝鍚嶇О锛堣惤 service_subtask.deptname锛� */
private String deptname;
+ /** 鍦ㄩ櫌鐥呭尯缂栫爜锛堣惤 service_subtask.hospitaldistrictcode锛� */
+ private String hospitaldistrictcode;
+ /** 鍦ㄩ櫌鐥呭尯鍚嶇О锛堣惤 service_subtask.hospitaldistrictname锛� */
+ private String hospitaldistrictname;
/** 绂婚櫌鐥呭尯缂栫爜锛坱ype 4/5 鍙栧叆闄㈢梾鍖猴級 */
private String leavehospitaldistrictcode;
/** 绂婚櫌鐥呭尯鍚嶇О */
@@ -352,6 +373,14 @@
this.serialnum = serialnum;
}
+ public String getHospno() {
+ return hospno;
+ }
+
+ public void setHospno(String hospno) {
+ this.hospno = hospno;
+ }
+
public String getNurseId() {
return nurseId;
}
@@ -400,6 +429,22 @@
this.managementDoctorCode = managementDoctorCode;
}
+ public String getLeaveldeptcode() {
+ return leaveldeptcode;
+ }
+
+ public void setLeaveldeptcode(String leaveldeptcode) {
+ this.leaveldeptcode = leaveldeptcode;
+ }
+
+ public String getLeaveldeptname() {
+ return leaveldeptname;
+ }
+
+ public void setLeaveldeptname(String leaveldeptname) {
+ this.leaveldeptname = leaveldeptname;
+ }
+
public String getDeptcode() {
return deptcode;
}
@@ -416,6 +461,22 @@
this.deptname = deptname;
}
+ public String getHospitaldistrictcode() {
+ return hospitaldistrictcode;
+ }
+
+ public void setHospitaldistrictcode(String hospitaldistrictcode) {
+ this.hospitaldistrictcode = hospitaldistrictcode;
+ }
+
+ public String getHospitaldistrictname() {
+ return hospitaldistrictname;
+ }
+
+ public void setHospitaldistrictname(String hospitaldistrictname) {
+ this.hospitaldistrictname = hospitaldistrictname;
+ }
+
public String getLeavehospitaldistrictcode() {
return leavehospitaldistrictcode;
}
--
Gitblit v1.9.3