From 6e3d0a2097a4d841e941a84ec54780a67eb60ba1 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 10 七月 2026 09:22:56 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组
---
smartor/src/main/java/com/smartor/common/ScheduleSubtaskBuilder.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/common/ScheduleSubtaskBuilder.java b/smartor/src/main/java/com/smartor/common/ScheduleSubtaskBuilder.java
index 9c89fc5..e281e01 100644
--- a/smartor/src/main/java/com/smartor/common/ScheduleSubtaskBuilder.java
+++ b/smartor/src/main/java/com/smartor/common/ScheduleSubtaskBuilder.java
@@ -107,9 +107,9 @@
* 鎶� patTaskRelevance 鐨勫熀鍑嗘棩瀛楁鍥炲～鍒� baseSubtask 鍚庯紝濮旀墭缁欒В鑰﹀叆鍙ｃ��
*/
public void buildSubtasksForPatient(ServiceTask serviceTask,
- ServiceTaskVO serviceTaskVO,
+ List<Map<String, Object>> preachformList,
ServiceTaskSchedule schedule,
- List<ServiceTaskScheduleDetail> detailList,
+ List<ServiceTaskScheduleDetail> scheduleDetailList,
PatTaskRelevance patTaskRelevance,
ServiceSubtask baseSubtask) {
// 鍥炲～鍩哄噯鏃ュ瓧娈碉紙鎵嬪姩璺緞鐨� baseSubtask 鐢� VO 鎷艰锛屽熀鍑嗘棩瀛楁鍙兘鏈～鍏級
@@ -123,8 +123,7 @@
if (baseSubtask.getAdmindate() == null) {
baseSubtask.setAdmindate(patTaskRelevance.getVisittime());
}
- buildSubtasksForPatient(serviceTask, schedule, detailList, baseSubtask,
- serviceTaskVO.getPreachformList());
+ buildSubtasksForPatient(serviceTask, schedule, scheduleDetailList, baseSubtask, preachformList);
}
/**
--
Gitblit v1.9.3