From 34f78281cf395a24e1f3f1c3b861186ff8a03b7b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 16 十月 2026 11:09:40 +0800
Subject: [PATCH] 出入院模块、门急诊模块、模块模块、宣教模块、其它模块

---
 smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java |   55 ++++++++++++++++++++++++-------------------------------
 1 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
index 7c54fe0..3536346 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
@@ -1,13 +1,9 @@
 package com.smartor.mapper;
 
 import com.smartor.domain.*;
-import com.smartor.domain.DTO.QuestionCountKsOrBqDTO;
-import com.smartor.domain.VO.PatSatisfactionReqVO;
-import com.smartor.domain.VO.HeLibraryCountVO;
-import com.smartor.domain.VO.QuestionCountKsOrBqVO;
+import com.ruoyi.template.domain.VO.HeLibraryCountVO;
 import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
 import com.smartor.domain.entity.ServiceSubtaskEntity;
-import com.smartor.domain.entity.ServiceSubtaskSatisfactionEntity;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,6 +12,8 @@
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.core.service.dto.PatMedReq;
+import com.ruoyi.common.core.service.dto.PatMedRes;
 /**
  * 鍗曚竴浠诲姟锛堥殢璁匡級Mapper鎺ュ彛
  *
@@ -40,7 +38,7 @@
      */
     public List<ServiceSubtask> selectServiceSubtaskList(ServiceSubtaskEntity serviceSubtaskVO);
 
-    public List<ServiceSubtask> selectSatisfactionSubtaskList(PatSatisfactionReqVO serviceSubtaskVO);
+    
 
     /**
      * 鐢ㄤ簬琛ュ伩鏌ヨ
@@ -81,6 +79,12 @@
      * @param loopCount  杞锛�0=棣栬疆锛�
      */
     public int countActiveByScheduleIdAndLoop(@Param("scheduleId") Long scheduleId, @Param("loopCount") Long loopCount);
+
+    
+
+    
+
+    
 
     /**
      * 浠诲姟缁勶紙appltype=5锛夛細鎷夊彇鏌愪竴杞鐨勫叏閮� subtask锛堢敤浜庡厠闅嗗埌涓嬩竴杞級銆�
@@ -200,6 +204,8 @@
      * xsf: 闇�闅忚鏁伴噺 sendstate = 4
      * dsf: 寰呴殢璁挎暟閲� sendstate = 1L, 2L, 3L, 5L, 7L
      * ywc: 宸插畬鎴愭暟閲� sendstate = 6L
+     * dfs: 寰呭彂閫佹暟閲� sendstate = 1L, 3L, 4L, 5L, 6L, 7L
+     * yfs: 宸插彂閫佹暟閲� sendstate = 2L
      * yc: 寮傚父鏁伴噺 excep = '1'
      * yc: 璀﹀憡鏁伴噺 excep = '2'
      */
@@ -225,7 +231,11 @@
      */
     PatMedRes selectVisitCount(PatMedReq patMedReq);
 
-    List<Long> querySendCount(ServiceSubtaskSatisfactionEntity serviceSubtaskSatisfactionEntity);
+    
+
+    
+
+    
 
     /**
      * 鎸夌梾鍖哄垎缁勭粺璁″欢缁姢鐞嗘暟閲�
@@ -256,31 +266,14 @@
      */
     List<ServiceSubtask> gethelibraryCountHyperlink(HeLibraryCountVO heLibraryCountVO);
 
-    /**
-     * 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮
-     *
-     * @param taskIds          浠诲姟 ID 鍒楄〃 (鐢ㄤ簬鏈嶅姟绫诲瀷 2)
-     * @param startOutHospTime
-     * @param endOutHospTime
-     * @return
-     */
-    List<ServiceSubtaskDetailRatioExport> statQuestionOption(@Param("taskIds") List<Long> taskIds, @Param("startOutHospTime") Date startOutHospTime, @Param("endOutHospTime") Date endOutHospTime, @Param("scoreStart") Double scoreStart, @Param("scoreEnd") Double scoreEnd, @Param("questiontext") String questiontext, @Param("valueType") String valueType);
+    
 
-    /**
-     * 鏍规嵁瀛愪换鍔� ID 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮锛堢敤浜庢弧鎰忓害缁熻 serviceType=6锛�
-     *
-     * @param subtaskIds       瀛愪换鍔� ID 鍒楄〃 (鍙兘鍗曚釜 taskid 涓嬬殑鎵�鏈夊瓙浠诲姟 id)
-     * @param startOutHospTime
-     * @param endOutHospTime
-     * @return
-     */
-    List<ServiceSubtaskDetailRatioExport> statQuestionOptionBySubtaskIds(@Param("subtaskIds") List<Long> subtaskIds, @Param("startOutHospTime") Date startOutHospTime, @Param("endOutHospTime") Date endOutHospTime, @Param("scoreStart") Double scoreStart, @Param("scoreEnd") Double scoreEnd, @Param("questiontext") String questiontext, @Param("valueType") String valueType);
+    
 
-    /**
-     * 鏍规嵁绉戝銆佺梾鍖恒�侀鐩被鍨嬬粺璁$殑绉戝銆佺梾鍖鸿瘎鍒�
-     * @param questionCountKsOrBqVO
-     * @return
-     */
-    List<QuestionCountKsOrBqDTO> statQuestionOptionByKsOrBq(QuestionCountKsOrBqVO questionCountKsOrBqVO);
+    
+
+    
+
+    
 
 }

--
Gitblit v1.9.3