From 4b8ef03697b9205203e2f0baec1f629ae408ab66 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 17 六月 2026 15:36:46 +0800
Subject: [PATCH] 【丽水】超链接排序

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index b77ca33..2cbd2a0 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -52,6 +52,7 @@
         <result property="wechat" column="wechat"/>
         <result property="leaveicd10code" column="leaveicd10code"/>
         <result property="leavediagname" column="leavediagname"/>
+        <result property="diagname" column="diagname"/>
         <result property="deptname" column="deptname"/>
         <result property="admindate" column="admindate"/>
         <result property="roomno" column="roomno"/>
@@ -147,6 +148,7 @@
         select id,
                hosp_type,
                task_guid,
+               diagname,
                patfrom,
                management_doctor,
                management_doctor_code,
@@ -1809,6 +1811,7 @@
             <if test="deptcode != null and deptcode != ''">
                 AND deptcode = #{deptcode}
             </if>
+            order by endtime desc
             <if test="pageSize != null  and pageNum != null">
                 limit ${pageSize} OFFSET ${pageNum}
             </if>
@@ -2430,8 +2433,11 @@
         SUM(CASE WHEN sendstate != 4 AND sendstate != 2 THEN 1 ELSE 0 END) AS ysf,
         SUM(CASE WHEN sendstate = 5 THEN 1 ELSE 0 END) AS fssb,
         SUM(CASE WHEN sendstate >= 3 OR sendstate = 1 THEN 1 ELSE 0 END) AS yfs,
-        SUM(CASE WHEN sendstate = 2 THEN 1 ELSE 0 END) AS dsf,
         SUM(CASE WHEN sendstate = 1 THEN 1 ELSE 0 END) AS blq,
+        SUM(CASE WHEN sendstate = 4 THEN 1 ELSE 0 END) AS wxsf,
+        SUM(CASE WHEN sendstate != 4 THEN 1 ELSE 0 END) AS xsf,
+        SUM(CASE WHEN (sendstate = 1 OR sendstate = 2 OR sendstate = 3 OR sendstate = 5 OR sendstate = 7 ) THEN 1 ELSE 0 END) AS dsf,
+        SUM(CASE WHEN sendstate = 6 THEN 1 ELSE 0 END) AS ywc,
         SUM(CASE WHEN excep IS NOT NULL AND excep = '1' THEN 1 ELSE 0 END) AS yc,
         SUM(CASE WHEN excep IS NOT NULL AND excep = '2' THEN 1 ELSE 0 END) AS jg,
         COUNT(1) as total

--
Gitblit v1.9.3