From a795416526f617d39d7c022800fbc84d975f70a1 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 24 七月 2026 17:47:00 +0800
Subject: [PATCH] 【省立同德】查询问卷列表优化
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 17 ++++++++++-------
ruoyi-admin/src/main/resources/application-huizhou.yml | 8 +++++++-
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-huizhou.yml b/ruoyi-admin/src/main/resources/application-huizhou.yml
index d3f1eb9..237f1a3 100644
--- a/ruoyi-admin/src/main/resources/application-huizhou.yml
+++ b/ruoyi-admin/src/main/resources/application-huizhou.yml
@@ -6,7 +6,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:kingbase8://10.100.1.23:54321/smartor-huizhou?currentSchema=smartor&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=60000&socketTimeout=120000
+ url: jdbc:kingbase8://10.100.1.23:54321/smartor-huizhou?currentSchema=smartor,sys_catalog&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=60000&socketTimeout=120000
username: smartor
password: smartor.2025
driverClassName: com.kingbase8.Driver
@@ -241,3 +241,9 @@
#鏂囦欢涓婁紶鍦板潃
fileUpload:
profile:
+
+# PageHelper鍒嗛〉鎻掍欢
+pagehelper:
+ helperDialect: mysql
+ supportMethodsArguments: true
+ params: count=countSql
\ No newline at end of file
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 c0682d7..d211e97 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -4869,7 +4869,7 @@
ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
if (ObjectUtils.isNotEmpty(serviceTaskVo.getDeptcode())) {
serviceTaskdept.setDeptType("1");
- serviceTaskdept.setDeptCode(serviceTask.getDeptcode());
+ serviceTaskdept.setDeptCode(serviceTaskVo.getDeptcode());
}
if (ObjectUtils.isNotEmpty(serviceTaskVo.getLeavehospitaldistrictcode())) {
serviceTaskdept.setDeptType("2");
@@ -4885,7 +4885,7 @@
patArchive.setId(999999999L);
patArchive.setName("铏氭嫙鎮ｈ��");
//灏佽serviceSubtask
- ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patArchive);
+ ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, serviceTaskdepts.get(0), patArchive);
int i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
//鏍规嵁鐢熸垚澶栭摼
if (ObjectUtils.isNotEmpty(serviceSubtask.getTaskid()) && ObjectUtils.isNotEmpty(serviceSubtask.getPatid()) && ObjectUtils.isNotEmpty(serviceSubtask.getId())) {
@@ -4919,7 +4919,7 @@
return content;
}
- public ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatArchive patArchive) {
+ public ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, ServiceTaskdept serviceTaskdept, PatArchive patArchive) {
ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
serviceSubtask.setTaskid(serviceTask.getTaskid());
if (StringUtils.isNotEmpty(serviceTask.getLibtemplateid()))
@@ -4928,10 +4928,13 @@
// serviceSubtask.setNurseName(patMedInhosp1.getNurseName());
// serviceSubtask.setDrcode(patMedInhosp1.getDrcode());
// serviceSubtask.setDrname(patMedInhosp1.getDrname());
- serviceSubtask.setDeptcode(serviceTask.getDeptcode());
- serviceSubtask.setDeptname(serviceTask.getDeptname());
- serviceSubtask.setLeavehospitaldistrictcode(serviceTask.getLeavehospitaldistrictcode());
- serviceSubtask.setLeavehospitaldistrictname(serviceTask.getLeavehospitaldistrictname());
+ if(StringUtils.isNotEmpty(serviceTaskdept.getDeptType()) && serviceTaskdept.getDeptType().equals("1")){
+ serviceSubtask.setDeptcode(serviceTaskdept.getDeptCode());
+ serviceSubtask.setDeptname(serviceTaskdept.getDeptName());
+ }else {
+ serviceSubtask.setLeavehospitaldistrictcode(serviceTaskdept.getDeptCode());
+ serviceSubtask.setLeavehospitaldistrictname(serviceTaskdept.getDeptName());
+ }
serviceSubtask.setTemplateid(serviceTask.getTemplateid());
serviceSubtask.setTemplatename(serviceTask.getTemplatename());
serviceSubtask.setPatid(patArchive.getId());
--
Gitblit v1.9.3