From cc479e6a056785103996cc7ea67dbd5faa3e800e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 19 十月 2026 18:07:22 +0800
Subject: [PATCH] 数据采集模块
---
smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml | 45 +++++++++++++++++++--------------------------
1 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml
index 30fe095..f8cd913 100644
--- a/smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml
@@ -26,7 +26,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"/>
@@ -147,7 +147,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"/>
@@ -215,7 +215,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="patid" column="patid"/>
@@ -367,25 +367,25 @@
<select id="yhyjsxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserRoleResult">
select user_id, role_id, orgid
FROM yhyjsxx
- <where>
- <if test="hisUserId != null ">and user_id = #{hisUserId}</if>
- </where>
+ where 1=1
+ <if test="hisUserId != null ">
+ and user_id = #{hisUserId}
+ </if>
</select>
<select id="yhyksxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserDeptResult">
select user_id, user_code, dept_type,department_id as
dept_id,dept_name,deptparent,del_flag,orgid,create_time,create_by,update_time,update_by
FROM yhyksxx
- <where>
- user_id != 'admin'
+ where 1=1
+ and user_id != 'admin'
<if test="hisUserId != null ">and user_id = #{hisUserId}</if>
- </where>
</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>
+ where 1=1
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
<if test="sourcefrom != null ">and sourcefrom = #{sourcefrom}</if>
@@ -415,11 +415,10 @@
<if test="casePersonAge != null ">and case_person_age = #{casePersonAge}</if>
<if test="filterDrname != null ">and filter_drname = #{filterDrname}</if>
<if test="filterDrcode != null ">and filter_drcode = #{filterDrcode}</if>
- </where>
</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 cryxx
</select>
@@ -443,13 +442,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 hzjbxx
</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,
@@ -494,8 +493,7 @@
b.fuadvice
FROM
cryxx b
- <where>
-
+ where 1=1
<if test="startOutHospTime != null ">and to_char(b.endtime,'YYMMDD') >=
to_char(#{startOutHospTime}::date,'YYMMDD')
</if>
@@ -518,11 +516,10 @@
<if test="outWayId != null ">and b.out_way_id = #{outWayId}</if>
<if test="outWayName != null ">and b.out_way_name = #{outWayName}</if>
<if test="orgid != null ">and b.orgid = #{orgid}</if>
- </where>
</select>
- <select id="selectPatMedOuthospList" parameterType="com.smartor.domain.PatMedOuthosp"
+ <select id="selectPatMedOuthospList" parameterType="com.ruoyi.outpatientvisit.domain.PatMedOuthosp"
resultMap="PatMedOuthospResult">
select
outhospno,
@@ -552,8 +549,7 @@
patname,
mainsuit
from mzxx
- <where>
-
+ where 1=1
<if test="beginTime != null ">and to_char( admitdate,'YYMMDD') >=
to_char(#{beginTime}::date,'YYMMDD')
</if>
@@ -561,7 +557,6 @@
to_char(#{endTime}::date,'YYMMDD')
</if>
- </where>
</select>
@@ -574,7 +569,7 @@
icdname,
icdpym
from jbxx
- <where>
+ where 1=1
<if test="icdcode != null and icdcode != ''">and icdcode = #{icdcode}</if>
<if test="lastflag != null and lastflag != ''">and lastflag = #{lastflag}</if>
<if test="chimedflag != null and chimedflag != ''">and chimedflag = #{chimedflag}</if>
@@ -585,7 +580,6 @@
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
<if test="hisIcdid != null and hisIcdid != ''">and his_icdid = #{hisIcdid}</if>
- </where>
</select>
@@ -596,7 +590,7 @@
u.birthday,u.orgid,u.job_phone,u.phonenumber, u.sex, u.status,
u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
from ryxx u
- <where>
+ where 1=1
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}
</if>
@@ -627,7 +621,6 @@
<if test="phonenumber != null and phonenumber != ''">
AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if>
- </where>
</select>
<select id="selectDeptList" parameterType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="SysDeptResult">
--
Gitblit v1.9.3