From 5bbd99ba550aa2e8cd8da36644018981ca1a1921 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 23 九月 2026 16:58:51 +0800
Subject: [PATCH] 【丽水】更新同步
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java | 182 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 156 insertions(+), 26 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
index 1141e12..d29f168 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -9,10 +10,12 @@
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysConfigService;
-import com.smartor.domain.*;
import com.smartor.domain.DTO.QuestionResultDTO;
-import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
-import com.smartor.domain.VO.QuestionResultVO;
+import com.smartor.domain.*;
+import com.smartor.domain.VO.MydTrendReqVO;
+import com.smartor.domain.VO.MzMydScoreRankVO;
+import com.smartor.domain.VO.QuestionCountKsOrBqVO;
+import com.smartor.domain.VO.SltdMydTotalVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.service.IServiceSubtaskDetailService;
import com.smartor.service.IServiceSubtaskService;
@@ -22,6 +25,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -200,38 +205,163 @@
/**
- * 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
+ * 鐪佺珛鍚屽痉婊℃剰搴︽暟鎹粺璁★紙鎸夐鐩粺璁￠�夐」鏁伴噺/鍗犳瘮锛屽苟缁欏嚭璇ラ鐨勭患鍚堝緱鍒嗭級
+ * <p>
+ * 缁煎悎婊℃剰搴� = 危(閫夐」鍒嗗�� 脳 椤规暟) / 危椤规暟 / 鏈鏈�楂樺垎鍊� 脳 100%锛�
+ * 鍒嗗�煎彇 1銆�0.8銆�0.6銆�0.4銆�0.2 浜旀。锛堝緢婊℃剰銆佹弧鎰忋�佷竴鑸�佷笉婊℃剰銆佸緢涓嶆弧鎰忥級锛�
+ * 銆屼笉閫傜敤銆嶃��0 鍒嗐�佺┖鍊肩瓑鏃笉杩涘垎瀛愪篃涓嶈繘鍒嗘瘝銆�
*/
@ApiOperation("鐪佺珛鍚屽痉婊℃剰搴︽暟鎹粺璁�")
- @PostMapping("/sltaMydTotalByScore")
- public Map<String, Object> sltaMydTotal(@RequestBody QuestionResultVO questionResultVO) {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/sltdMydTotalByScore")
+ public Map<String, Object> sltdMydTotalByScore(@RequestBody SltdMydTotalVO sltdMydTotalVO) {
List<ServiceSubtaskRes> serviceSubtaskResList = null;
- ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
- serviceSubtaskEntity.setServiceType(questionResultVO.getServiceType());
- serviceSubtaskEntity.setEndOutHospTime(questionResultVO.getEndOutHospTime());
- serviceSubtaskEntity.setStartOutHospTime(questionResultVO.getStartOutHospTime());
- serviceSubtaskEntity.setDeptOrDistrict(questionResultVO.getDeptOrDistrict());
- serviceSubtaskEntity.setLeavehospitaldistrictcodes(questionResultVO.getLeavehospitaldistrictcodes());
- if (serviceSubtaskEntity != null) {
- List<ServiceSubtask> serviceSubtasks = serviceSubtaskService.getServiceSubtasks(serviceSubtaskEntity);
- serviceSubtaskResList = DtoConversionUtils.sourceToTarget(serviceSubtasks, ServiceSubtaskRes.class);
+ if (CollectionUtils.isNotEmpty(sltdMydTotalVO.getServiceTypeList())) {
+ //serviceType鍙兘浼氬嚭鐜板涓紝涓嶆兂澶氬啓鏂规硶浜嗭紝涓�涓竴涓煡璇㈠惂
+ for (String st : sltdMydTotalVO.getServiceTypeList()) {
+ ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
+ serviceSubtaskEntity.setServiceType(st);
+ serviceSubtaskEntity.setEndOutHospTime(sltdMydTotalVO.getEndOutHospTime());
+ serviceSubtaskEntity.setStartOutHospTime(sltdMydTotalVO.getStartOutHospTime());
+ serviceSubtaskEntity.setDeptOrDistrict(sltdMydTotalVO.getDeptOrDistrict());
+ serviceSubtaskEntity.setLeavehospitaldistrictcodes(sltdMydTotalVO.getLeavehospitaldistrictcodes());
+ serviceSubtaskEntity.setLeaveldeptcodes(sltdMydTotalVO.getLeaveldeptcodes());
+ //鏈烘瀯/闄㈠尯鐢� @AddOrgId 娉ㄥ叆锛岃惤鍒版煡璇㈡潯浠朵笂锛岄伩鍏嶈法鏈烘瀯鍙栨暟
+ serviceSubtaskEntity.setOrgid(sltdMydTotalVO.getOrgid());
+ serviceSubtaskEntity.setCampusid(sltdMydTotalVO.getCampusid());
+ if (serviceSubtaskEntity != null) {
+ List<ServiceSubtask> serviceSubtasks = serviceSubtaskService.getServiceSubtasks(serviceSubtaskEntity);
+ List<ServiceSubtaskRes> serviceSubtaskRes = DtoConversionUtils.sourceToTarget(serviceSubtasks, ServiceSubtaskRes.class);
+ if (CollectionUtils.isNotEmpty(serviceSubtaskResList)) {
+ serviceSubtaskResList.addAll(serviceSubtaskRes);
+ } else {
+ if (CollectionUtils.isEmpty(serviceSubtaskResList)) serviceSubtaskResList = serviceSubtaskRes;
+ }
+ }
+ }
}
- List<ServiceSubtaskDetailRatioExport> detailList = serviceSubtaskService.getDetailRatio(questionResultVO, serviceSubtaskResList);
-
// 鎸� questiontext 鍒嗙粍鍚庤浆鎹负 QuestionResultVO
List<QuestionResultDTO> result = new ArrayList<>();
- if (!detailList.isEmpty()) {
- Map<String, List<ServiceSubtaskDetailRatioExport>> groupedMap = detailList.stream()
- .collect(Collectors.groupingBy(ServiceSubtaskDetailRatioExport::getQuestiontext));
+ if (CollectionUtils.isNotEmpty(serviceSubtaskResList)) {
+ List<ServiceSubtaskDetailRatioExport> detailList = serviceSubtaskService.getDetailRatio(sltdMydTotalVO, serviceSubtaskResList);
- groupedMap.forEach((questionText, exportList) -> {
- QuestionResultDTO questionResultDTO = new QuestionResultDTO();
- questionResultDTO.setQeustionText(questionText);
- questionResultDTO.setSubtaskDetailRatioExportList(exportList);
- result.add(questionResultDTO);
- });
+ if (detailList == null) {
+ //serviceType 缁勫悎涓嶅湪鏀寔鑼冨洿鍐咃紙濡傚悓鏃跺惈闅忚 2 鍜屾弧鎰忓害 6/14锛夛紝缁欐槑纭彁绀鸿�屼笉鏄倓鎮勮繑鍥炵┖鏁扮粍
+ return error("褰撳墠 serviceType 缁勫悎鏆備笉鏀寔缁熻闂鍗犳瘮锛岃鍒嗗紑鏌ヨ锛堜粎鏀寔闅忚 2 鎴栨弧鎰忓害 6/14锛�");
+ }
+ if (CollectionUtils.isNotEmpty(detailList)) {
+ Map<String, List<ServiceSubtaskDetailRatioExport>> groupedMap = detailList.stream().collect(Collectors.groupingBy(ServiceSubtaskDetailRatioExport::getQuestiontext));
+
+ groupedMap.forEach((questionText, exportList) -> {
+ QuestionResultDTO questionResultDTO = new QuestionResultDTO();
+ questionResultDTO.setQeustionText(questionText);
+ questionResultDTO.setSubtaskDetailRatioExportList(exportList);
+ //缁煎悎寰楀垎锛毼�(鍒嗗�济楅」鏁�) / 危椤规暟 / 鏈鏈�楂樺垎鍊� 脳 100%锛屼笉閫傜敤/0鍒�/绌哄�间笉杩涘垎瀛愪篃涓嶈繘鍒嗘瘝
+ questionResultDTO.setAvgScore(calcMydScore(exportList));
+ result.add(questionResultDTO);
+ });
+ }
}
return success(result);
}
+
+ @ApiOperation("鐪佺珛鍚屽痉婊℃剰搴︽暟鎹粺璁￠�氳繃绉戝鎴栫梾鍖�")
+ @PostMapping("/statQuestionOptionByKsOrBq")
+ public Map<String, Object> statQuestionOptionByKsOrBq(@RequestBody QuestionCountKsOrBqVO questionResultVO) {
+ return success(serviceSubtaskService.statQuestionOptionByKsOrBq(questionResultVO));
+ }
+
+ @ApiOperation("鐪佺珛鍚屽痉鎮ｈ�呮弧鎰忓害瓒嬪娍")
+ @PostMapping("/mydTrend")
+ public Map<String, Object> mydTrend(@RequestBody MydTrendReqVO mydTrendReqVO) {
+ return success(serviceSubtaskService.mydTrend(mydTrendReqVO));
+ }
+
+ @ApiOperation("鐪佺珛鍚屽痉鎮ｈ�呮弧鎰忓害缁存姢")
+ @PostMapping("/sltdMydTotalByDimension")
+ public Map<String, Object> sltdMydTotalByDimension(@RequestBody MydTrendReqVO mydTrendReqVO) {
+ return success(serviceSubtaskService.sltdMydTotalByDimension(mydTrendReqVO));
+ }
+
+ @ApiOperation("闂ㄨ瘖婊℃剰搴︾患鍚堝緱鍒嗘帓鍚嶏紙鎸夌瀹ゆ垨鐥呭尯锛�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/mzMydScoreRank")
+ public Map<String, Object> mzMydScoreRank(@RequestBody MzMydScoreRankVO mzMydScoreRankVO) {
+ return success(serviceSubtaskService.mzMydScoreRank(mzMydScoreRankVO));
+ }
+
+ /**
+ * 澶氶�夐鐨勯棶棰樼被鍨�
+ */
+ private static final String VALUE_TYPE_MULTIPLE = "2";
+
+ /**
+ * 璁＄畻涓�閬撻鐨勬弧鎰忓害缁煎悎寰楀垎锛堢櫨鍒嗗埗锛屼繚鐣欎袱浣嶅皬鏁帮級
+ * <p>
+ * 缁煎悎婊℃剰搴� = 危(閫夐」鍒嗗�� 脳 椤规暟) / 危椤规暟 / 鏈鏈�楂樺垎鍊� 脳 100%
+ * 绛変环浜� 危(寰堟弧鎰徝�1 + 婊℃剰脳0.8 + 涓�鑸�0.6 + 涓嶆弧鎰徝�0.4 + 寰堜笉婊℃剰脳0.2) / 危(浜旀。椤规暟) 脳 100%銆�
+ * 鐢ㄦ湰棰樻渶楂樺垎鍊煎綊涓�鍖栵紝鍏煎鏄庣粏鍒嗗�煎瓨 0-1 鏉冮噸锛�1銆�0.8鈥︼級鍜屽瓨 5 鍒嗗埗锛�5銆�4鈥︼級涓ょ鍙ｅ緞銆�
+ *
+ * @param exportList 鍚屼竴閬撻鐩殑閫夐」缁熻鏄庣粏
+ * @return 鐧惧垎鍒剁患鍚堝緱鍒嗭紝鏃犳湁鏁堥」鏁版椂杩斿洖 "0.00"
+ */
+ private String calcMydScore(List<ServiceSubtaskDetailRatioExport> exportList) {
+ if (CollectionUtils.isEmpty(exportList)) return "0.00";
+
+ BigDecimal scoreSum = BigDecimal.ZERO; //鍒嗗瓙锛毼�(閫夐」鍒嗗�� 脳 椤规暟)
+ BigDecimal countSum = BigDecimal.ZERO; //鍒嗘瘝锛毼ｉ」鏁�
+ BigDecimal maxScore = null; //鏈鏈�楂樺垎鍊硷紝鐢ㄤ簬褰掍竴鍖�
+
+ for (ServiceSubtaskDetailRatioExport detail : exportList) {
+ //澶氶�夐涓�琛屾槸澶氫釜閫夐」鐨勫垎鍊间箣鍜岋紝鍒嗘瘝鍙畻 1 椤癸紝浼氭妸寰楀垎绠楅珮锛屼笉璁″叆缁煎悎寰楀垎
+ if (VALUE_TYPE_MULTIPLE.equals(detail.getValueType())) continue;
+ //銆屼笉閫傜敤銆嶄笉鍦ㄥ叕寮忕殑浜旀。閲岋紝涓嶈鍏ョ患鍚堝緱鍒�
+ if (isNotApplicable(detail)) continue;
+
+ BigDecimal score = parseDecimal(detail.getScore());
+ BigDecimal count = parseDecimal(detail.getCount());
+ if (score == null || count == null) continue;
+ //0 鍒嗭紙鏈瓟/绌虹瓟锛夈�佺┖鏁伴噺锛氭棦涓嶈繘鍒嗗瓙涔熶笉杩涘垎姣�
+ if (score.signum() <= 0 || count.signum() <= 0) continue;
+
+ if (maxScore == null || score.compareTo(maxScore) > 0) maxScore = score;
+ scoreSum = scoreSum.add(score.multiply(count));
+ countSum = countSum.add(count);
+ }
+
+ if (maxScore == null || countSum.signum() <= 0) return "0.00";
+
+ return scoreSum.divide(countSum, 6, RoundingMode.HALF_UP)
+ .divide(maxScore, 6, RoundingMode.HALF_UP)
+ .multiply(BigDecimal.valueOf(100))
+ .setScale(2, RoundingMode.HALF_UP)
+ .toPlainString();
+ }
+
+ /**
+ * 鏄惁銆屼笉閫傜敤銆嶉�夐」
+ */
+ private boolean isNotApplicable(ServiceSubtaskDetailRatioExport detail) {
+ return containsNotApplicable(detail.getOptionresult()) || containsNotApplicable(detail.getTargetvalue());
+ }
+
+ private boolean containsNotApplicable(String optionText) {
+ if (StringUtils.isEmpty(optionText)) return false;
+ String text = optionText.trim();
+ return text.contains("涓嶉�傜敤") || text.contains("鏈瓟") || text.contains("鎷掔瓟");
+ }
+
+ /**
+ * 瀛楃涓茶浆 BigDecimal锛岀┖鍊�/闈炴硶鍊艰繑鍥� null
+ */
+ private BigDecimal parseDecimal(String value) {
+ if (StringUtils.isEmpty(value)) return null;
+ try {
+ return new BigDecimal(value.trim());
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }
+
}
--
Gitblit v1.9.3