From 2d3b575ed96eee7ccd5b324baa3135d2236934ac Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 13 十一月 2026 16:39:37 +0800
Subject: [PATCH] 【市一】1、登录服务问题处理 2、电话挂断问题处理 3、查询报错问题处理
---
ruoyi-common/src/main/java/com/ruoyi/common/core/service/dto/VisitSubtaskDraft.java | 86 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 84 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..652fd54 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;
/** 绂婚櫌鐥呭尯鍚嶇О */
@@ -90,6 +111,19 @@
private String leavediagname;
/** 璇婃柇鍚嶇О */
private String diagname;
+
+ /**
+ * 閲嶈鎬ф爣璁扮紪鐮侊紙2026-11 鏂板锛夛細鏉ユ簮 {@code pat_med_inhosp.importance_flag_code}锛�
+ * 钀藉簱鍒� {@code service_subtask.importance_flag_code}銆�
+ * <p>
+ * 鍒ゆ柇銆屾棩闂淬�嶅氨鐪嬭繖涓瓧娈碉紙{@code ImportFlagEnum} 鐨� {@code FH0165.01} 鏃ラ棿鎵嬫湳 /
+ * {@code FH0165.02} 鏃ラ棿璇婄枟锛涚幇鍦哄簱瀛樼殑鏄腑鏂囨弿杩般�屾棩闂存墜鏈�嶃�屾棩闂磋瘖鐤椼�嶏紝鍙兘澶氬�硷級銆�
+ * <p>
+ * 鈿狅笍 涓� {@code deptcode}/{@code leaveldeptcode} 閭ｆ壒涓嶅悓锛�<b>涓嶅仛缁村害鏀瑰啓</b>
+ * 锛堝叆闄㈠鏁� type=4/5 涔熺収鏍峰甫鍘熷�硷級锛屽畠鎻忚堪鐨勬槸銆岃繖娆′綇闄㈢殑閲嶈鎬�/鏃ラ棿灞炴�с�嶏紝涓庣瀹ゆ棤鍏炽��
+ * 闂ㄨ瘖閾捐矾锛坽@link OuthospSubtaskDraft}锛夋病鏈夎繖涓潵婧愶紝鎭掍负 {@code null}銆�
+ */
+ private String importanceFlagCode;
// ==================== 妯℃澘锛堝師 serviceTask锛� ====================
/** 闂嵎妯℃澘ID */
@@ -352,6 +386,14 @@
this.serialnum = serialnum;
}
+ public String getHospno() {
+ return hospno;
+ }
+
+ public void setHospno(String hospno) {
+ this.hospno = hospno;
+ }
+
public String getNurseId() {
return nurseId;
}
@@ -400,6 +442,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;
}
@@ -414,6 +472,22 @@
public void setDeptname(String deptname) {
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() {
@@ -456,6 +530,14 @@
this.diagname = diagname;
}
+ public String getImportanceFlagCode() {
+ return importanceFlagCode;
+ }
+
+ public void setImportanceFlagCode(String importanceFlagCode) {
+ this.importanceFlagCode = importanceFlagCode;
+ }
+
public Long getTemplateid() {
return templateid;
}
--
Gitblit v1.9.3