From 3cef3e781e6da1994c77bd4045a949f36878874a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 20 二月 2025 19:00:15 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java | 3 ++-
ruoyi-admin/pom.xml | 2 +-
smartor/src/main/java/com/smartor/domain/BingRenXX.java | 6 +++---
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java | 3 ++-
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 6 +++---
smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java | 5 +++--
6 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 1528d0a..3fd6b63 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<!-- <packaging>war</packaging>-->
<packaging>jar</packaging>
- <artifactId>smartor-admin</artifactId>
+ <artifactId>smartor-suifang</artifactId>
<description>
web鏈嶅姟鍏ュ彛
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
index 6f28271..3dd9da6 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
@@ -72,8 +72,9 @@
* @return 淇敼鍚庣殑 SQL
*/
private String modifySqlWithorgidId(String originalSql, String orgid) {
- if (originalSql.contains("insert into") || originalSql.contains("INSERT INTO") || originalSql.contains("from sys_menu") || originalSql.contains("update sys_menu"))
+ if (originalSql.contains("insert into") || originalSql.contains("INSERT INTO") || originalSql.contains("from sys_menu") || originalSql.contains("update sys_menu")) {
return originalSql;
+ }
// 鎻愬彇 orgid 鐨� WHERE 瀛愬彞
String whereClause = " orgid = '" + orgid + "'";
diff --git a/smartor/src/main/java/com/smartor/domain/BingRenXX.java b/smartor/src/main/java/com/smartor/domain/BingRenXX.java
index a4e68f9..220e005 100644
--- a/smartor/src/main/java/com/smartor/domain/BingRenXX.java
+++ b/smartor/src/main/java/com/smartor/domain/BingRenXX.java
@@ -20,8 +20,8 @@
@ApiModelProperty(value = "缁勭粐鏈烘瀯閾濈當")
public String ZuZhiJGMC;
-
- @ApiModelProperty(value = "鏈烘瀯ID")
- public String orgid;
+//
+// @ApiModelProperty(value = "鏈烘瀯ID")
+// public String orgid;
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
index 2b9c71a..17c594a 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
@@ -191,7 +191,7 @@
}
}
}
- if (CollectionUtils.isNotEmpty(ivrLibaTargetVO.getTargetoptionList()) && ivrLibaTargetVO.getValueType() == 1) {
+ if (CollectionUtils.isNotEmpty(ivrLibaTargetVO.getTargetoptionList()) && ivrLibaTargetVO.getScriptType().equals("1") || CollectionUtils.isNotEmpty(ivrLibaTargetVO.getTargetoptionList()) && ivrLibaTargetVO.getScriptType().equals("2")) {
//閫夐」澶勭悊
for (IvrLibaTargetoption ivrLibaTargetoption : ivrLibaTargetVO.getTargetoptionList()) {
if (CollectionUtils.isNotEmpty(ivrLibaTargetoption.getNodynamiccruxs())) {
@@ -216,7 +216,8 @@
}
}
- } else if (ivrLibaTargetVO.getValueType() == 2 || ivrLibaTargetVO.getValueType() == 3) {
+ } else if (ivrLibaTargetVO.getScriptType().equals("3") || ivrLibaTargetVO.getScriptType().equals("4")) {
+ //杩欓噷鍏堢瓑绛�
}
return ivrLibaTarget.getId().intValue();
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
index fbb8737..ff10844 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -265,6 +265,8 @@
serviceSubtaskVO.setTaskGuid(serviceTaskVO.getTaskguid());
List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
+ serviceSubtask.setId(serviceSubtaskList.get(0).getId());
+ serviceSubtask.setUpdateTime(new Date());
serviceSubtaskMapper.updateServiceSubtaskByTaskGuid(serviceSubtask);
} else {
serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
@@ -298,7 +300,6 @@
List<BaseOrganization> baseOrganizations = baseOrganizationMapper.selectBaseOrganizationList(baseOrganization);
if (CollectionUtils.isNotEmpty(baseOrganizations)) {
YongHuXX yongHuXX = serviceQueryInfo.getYeWuXX().getYongHuXX();
- yongHuXX.setYongHuID(baseOrganizations.get(0).getOrgid());
yongHuXX.setZuZhiJGID(baseOrganizations.get(0).getGuid());
yongHuXX.setZuZhiJGMC(baseOrganizations.get(0).getOrganizationName());
serviceQueryInfo.getYeWuXX().setYongHuXX(yongHuXX);
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 924ba33..2f4a4c7 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -154,7 +154,8 @@
stop_state,
leavehospitaldistrictcode,
leavehospitaldistrictname,
- leavediagname,leaveicd10code
+ leavediagname,
+ leaveicd10code
from service_subtask
</sql>
@@ -732,9 +733,8 @@
<if test="patfrom != null ">patfrom=#{patfrom},</if>
<if test="taskGuid != null ">task_guid=#{taskGuid},</if>
</trim>
- where task_guid = #{taskGuid}
+ where task_guid = #{taskGuid} and task_name = #{taskName}
</update>
-
<update id="deleteServiceSubtaskById" parameterType="Long">
--
Gitblit v1.9.3