From 18f876d637cf1e9b0b264a4586e4a676a21f8166 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 13 十一月 2026 10:30:46 +0800
Subject: [PATCH] 代码提交
---
ruoyi-task/src/main/java/com/ruoyi/task/api/contract/VisitTaskCreateApiImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/api/contract/VisitTaskCreateApiImpl.java b/ruoyi-task/src/main/java/com/ruoyi/task/api/contract/VisitTaskCreateApiImpl.java
index b298e44..f298e05 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/api/contract/VisitTaskCreateApiImpl.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/api/contract/VisitTaskCreateApiImpl.java
@@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+
import com.ruoyi.task.domain.entity.ServiceSubtaskEntity;
import com.ruoyi.task.domain.ServiceSubtask;
import com.ruoyi.task.domain.ServiceTask;
@@ -239,6 +240,8 @@
dto.setUploadTime(t.getUploadTime());
dto.setUpdateBy(t.getUpdateBy());
dto.setCreateBy(t.getCreateBy());
+ // 2026-11锛氱偣浣嶇紪鐮侊紙浠诲姟 鈫� 瀛愪换鍔＄殑蹇収鍒椾箣涓�锛�
+ dto.setPointLocation(t.getPointLocation());
return dto;
}
@@ -269,13 +272,28 @@
e.setDrname(d.getDrname());
e.setManagementDoctor(d.getManagementDoctor());
e.setManagementDoctorCode(d.getManagementDoctorCode());
+ // 2026-11锛歞eptcode/deptname 鍒楀凡鏀瑰悕 leaveldeptcode/leaveldeptname锛堝嚭闄㈢淮搴︼級锛�
+ // 鍘� sendlimit* 鍥涗釜绌哄垪澶嶇敤涓� hospitaldistrictcode/name锛堝湪闄㈢梾鍖猴級銆乨eptcode/name锛堝湪闄㈢瀹わ級銆�
+ e.setLeaveldeptcode(d.getLeaveldeptcode());
+ e.setLeaveldeptname(d.getLeaveldeptname());
+ // 鈿狅笍 杩� 4 鍒楀彧鏈夈�屽嚭闄㈤殢璁裤�嶄細濉�硷紙VisitSubtaskFactory 浠� pat_med_inhosp 鍙栵級锛�
+ // 闂ㄨ瘖/鎵嬫湳/鎵爜/绛斿嵎绛夎矾寰勭殑鑽夌閲屼粛鏄� null 鈥斺�� 涓庢敼閫犲墠杩欎簺鍒椾笉鍐欑殑鏁堟灉涓�鑷淬��
e.setDeptcode(d.getDeptcode());
e.setDeptname(d.getDeptname());
+ e.setHospitaldistrictcode(d.getHospitaldistrictcode());
+ e.setHospitaldistrictname(d.getHospitaldistrictname());
e.setLeavehospitaldistrictcode(d.getLeavehospitaldistrictcode());
e.setLeavehospitaldistrictname(d.getLeavehospitaldistrictname());
e.setLeaveicd10code(d.getLeaveicd10code());
e.setLeavediagname(d.getLeavediagname());
e.setDiagname(d.getDiagname());
+ // 2026-11锛氶噸瑕佹�ф爣璁扮紪鐮侊紙鏃ラ棿鎵嬫湳/鏃ラ棿璇婄枟/鏃犫�︼級锛屾潵鑷� pat_med_inhosp.importance_flag_code銆�
+ // 鍙湁銆屽嚭鍏ラ櫌闅忚銆嶉摼璺細濉�硷紙VisitSubtaskFactory锛夛紱闂ㄨ瘖/鎵嬫湳绛夎崏绋块噷涓� null 鈫�
+ // insert 鐨勬潯浠跺垪鐩存帴璺宠繃锛屼笌鏀归�犲墠杩欎簺鍒椾笉鍐欑殑鏁堟灉涓�鑷淬��
+ e.setImportanceFlagCode(d.getImportanceFlagCode());
+ // 2026-11锛氱偣浣嶇紪鐮侊紙寤哄瓙浠诲姟鏃朵粠 service_task.point_location 鍚屾锛夈��
+ // 闂ㄨ瘖/鎵爜绛夎崏绋块噷涓� null 鈫� insert 鐨勬潯浠跺垪鐩存帴璺宠繃锛屼笌鏀归�犲墠涓嶅啓璇ュ垪鏁堟灉涓�鑷淬��
+ e.setPointLocation(d.getPointLocation());
e.setTemplateid(d.getTemplateid());
e.setTemplatename(d.getTemplatename());
e.setLibtemplateid(d.getLibtemplateid());
@@ -334,8 +352,7 @@
// 瑙� OuthospSubtaskDraft 鐨勭被娉ㄩ噴銆�
// ------------------------------------------------------------------
if (d instanceof com.ruoyi.common.core.service.dto.OuthospSubtaskDraft) {
- com.ruoyi.common.core.service.dto.OuthospSubtaskDraft o =
- (com.ruoyi.common.core.service.dto.OuthospSubtaskDraft) d;
+ com.ruoyi.common.core.service.dto.OuthospSubtaskDraft o = (com.ruoyi.common.core.service.dto.OuthospSubtaskDraft) d;
// hospno 宸蹭笂鎻愬埌鐖剁被 VisitSubtaskDraft锛堜笂闈㈢粺涓�鏄犲皠杩囦簡锛夛紝杩欓噷涓嶅啀閲嶅
// 鍙湁鐖剁被娌℃湁鐨勫瓧娈垫墠鍦ㄨ繖閲岃ˉ鏄犲皠锛堝叾浣欏 sendname/sfzh/phone/sex/age 鐖剁被宸叉湁锛�
e.setAdmindate(o.getAdmitdate());
--
Gitblit v1.9.3