From c24d16a37523a49080392610357872ce580cbc38 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 26 十月 2026 14:03:33 +0800
Subject: [PATCH] 代码提交
---
ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/support/VisitSubtaskFactory.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/support/VisitSubtaskFactory.java b/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/support/VisitSubtaskFactory.java
index d5f44db..3b6de07 100644
--- a/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/support/VisitSubtaskFactory.java
+++ b/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/support/VisitSubtaskFactory.java
@@ -119,14 +119,24 @@
d.setHospno(inhosp.getInhospno());
d.setDrcode(inhosp.getDrcode());
d.setDrname(inhosp.getDrname());
- d.setDeptcode(inhosp.getLeaveldeptcode());
- d.setDeptname(inhosp.getLeaveldeptname());
+ d.setLeaveldeptcode(inhosp.getLeaveldeptcode());
+ d.setLeaveldeptname(inhosp.getLeaveldeptname());
d.setLeavehospitaldistrictcode(inhosp.getLeavehospitaldistrictcode());
d.setLeavehospitaldistrictname(inhosp.getLeavehospitaldistrictname());
+ // ---- 2026-11 鏂板锛氬湪闄㈢淮搴﹁惤銆屽鐢ㄥ垪銆� ----
+ // 鑳屾櫙锛歴ervice_subtask 鐨� deptcode/deptname 鏀瑰悕 leaveldeptcode/leaveldeptname锛�
+ // 鍘� sendlimitabegin/aend銆乻endlimitpbegin/pend 鍥涗釜绌哄垪澶嶇敤涓�
+ // hospitaldistrictcode/name锛堝湪闄㈢梾鍖猴級銆乨eptcode/name锛堝湪闄㈢瀹わ級銆�
+ // 鍙ｅ緞锛氬嚭闄㈢淮搴︿粛鎸夊師鍐欐硶钀� leavel*锛堜笅闈� type 4/5 鐨勮鐩栦篃淇濇寔鍘熸牱锛岃惤搴撲綅缃笉鍙橈級锛�
+ // 杩欓噷鍙槸鎶� pat_med_inhosp 鐨勩�屽湪闄㈢瀹� / 鍦ㄩ櫌鐥呭尯銆嶉澶栧瓨涓�浠斤紝渚夸簬鎸夊湪闄㈢淮搴︾粺璁°��
+ d.setDeptcode(inhosp.getDeptcode());
+ d.setDeptname(inhosp.getDeptname());
+ d.setHospitaldistrictcode(inhosp.getHospitaldistrictcode());
+ d.setHospitaldistrictname(inhosp.getHospitaldistrictname());
// ---- 鍘� L1128-1134锛歵ype 4/5 鏀圭敤鍏ラ櫌缁村害 ----
if (type != null && (type == 4 || type == 5)) {
- d.setDeptcode(inhosp.getDeptcode());
- d.setDeptname(inhosp.getDeptname());
+ d.setLeaveldeptcode(inhosp.getDeptcode());
+ d.setLeaveldeptname(inhosp.getDeptname());
d.setLeavehospitaldistrictcode(inhosp.getHospitaldistrictcode());
d.setLeavehospitaldistrictname(inhosp.getHospitaldistrictname());
}
@@ -266,8 +276,13 @@
d.setInhospid(inhosp.getInhospid());
d.setDrcode(inhosp.getDrcode());
d.setDrname(inhosp.getDrname());
- d.setDeptcode(inhosp.getLeaveldeptcode());
- d.setDeptname(inhosp.getLeaveldeptname());
+ d.setLeaveldeptcode(inhosp.getLeaveldeptcode());
+ d.setLeaveldeptname(inhosp.getLeaveldeptname());
+ // 2026-11锛氬叆闄�/鍦ㄩ櫌缁村害钀姐�屽鐢ㄥ垪銆嶏紙鍙ｅ緞鍚� boxedServiceSubtask锛�
+ d.setDeptcode(inhosp.getDeptcode());
+ d.setDeptname(inhosp.getDeptname());
+ d.setHospitaldistrictcode(inhosp.getHospitaldistrictcode());
+ d.setHospitaldistrictname(inhosp.getHospitaldistrictname());
d.setLeavehospitaldistrictcode(inhosp.getLeavehospitaldistrictcode());
d.setLeavehospitaldistrictname(inhosp.getLeavehospitaldistrictname());
// ---- 鍘� L1242-1251 ----
--
Gitblit v1.9.3