From d9ac4335686225a20920d7feb7ce46a5c2df1f60 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 23 九月 2026 10:06:52 +0800
Subject: [PATCH] 1.代码提交

---
 smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java |   37 +++++++++++++++++++++++++++++++++++--
 1 files changed, 35 insertions(+), 2 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..18dc2d5 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
@@ -1,9 +1,13 @@
 package com.smartor.mapper;
 
 import com.smartor.domain.*;
+import com.smartor.domain.DTO.MydTrendReqDTO;
+import com.smartor.domain.DTO.MzMydScoreRankDTO;
 import com.smartor.domain.DTO.QuestionCountKsOrBqDTO;
+import com.smartor.domain.DTO.ServiceSubtaskOptionStatDTO;
 import com.smartor.domain.VO.PatSatisfactionReqVO;
 import com.smartor.domain.VO.HeLibraryCountVO;
+import com.smartor.domain.VO.MzMydScoreRankVO;
 import com.smartor.domain.VO.QuestionCountKsOrBqVO;
 import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
 import com.smartor.domain.entity.ServiceSubtaskEntity;
@@ -81,6 +85,12 @@
      * @param loopCount  杞锛�0=棣栬疆锛�
      */
     public int countActiveByScheduleIdAndLoop(@Param("scheduleId") Long scheduleId, @Param("loopCount") Long loopCount);
+
+    public  List<MydTrendReqDTO> mydTrend(@Param("startFinishTime") Date startFinishTime, @Param("endFinishTime") Date endFinishTime, @Param("type") String type);
+
+    public  List<MydTrendReqDTO> sltdMydTotalByDimension(@Param("startFinishTime") Date startFinishTime, @Param("endFinishTime") Date endFinishTime, @Param("type") String type);
+
+    public  List<MydTrendReqDTO> sltdMydTotalByYQ(@Param("startFinishTime") Date startFinishTime, @Param("endFinishTime") Date endFinishTime, @Param("type") String type);
 
     /**
      * 浠诲姟缁勶紙appltype=5锛夛細鎷夊彇鏌愪竴杞鐨勫叏閮� subtask锛堢敤浜庡厠闅嗗埌涓嬩竴杞級銆�
@@ -260,11 +270,23 @@
      * 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮
      *
      * @param taskIds          浠诲姟 ID 鍒楄〃 (鐢ㄤ簬鏈嶅姟绫诲瀷 2)
+     * @param subtaskIds       瀛愪换鍔� ID 鍒楄〃锛堝彲閫夛級銆備紶浜嗗氨鍙粺璁¤繖鎵瑰瓙浠诲姟锛堝嵆鏈瀵煎嚭鐨勬偅鑰咃級锛�
+     *                         涓嶄紶鍒欑粺璁¤繖浜涗换鍔′笅鐨勫叏閮ㄧ瓟鍗凤紝淇濇寔鍘熻涓�
      * @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);
+    List<ServiceSubtaskDetailRatioExport> statQuestionOption(@Param("taskIds") List<Long> taskIds, @Param("startOutHospTime") Date startOutHospTime, @Param("endOutHospTime") Date endOutHospTime, @Param("startFinishTime") Date startFinishTime, @Param("endFinishTime") Date endFinishTime, @Param("scoreStart") Double scoreStart, @Param("scoreEnd") Double scoreEnd, @Param("questiontext") String questiontext, @Param("valueType") String valueType, @Param("subtaskIds") List<Long> subtaskIds);
+
+    /**
+     * 瀵煎嚭銆岄棶棰樿鎯呭崰姣斻�嶄笓鐢ㄧ粺璁★紙鎸夋湰娆″鍑虹殑瀛愪换鍔$粺璁★級
+     * <p>
+     * 鏁伴噺 = 閫夋嫨璇ラ�夐」鐨勬偅鑰呮暟锛堝悓涓�鎮h�呭悓涓�棰樺彧鍙栨渶鏂颁竴鏉℃槑缁嗭級锛屽垎鏁� = 璇ラ�夐」鏄庣粏鐨� score 涔嬪拰銆�
+     *
+     * @param subtaskIds   鏈瀵煎嚭鐨勫瓙浠诲姟 ID锛堝繀浼狅紝涓虹┖鍒欐煡涓嶅埌鏁版嵁锛�
+     * @param questiontext 闂鍐呭锛堝彲閫夛紝妯$硦鍖归厤锛�
+     */
+    List<ServiceSubtaskOptionStatDTO> statMydQuestionOptionForExport(@Param("subtaskIds") List<Long> subtaskIds, @Param("questiontext") String questiontext);
 
     /**
      * 鏍规嵁瀛愪换鍔� ID 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮锛堢敤浜庢弧鎰忓害缁熻 serviceType=6锛�
@@ -274,7 +296,7 @@
      * @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);
+    List<ServiceSubtaskDetailRatioExport> statQuestionOptionBySubtaskIds(@Param("subtaskIds") List<Long> subtaskIds, @Param("startOutHospTime") Date startOutHospTime, @Param("endOutHospTime") Date endOutHospTime, @Param("startFinishTime") Date startFinishTime, @Param("endFinishTime") Date endFinishTime, @Param("scoreStart") Double scoreStart, @Param("scoreEnd") Double scoreEnd, @Param("questiontext") String questiontext, @Param("valueType") String valueType);
 
     /**
      * 鏍规嵁绉戝銆佺梾鍖恒�侀鐩被鍨嬬粺璁$殑绉戝銆佺梾鍖鸿瘎鍒�
@@ -283,4 +305,15 @@
      */
     List<QuestionCountKsOrBqDTO> statQuestionOptionByKsOrBq(QuestionCountKsOrBqVO questionCountKsOrBqVO);
 
+    /**
+     * 闂ㄨ瘖婊℃剰搴︾患鍚堝緱鍒嗘帓鍚嶏紙鎸夌瀹ゆ垨鐥呭尯锛�
+     * <p>
+     * 缁煎悎婊℃剰搴� = 危(璇勫垎鏄庣粏鏉冮噸) / 璇勫垎鏄庣粏鏉℃暟 脳 100%锛�
+     * 鏉冮噸鍙彇 1銆�0.8銆�0.6銆�0.4銆�0.2 浜旀。銆�
+     *
+     * @param mzMydScoreRankVO 鏌ヨ鏉′欢锛坉imensionType銆乻erviceType銆佹椂闂村尯闂淬�佺瀹�/鐥呭尯缂栧彿銆乷rgid/campusid锛�
+     * @return 姣忎釜绉戝/鐥呭尯鐨勭患鍚堝緱鍒嗕笌椤规暟锛屽凡鎸夌患鍚堝緱鍒嗛檷搴�
+     */
+    List<MzMydScoreRankDTO> selectMzMydScoreRank(MzMydScoreRankVO mzMydScoreRankVO);
+
 }

--
Gitblit v1.9.3