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 | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 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 85f67ae..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
@@ -48,6 +48,13 @@
* 鏂规鍘熻鍒掑彨 {@code VisitSubtaskFactory} 骞跺悓鏃舵壙杞� {@code writeInSubTask}銆�
* 瀹為檯瀹炵幇鏃舵妸瀹冩敹绐勪负"绾粍瑁� + 绾伐鍏�"锛屽洜涓� {@code writeInSubTask}锛�232 琛岋級閲屾湁澶ч噺
* 鍐欏簱涓庡幓閲嶇紪鎺掞紝娣峰湪涓�璧蜂細璁╂湰绫荤殑 A 妗ｉ�愯绛変环鎺㈤拡澶卞幓鎰忎箟銆�
+ *
+ * <h3>鈿狅笍 鍞竴鐨�"闈炴惉杩�"琛岋細{@code hospno}</h3>
+ * {@link #boxedServiceSubtask} 閲屽浜嗕竴鍙� {@code d.setHospno(inhosp.getInhospno())}銆�
+ * 鍘熷疄鐜扮‘瀹�<b>娌℃湁</b>杩欎竴鍙ワ紝鎵�浠ュ嚭闄㈤摼璺殑 {@code service_subtask.hospno} 涓�鐩磋惤绌猴紱
+ * 鑰� {@code ServiceSubtask.hospno} 鐨勮涔夊氨鏄�"灏辫瘖缂栧彿锛堝搴旂殑 outhospno銆乮nhospno锛�"銆�
+ * 杩欐槸<b>鏈夋剰琛ラ綈</b>锛屼笉鏄妱婕� 鈥斺�� 鍙嶅悜鎺㈤拡锛坽@code verify_inhospvisit_boxed_fields.py}锛�
+ * 鍙牎楠�"鍘� setter 鏄惁閮芥湁瀵瑰簲璋冪敤"锛屼笉浼氬洜姝ゆ姤閿欍��
*/
@Slf4j
@Component
@@ -104,16 +111,32 @@
d.setNurseId(inhosp.getNurseId());
d.setNurseName(inhosp.getNurseName());
d.setInhospid(inhosp.getInhospid());
+ // 鈿狅笍 杩欎竴琛屾槸銆愯ˉ鐨勩�戯紝涓嶆槸鎼繍锛�
+ // 鍘� boxedServiceSubtask 浠庢湭璁� hospno锛岃�� ServiceSubtask.hospno 鐨勮涔夋槸
+ // "灏辫瘖缂栧彿锛堝搴旂殑 outhospno銆乮nhospno锛�"锛堣 ServiceSubtask 瀛楁娉ㄩ噴锛夈��
+ // 缁撴灉灏辨槸鍑洪櫌閾捐矾鐨� service_subtask.hospno 涓�鐩存槸 NULL锛屼笌闂ㄨ瘖閾捐矾涓嶄竴鑷淬��
+ // 鍙栧�硷細pat_med_inhosp.inhospno锛堥棬璇婁晶鍙� pat_med_outhosp.outhospno锛岃 OuthospSubtaskDraft锛夈��
+ 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());
}
@@ -253,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