From dc65bb4cbd96e9dfddc8056fd53252607d65cdef Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 08 十月 2026 21:31:20 +0800
Subject: [PATCH] 提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml | 4 ++--
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 3 ++-
ruoyi-admin/target/smartor-suifang-local-sltd.jar | 0
smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml | 2 --
.idea/encodings.xml | 19 +++++++++----------
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 3 +++
smartor/src/main/resources/mapper/smartor/PatMedInspectionItemMapper.xml | 3 +++
smartor/src/main/resources/mapper/smartor/SysUserMapper.xml | 4 ++--
8 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index daa79e6..7aecb31 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -4,13 +4,12 @@
<file url="file://$PROJECT_DIR$/ruoyi-admin/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospProvisionalController.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskPreachformController.java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskmedicalController.java" charset="GBK" />
+ <file url="file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskmedicalController.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ruoyi-admin/src/main/resources" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/ruoyi-admin/src/main/resources/logback.xml" charset="GBK" />
+ <file url="file://$PROJECT_DIR$/ruoyi-admin/src/main/resources/logback.xml" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ruoyi-common/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/dx" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/dx/MessageSend.java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/dx/SmsServiceSoap.java" charset="GBK" />
<file url="file://$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/dx2/Hello.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/dx2/HelloResponse.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/dx2/I5GReply.java" charset="UTF-8" />
@@ -45,22 +44,22 @@
<file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/common/DeepSeekApi.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/PatMedOuthospProvisional.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceSubtaskPreachform.java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceTaskmedical.java" charset="GBK" />
- <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/VO/ServiceTaskmedicalVO.java" charset="GBK" />
+ <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceTaskmedical.java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/VO/ServiceTaskmedicalVO.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/mapper/PatMedOuthospProvisionalMapper.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskPreachformMapper.java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/mapper/ServiceTaskmedicalMapper.java" charset="GBK" />
+ <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/mapper/ServiceTaskmedicalMapper.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/IPatMedOuthospProvisionalService.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/IServiceSubtaskPreachformService.java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/IServiceTaskmedicalService.java" charset="GBK" />
+ <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/IServiceTaskmedicalService.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospProvisionalServiceImpl.java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java" charset="GBK" />
+ <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskPreachformServiceImpl.java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceTaskmedicalServiceImpl.java" charset="GBK" />
+ <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceTaskmedicalServiceImpl.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/resources/mapper/smartor/PatMedOuthospProvisionalMapper.xml" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/smartor/src/main/resources/mapper/smartor/ServiceTaskmedicalMapper.xml" charset="GBK" />
+ <file url="file://$PROJECT_DIR$/smartor/src/main/resources/mapper/smartor/ServiceTaskmedicalMapper.xml" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
<file url="PROJECT" charset="GBK" />
diff --git a/ruoyi-admin/target/smartor-suifang-local-sltd.jar b/ruoyi-admin/target/smartor-suifang-local-sltd.jar
new file mode 100644
index 0000000..9d6cb44
--- /dev/null
+++ b/ruoyi-admin/target/smartor-suifang-local-sltd.jar
Binary files differ
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
index b44db52..361073e 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
@@ -247,8 +247,6 @@
<if test="warnup != null">#{warnup},</if>
<if test="warndown != null">#{warndown},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
- <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
- <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createBy != null">#{createBy},</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml
index e962013..171c9f5 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml
@@ -281,8 +281,8 @@
<if test="orgid != null and orgid != ''">orgid,</if>
create_time
)values(
- <if test="userId != null and userId != ''">#{userId},</if>
- <if test="deptId != null and deptId != ''">#{deptId},</if>
+ <if test="userId != null and userId != 0">#{userId},</if>
+ <if test="deptId != null and deptId != 0">#{deptId},</if>
<if test="userName != null and userName != ''">#{userName},</if>
<if test="nickName != null and nickName != ''">#{nickName},</if>
<if test="email != null and email != ''">#{email},</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 9dbf769..79daabc 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -918,6 +918,7 @@
<if test="fuspecialadvice != null ">#{fuspecialadvice},</if>
<if test="managementDoctor != null ">#{managementDoctor},</if>
<if test="managementDoctorCode != null ">#{managementDoctorCode},</if>
+ <if test="inhospMydFlag != null ">#{inhospMydFlag},</if>
<if test="importanceFlagCode != null ">#{importanceFlagCode},</if>
<if test="emergencyLevelCode != null ">#{emergencyLevelCode},</if>
<if test="encounterSourceId != null ">#{encounterSourceId},</if>
@@ -942,7 +943,7 @@
nurse_id, nurse_name, out_way_id, out_way_name, guid,
operator, operator_id, inhospno, remark,
fuflag, fudate, fuperiod, futypecode, futypedesc, fuadvice, fuspecialadvice, management_doctor,
- management_doctor_doctor,campusid, inhosp_myd_flag, importance_flag_code, emergency_level_code, encounter_source_id,
+ management_doctor_code,campusid, inhosp_myd_flag, importance_flag_code, emergency_level_code, encounter_source_id,
medical_code, medical_name, medical_company
)
values
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInspectionItemMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInspectionItemMapper.xml
index a7470bf..f20627d 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInspectionItemMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInspectionItemMapper.xml
@@ -142,6 +142,9 @@
<if test="createTime != null">create_time,</if>
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
+ <if test="pguid != null">pguid,</if>
+ <if test="guid != null">guid,</if>
+ <if test="pid != null">pid,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="inspectionid != null">#{inspectionid},</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index 4d7d2ca..09054bc 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -460,6 +460,9 @@
<if test="uploadTime != null">upload_time,</if>
<if test="orgid != null">orgid,</if>
<if test="campusid != null and campusid != ''">campusid,</if>
+ <if test="nexttaskflag != null">nexttaskflag,</if>
+ <if test="nexttaskid != null">nexttaskid,</if>
+ <if test="nexttaskname != null">nexttaskname,</if>
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="preachform != null">preachform,</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
index a4fbe23..e9089d8 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
@@ -295,8 +295,8 @@
<if test="campusid != null and campusid != ''">campusid,</if>
create_time
)values(
- <if test="userId != null and userId != ''">#{userId},</if>
- <if test="deptId != null and deptId != ''">#{deptId},</if>
+ <if test="userId != null and userId != 0">#{userId},</if>
+ <if test="deptId != null and deptId != 0">#{deptId},</if>
<if test="userName != null and userName != ''">#{userName},</if>
<if test="nickName != null and nickName != ''">#{nickName},</if>
<if test="email != null and email != ''">#{email},</if>
--
Gitblit v1.9.3