From e2a8c2e004a7ef5942994ad47e350576339413ef Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 09 七月 2026 15:37:18 +0800
Subject: [PATCH] 【本地】预入院查询
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 923b7e4..44bef82 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -28,6 +28,7 @@
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.ObjectUtils;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.Cacheable;
@@ -402,6 +403,13 @@
serviceSubtaskRes.setSendstateView(1L);
if (serviceSubtaskRes.getSendstate() == 6) serviceSubtaskRes.setSendstateView(2L);
if (serviceSubtaskRes.getSendstate() == 4) serviceSubtaskRes.setSendstateView(3L);
+ // 濉厖褰撳墠琛ュ伩
+ if (StringUtils.isEmpty(serviceSubtask.getCurrentPreachform())){
+ if(StringUtils.isNotEmpty(serviceSubtask.getPreachform())){
+ //榛樿鍙栫涓�涓�
+ serviceSubtaskRes.setCurrentPreachform(serviceSubtask.getPreachform().split(",")[0]);
+ }
+ }
serviceSubtaskResList.add(serviceSubtaskRes);
}
return serviceSubtaskResList;
@@ -722,12 +730,11 @@
serviceTaskoper.setGuid(serviceTask.getGuid());
serviceTaskoper.setOrgid(serviceTask.getOrgid());
serviceTaskoper.setCreateTime(new Date());
- //閰嶇疆绉戝鐥呭尯
+ //閰嶇疆绉戝銆佺梾鍖�
serviceTaskoper.setDeptCode(serviceTaskVO.getDeptcode());
serviceTaskoper.setDeptName(serviceTaskVO.getDeptname());
serviceTaskoper.setWardCode(serviceTaskVO.getLeavehospitaldistrictcode());
serviceTaskoper.setWardName(serviceTaskVO.getLeavehospitaldistrictname());
-
//澶氶�夋墜鏈瓑绾�
if (StringUtils.isNotEmpty(serviceTaskVO.getOplevelcode())) {
String[] opLevelcodes = serviceTaskVO.getOplevelcode().split(",");
@@ -4558,6 +4565,11 @@
return resultMap;
}
+ @Override
+ public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds) {
+ return serviceSubtaskMapper.statQuestionOption(taskIds);
+ }
+
private Boolean saveServiceSubtaskDetail(ServiceSubtask serviceSubtask) {
Boolean result = true;
//3.4 濡傛灉3.1鎴�3.2涓簍rue鐨勮瘽锛屾牴鎹畉ype鍒ゆ柇浠�涔堢被鍨�
--
Gitblit v1.9.3