From 192eba815f89c11f74361d62b4d083d88673f55f Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 13 十一月 2026 11:30:26 +0800
Subject: [PATCH] 报错处理
---
ruoyi-inhospvisit/src/main/resources/mapper/inhospvisit/PatMedInhospMapper.xml | 50 +++++++++++++++++---------------------------------
1 files changed, 17 insertions(+), 33 deletions(-)
diff --git a/ruoyi-inhospvisit/src/main/resources/mapper/inhospvisit/PatMedInhospMapper.xml b/ruoyi-inhospvisit/src/main/resources/mapper/inhospvisit/PatMedInhospMapper.xml
index 15c47f3..97e03fe 100644
--- a/ruoyi-inhospvisit/src/main/resources/mapper/inhospvisit/PatMedInhospMapper.xml
+++ b/ruoyi-inhospvisit/src/main/resources/mapper/inhospvisit/PatMedInhospMapper.xml
@@ -180,18 +180,11 @@
AND b.del_flag = '0'
AND a.idcardno IS NOT NULL
<if test="inhospid != null">and b.inhospid = #{inhospid}</if>
- <if test="startOutHospTime != null ">and date_format(b.endtime,'%y%m%d') >=
- date_format(#{startOutHospTime},'%y%m%d')
- </if>
- <if test="endOutHospTime != null ">and date_format(b.endtime,'%y%m%d') <=
- date_format(#{endOutHospTime},'%y%m%d')
- </if>
- <if test="startInHospTime != null ">and date_format(b.starttime,'%y%m%d') >=
- date_format(#{startInHospTime},'%y%m%d')
- </if>
- <if test="endInHospTime != null ">and date_format(b.starttime,'%y%m%d') <=
- date_format(#{endInHospTime},'%y%m%d')
- </if>
+ <!-- 鏃堕棿鑼冨洿淇濇寔鈥滄寜鏃ユ湡銆佺粨鏉熸棩鍚綋澶┾�濈殑璇箟锛涘垪淇濇寔瑁稿垪锛岄伩鍏� date_format 瀵艰嚧绱㈠紩澶辨晥 -->
+ <if test="startOutHospTime != null ">and b.endtime >= DATE(#{startOutHospTime})</if>
+ <if test="endOutHospTime != null ">and b.endtime < DATE_ADD(DATE(#{endOutHospTime}), INTERVAL 1 DAY)</if>
+ <if test="startInHospTime != null ">and b.starttime >= DATE(#{startInHospTime})</if>
+ <if test="endInHospTime != null ">and b.starttime < DATE_ADD(DATE(#{endInHospTime}), INTERVAL 1 DAY)</if>
<if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
'%')
</if>
@@ -209,7 +202,6 @@
<if test="orgid != null ">and b.orgid = #{orgid}</if>
<if test="campusid != null ">and b.campusid = #{campusid}</if>
<if test="serialnum != null ">and b.serialnum = #{serialnum}</if>
- <if test="endtime != null ">and b.endtime = #{endtime}</if>
<if test="patno != null ">and b.patno = #{patno}</if>
<if test="nurseId != null ">and b.nurse_id = #{nurseId}</if>
<if test="nurseName != null and nurseName != ''">and b.nurse_name = #{nurseName}</if>
@@ -382,13 +374,13 @@
a.idcardno
FROM
<include refid="selectPatMedInhospListFromWhere"/>
- GROUP BY
- b.inhospid,
- a.age,
- a.age_unit,
- a.telcode,
- a.id,
- a.sex
+ <!--
+ 鎬ц兘璇存槑锛歱at_med_inhosp.inhospid 鍞竴锛宲at_archive.id 鏄富閿紝a.id = b.patid 涓�瀵逛竴锛�
+ 鍘� GROUP BY 鏄浣欑殑锛屼笖浼氳 MySQL 鍏堢墿鍖� 60 鍒椾复鏃惰〃鍐嶆帓搴忥紝LIMIT 鏃犳硶鎻愬墠缁撴潫銆�
+ 涓婄嚎鍓嶈纭浠ヤ笅涓ゆ潯鍧囨棤閲嶅锛�
+ SELECT inhospid, COUNT(*) c FROM pat_med_inhosp GROUP BY inhospid HAVING c > 1 LIMIT 10;
+ SELECT id, COUNT(*) c FROM pat_archive GROUP BY id HAVING c > 1 LIMIT 10;
+ -->
<if test="cry != null and cry==1">
order by b.endtime desc
</if>
@@ -437,23 +429,15 @@
<!--
鍒嗛〉鎬绘暟锛圥ageHelper 鎵嬪啓 count锛宨d = 涓绘煡璇� id + _COUNT 浼氳鑷姩閲囩敤锛夈��
- 鍘熺姸鎬侊細涓绘煡璇㈠甫 GROUP BY锛宲agehelper 鐨� CountSqlParser#isSimpleCount 鍒ゅ畾涓�
- "涓嶈兘绠�鍖�"锛屼簬鏄�绘暟鍙樻垚 SELECT count(0) FROM ( 涓婇潰閭ｆ潯 60 鍒楁煡璇� ) tmp_count 鈥�
- 绛変簬姣忔缈婚〉鎶婃暣鏉℃煡璇㈠啀璺戜竴閬嶃��
-
- 杩欓噷淇濇寔銆愬畬鍏ㄧ浉鍚岀殑 FROM/WHERE/GROUP BY銆戯紙鍏辩敤 selectPatMedInhospListFromWhere 鐗囨锛�
- 鏉′欢涓嶄細婕傦級锛屼絾瀛愭煡璇㈠彧 select 1锛屼笉鐗╁寲 60 鍒楋紝涔熶笉甯� order by銆�
- 鍥犱负鍒嗙粍閿寘鍚� a.id 鑰岃繖涓� join 鏄竴瀵逛竴锛屽垎缁勬暟 == join 缁撴灉琛屾暟锛屾�绘暟涓庡師鏉ヤ竴鑷淬��
+ 涓绘煡璇㈠凡鍘绘帀 GROUP BY锛歱at_med_inhosp.inhospid 鍞竴銆乸at_archive.id 鏄富閿紝
+ a.id = b.patid 涓�瀵逛竴锛屽洜姝� join 缁撴灉琛屾暟灏辨槸涓氬姟璁板綍鏁般��
+ 杩欓噷鐩存帴瀵圭浉鍚岀殑 FROM/WHERE 鍋� COUNT锛屼笉鍐嶅寘涓�灞傚垎缁勫瓙鏌ヨ銆�
-->
<select id="selectPatMedInhospList_COUNT" parameterType="com.ruoyi.inhospvisit.domain.PatMedInhosp"
resultType="java.lang.Long">
select count(1)
- from (
- select 1
- FROM
- <include refid="selectPatMedInhospListFromWhere"/>
- group by b.inhospid, a.age, a.age_unit, a.telcode, a.id, a.sex
- ) t
+ FROM
+ <include refid="selectPatMedInhospListFromWhere"/>
</select>
<select id="selectPatMedInhospListBySerialnum" parameterType="com.ruoyi.inhospvisit.domain.PatMedInhosp"
--
Gitblit v1.9.3