From 599beddc80e7e50b2099bacdbf7df2d89df00ef2 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期六, 07 十一月 2026 14:42:31 +0800
Subject: [PATCH] fix: 完成时状态与超时判断区分任务组
---
ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index ab800a8..65e67c6 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -32,7 +32,7 @@
</resultMap>
- <resultMap type="com.smartor.domain.PatArchive" id="PatArchiveResult">
+ <resultMap type="com.ruoyi.common.core.domain.entity.PatArchive" id="PatArchiveResult">
<result property="id" column="id"/>
<result property="patientno" column="patientno"/>
<result property="sourcefrom" column="sourcefrom"/>
@@ -93,7 +93,7 @@
</resultMap>
- <resultMap type="com.smartor.domain.PatArchiveOthreInfo" id="PatArchiveOthreInfoResult">
+ <resultMap type="com.ruoyi.patarchive.domain.PatArchiveOthreInfo" id="PatArchiveOthreInfoResult">
<result property="id" column="id"/>
<result property="notrequiredFlag" column="notrequired_flag"/>
<result property="notrequiredreason" column="notrequiredreason"/>
@@ -153,7 +153,7 @@
<result property="filterDrcode" column="filter_drcode"/>
</resultMap>
- <resultMap type="com.smartor.domain.PatMedInhosp" id="PatMedInhospResult">
+ <resultMap type="com.ruoyi.inhospvisit.domain.PatMedInhosp" id="PatMedInhospResult">
<result property="inhospid" column="inhospid"/>
<result property="inhospno" column="inhospno"/>
<result property="serialnum" column="serialnum"/>
@@ -223,7 +223,7 @@
<result property="fuspecialadvice" column="fuspecialadvice"/>
</resultMap>
- <resultMap type="com.smartor.domain.PatMedOuthosp" id="PatMedOuthospResult">
+ <resultMap type="com.ruoyi.outpatientvisit.domain.PatMedOuthosp" id="PatMedOuthospResult">
<result property="id" column="id"/>
<result property="serialnum" column="serialnum"/>
<result property="patidHis" column="patid"/>
@@ -259,7 +259,7 @@
</resultMap>
- <resultMap type="com.smartor.domain.Icd10" id="Icd10Result">
+ <resultMap type="com.ruoyi.common.core.domain.entity.Icd10" id="Icd10Result">
<result property="icdid" column="icdid"/>
<result property="icdcode" column="icdcode"/>
<result property="icdname" column="icdname"/>
@@ -336,7 +336,7 @@
<result property="guid" column="guid"/>
</resultMap>
- <resultMap type="com.smartor.domain.PatMedOperation" id="PatMedOperationResult">
+ <resultMap type="com.ruoyi.othervisit.domain.PatMedOperation" id="PatMedOperationResult">
<result property="id" column="id"/>
<result property="patidHis" column="patid_his"/>
<result property="patcode" column="patcode"/>
@@ -414,7 +414,7 @@
<result property="opleveldesc" column="opleveldesc"/>
</resultMap>
- <resultMap type="com.smartor.domain.PatMedOperationItem" id="PatMedOperationItemResult">
+ <resultMap type="com.ruoyi.othervisit.domain.PatMedOperationItem" id="PatMedOperationItemResult">
<result property="id" column="id"/>
<result property="operationid" column="operationid"/>
<result property="opid" column="opid"/>
@@ -563,7 +563,7 @@
</if>
</select>
- <select id="selectPatArchiveList" parameterType="com.smartor.domain.PatArchive" resultMap="PatArchiveResult">
+ <select id="selectPatArchiveList" parameterType="com.ruoyi.common.core.domain.entity.PatArchive" resultMap="PatArchiveResult">
<include refid="selectPatArchiveVo"/>
where 1=1
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
@@ -607,7 +607,7 @@
</select>
- <select id="selectPatMedInhospListCount" parameterType="com.smartor.domain.PatMedInhosp" resultType="Long">
+ <select id="selectPatMedInhospListCount" parameterType="com.ruoyi.inhospvisit.domain.PatMedInhosp" resultType="Long">
select count(*)
FROM healthy_inhosp
</select>
@@ -631,13 +631,13 @@
WHERE row_num > #{lastRowNumber} LIMIT #{ps}
</select>
- <select id="selectPatArchiveCount" parameterType="com.smartor.domain.PatMedInhosp" resultType="Long">
+ <select id="selectPatArchiveCount" parameterType="com.ruoyi.inhospvisit.domain.PatMedInhosp" resultType="Long">
select count(*)
FROM healthy_archive
</select>
- <select id="selectPatMedInhospList" parameterType="com.smartor.domain.PatMedInhosp" resultMap="PatMedInhospResult">
+ <select id="selectPatMedInhospList" parameterType="com.ruoyi.inhospvisit.domain.PatMedInhosp" resultMap="PatMedInhospResult">
select
b.nurse_id,
b.nurse_name,
@@ -708,7 +708,7 @@
</select>
- <select id="selectPatMedOuthospList" parameterType="com.smartor.domain.PatMedOuthosp"
+ <select id="selectPatMedOuthospList" parameterType="com.ruoyi.outpatientvisit.domain.PatMedOuthosp"
resultMap="PatMedOuthospResult">
select
outhospno,
@@ -750,7 +750,7 @@
</select>
- <select id="selectIcd10List" parameterType="com.smartor.domain.Icd10" resultMap="Icd10Result">
+ <select id="selectIcd10List" parameterType="com.ruoyi.common.core.domain.entity.Icd10" resultMap="Icd10Result">
select
icdcode,
his_icdid,
@@ -857,7 +857,7 @@
</select>
- <select id="selectOperList" parameterType="com.smartor.domain.PatMedOperation"
+ <select id="selectOperList" parameterType="com.ruoyi.othervisit.domain.PatMedOperation"
resultMap="PatMedOperationResult">
select
o.patid_his,
@@ -949,7 +949,7 @@
</if>
</select>
- <select id="selectOperItemList" parameterType="com.smartor.domain.PatMedOperationItem"
+ <select id="selectOperItemList" parameterType="com.ruoyi.othervisit.domain.PatMedOperationItem"
resultMap="PatMedOperationItemResult">
select
oi.operationid,
--
Gitblit v1.9.3