From c722df8c090c6097ea1d4d15fa53da7992c9aa2f Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 12 十二月 2025 14:11:16 +0800
Subject: [PATCH] 【丽水修复】历史随访记录导出修复
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 3c14caa..d2d92c1 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -2947,4 +2947,45 @@
return total;
}
+
+ /**
+ * 鍘嗗彶闅忚璁板綍瀵煎嚭绫诲皝瑁�
+ * ServiceSubtask 杞崲涓� ServiceSubtaskDiagname
+ */
+ public List<ServiceSubtaskDiagname> convertToDiagnameList(List<ServiceSubtask> subtaskList) {
+ if (CollectionUtils.isEmpty(subtaskList)) {
+ return new ArrayList<>();
+ }
+
+ return subtaskList.stream().map(subtask -> {
+ ServiceSubtaskDiagname diagname = new ServiceSubtaskDiagname();
+
+ diagname.setTaskName(subtask.getTaskName());
+ diagname.setSendstate(subtask.getSendstate());
+ diagname.setSendname(subtask.getSendname());
+ diagname.setLeavediagname(subtask.getLeavediagname());
+ diagname.setSuggest(subtask.getSuggest());
+ diagname.setOperator(subtask.getOperator());
+ diagname.setFinishtime(subtask.getFinishtime());
+ diagname.setLongSendTime(subtask.getLongSendTime());
+ diagname.setEndtime(subtask.getEndtime());
+ //璁＄畻鍑洪櫌澶╂暟
+ if(!Objects.isNull(diagname.getEndtime())){
+ Integer endDay = DateUtils.differentDaysByMillisecond(diagname.getEndtime(),new Date());
+ diagname.setEndDay(endDay);
+ }
+ diagname.setSfzh(subtask.getSfzh());
+ diagname.setPhone(subtask.getPhone());
+ diagname.setNurseName(subtask.getNurseName());
+ diagname.setDrname(subtask.getDrname());
+ diagname.setDeptname(subtask.getDeptname());
+ diagname.setLeavehospitaldistrictname(subtask.getLeavehospitaldistrictname());
+ diagname.setTemplatename(subtask.getTemplatename());
+ diagname.setPreachform(subtask.getPreachform());
+ diagname.setResult(subtask.getResult());
+
+ return diagname;
+ }).collect(Collectors.toList());
+ }
+
}
--
Gitblit v1.9.3