From b1b1b15bbf4fd5a4ed21efa91279227fc915e960 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 16 十一月 2026 16:35:48 +0800
Subject: [PATCH] 【丽水】JOIN报错调整

---
 ruoyi-inhospvisit/src/main/resources/mapper/inhospvisit/PatMedInhospMapper.xml |   85 ++++++++++++++++++++++++++----------------
 1 files changed, 52 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 fd25c50..015d62e 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') &gt;=
-            date_format(#{startOutHospTime},'%y%m%d')
-        </if>
-        <if test="endOutHospTime != null ">and date_format(b.endtime,'%y%m%d') &lt;=
-            date_format(#{endOutHospTime},'%y%m%d')
-        </if>
-        <if test="startInHospTime != null ">and date_format(b.starttime,'%y%m%d') &gt;=
-            date_format(#{startInHospTime},'%y%m%d')
-        </if>
-        <if test="endInHospTime != null ">and date_format(b.starttime,'%y%m%d') &lt;=
-            date_format(#{endInHospTime},'%y%m%d')
-        </if>
+        <!-- 鏃堕棿鑼冨洿淇濇寔鈥滄寜鏃ユ湡銆佺粨鏉熸棩鍚綋澶┾�濈殑璇箟锛涘垪淇濇寔瑁稿垪锛岄伩鍏� date_format 瀵艰嚧绱㈠紩澶辨晥 -->
+        <if test="startOutHospTime != null ">and b.endtime &gt;= DATE(#{startOutHospTime})</if>
+        <if test="endOutHospTime != null ">and b.endtime &lt; DATE_ADD(DATE(#{endOutHospTime}), INTERVAL 1 DAY)</if>
+        <if test="startInHospTime != null ">and b.starttime &gt;= DATE(#{startInHospTime})</if>
+        <if test="endInHospTime != null ">and b.starttime &lt; 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,50 @@
     <!--
       鍒嗛〉鎬绘暟锛圥ageHelper 鎵嬪啓 count锛宨d = 涓绘煡璇� id + _COUNT 浼氳鑷姩閲囩敤锛夈��
 
-      鍘熺姸鎬侊細涓绘煡璇㈠甫 GROUP BY锛宲agehelper 鐨� CountSqlParser#isSimpleCount 鍒ゅ畾涓�
-      "涓嶈兘绠�鍖�"锛屼簬鏄�绘暟鍙樻垚 SELECT count(0) FROM ( 涓婇潰閭f潯 60 鍒楁煡璇� ) tmp_count 鈥�
-      绛変簬姣忔缈婚〉鎶婃暣鏉℃煡璇㈠啀璺戜竴閬嶃��
+      涓绘煡璇㈠凡鍘绘帀 GROUP BY锛歱at_med_inhosp.inhospid 鍞竴銆乸at_archive.id 鏄富閿紝
+      a.id = b.patid 涓�瀵逛竴锛屽洜姝� join 缁撴灉琛屾暟灏辨槸涓氬姟璁板綍鏁般��
+      杩欓噷鐩存帴瀵圭浉鍚岀殑 FROM/WHERE 鍋� COUNT锛屼笉鍐嶅寘涓�灞傚垎缁勫瓙鏌ヨ銆�
 
-      杩欓噷淇濇寔銆愬畬鍏ㄧ浉鍚岀殑 FROM/WHERE/GROUP BY銆戯紙鍏辩敤 selectPatMedInhospListFromWhere 鐗囨锛�
-      鏉′欢涓嶄細婕傦級锛屼絾瀛愭煡璇㈠彧 select 1锛屼笉鐗╁寲 60 鍒楋紝涔熶笉甯� order by銆�
-      鍥犱负鍒嗙粍閿寘鍚� a.id 鑰岃繖涓� join 鏄竴瀵逛竴锛屽垎缁勬暟 == join 缁撴灉琛屾暟锛屾�绘暟涓庡師鏉ヤ竴鑷淬��
+      鈿狅笍鈿狅笍 銆愭湰鎺ュ彛鐪熸鐨勭儹鐐规槸杩欐潯 count锛屼笉鏄笂闈㈢殑鍒楄〃 SQL銆�
+
+      2026-11-13 瀹炴祴锛坰martor_sltd锛歱at_med_inhosp 50,175 琛屻�乸at_archive 249,045 琛屻��
+      MySQL 5.7.34銆乮nnodb_buffer_pool_size=128MB锛夛細
+
+        鍒楄〃  ORDER BY b.endtime DESC LIMIT 10  鈫�   25 ~ 35 ms
+        count 鏈潯璇彞                            鈫� 10467 ms锛堝喎锛�/ 350 ms锛堢儹锛�
+
+      鐢ㄦ埛鐪嬪埌鐨勩�屽叏鏃堕棿娈� 20s / 3 涓湀 8s銆嶅氨鏄畠锛氫竴娆$炕椤� = count + 鍒楄〃銆�
+      鍘熷洜鏈変笁鏉★紝鏀� SQL 瑙e喅涓嶄簡锛屽繀椤诲湪搴撲笂鍋氾細
+
+        1) b 渚у繀椤绘湁 (del_flag, orgid, inhospstate, endtime) 澶嶅悎绱㈠紩锛�
+           鍚﹀垯 MySQL 瑕佹寜 orgid 鍥炶〃閫愯杩囨护 del_flag / inhospstate锛�
+           鏈変簡瀹冿紝count(1) 鏄� Using index锛堜笉鍥炶〃锛夛紝鍒楄〃涔熻兘鎸夌储寮曢『搴忔彁鍓� LIMIT銆�
+        2) MySQL 5.7 瀵广�屼笉鍦ㄧ储寮曢噷鐨勭瓑鍊兼潯浠躲�嶆寜 10% 浼帮紙EXPLAIN 鐨� filtered=10.0锛夛紝
+           浼氭妸銆屾病鏈� inhospstate 鐨勭储寮曘�嶇畻寰楁洿渚垮疁锛屼粠鑰岄�夐敊銆�
+           sltd 涓婂疄娴嬶細寮鸿璧� idx_pmi_del_org_state_end = 349ms锛�
+           榛樿鎵ц璁″垝 = 2085ms銆傛墍浠ュ厜寤虹储寮曚笉澶燂紝杩樿娓呮帀绔炰簤绱㈠紩鎴栧己鍒剁储寮曘��
+        3) pat_archive 鏄� 60+ 鍒楃殑澶ц〃锛宑ount 姣忓懡涓竴琛岄兘瑕佹寜涓婚敭鍥炶〃涓�娆�
+           锛坰ltd 鏄� 38,881 娆¢殢鏈鸿锛夈�傜紦瀛樺懡涓� 0.35s銆佸喎缂撳瓨 10s锛�
+           宸窛鍏ㄥ湪纾佺洏闅忔満璇� 鈫� 瑙佺 5 姝� innodb_buffer_pool_size銆�
+
+      閰嶅鑴氭湰锛歴ql/optimize_pat_med_inhosp_list_count_20261113.sql
+
+      鈿狅笍 銆愪笉瑕佺粰 pat_med_inhosp 鍔� idx_pmi_patid (patid)銆�
+         瀹炴祴鍔犱笂鍚庝紭鍖栧櫒浼氭敼鎴愩�屽厛鎵� pat_archive 鍐嶅洖鏌� pat_med_inhosp銆嶏紝
+         鍒楄〃鏌ヨ 25 ms 鈫� 481 ms锛堟參 20 鍊嶏級锛孫RDER BY 涔熺敤涓嶄笂绱㈠紩銆�
+         鏈煡璇㈢殑椹卞姩琛ㄥ繀椤诲浐瀹氭槸 b銆�
+
+      鈿狅笍 銆愪笉瑕佷负浜嗗揩鎶� a 鐨� join 鍘绘帀銆�
+         a.id = b.patid 涓嶆槸鎭掔瓑鐨勶細pat_med_inhosp.patid 鍙兘涓虹┖鎴栧湪 pat_archive 閲�
+         鎵句笉鍒般��2026-11-13 瀹炴祴 smartor_shiyi 鏈� 5,713 琛� patid 涓虹┖銆�
+         smartor_lishui 鏈� 9,270 琛屽鍎胯 鈥斺�� 鍘绘帀 join 浼氭妸杩欎簺琛岀畻杩� total锛�
+         鍙細鍦ㄣ�屽鍎胯鎭板ソ涓� 0銆嶇殑搴撲笂鐪嬭捣鏉ユ纭��
     -->
     <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"
@@ -1233,7 +1252,7 @@
             AND visit_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
         </if>
         <if test="deptcodeList != null and deptcodeList.size() > 0">
-            AND deptcode IN
+            AND leaveldeptcode IN
             <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                 #{deptcode}
             </foreach>

--
Gitblit v1.9.3