ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
@@ -207,9 +207,9 @@ /** * 省立同德满意度数据统计（按题目统计选项数量/占比，并给出该题的综合得分） * <p> * 综合满意度 = Σ(选项分值 × 项数) / Σ项数 / 本题最高分值 × 100%， * 分值取 1、0.8、0.6、0.4、0.2 五档（很满意、满意、一般、不满意、很不满意）； * 「不适用」、0 分、空值等既不进分子也不进分母。 * 综合满意度 = (很满意项数×1 + 满意项数×0.8 + 一般项数×0.6 + 不满意项数×0.4 + 很不满意项数×0.2) * / (很满意项数 + 满意项数 + 一般项数 + 不满意项数 + 很不满意项数) × 100%； * 「未经历」「不适用」等不在五档里的选项既不进分子也不进分母。 */ @ApiOperation("省立同德满意度数据统计") @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") @@ -256,7 +256,7 @@ QuestionResultDTO questionResultDTO = new QuestionResultDTO(); questionResultDTO.setQeustionText(questionText); questionResultDTO.setSubtaskDetailRatioExportList(exportList); //综合得分：Σ(分值×项数) / Σ项数 / 本题最高分值 × 100%，不适用/0分/空值不进分子也不进分母 //综合得分：(很满意×1 + 满意×0.8 + 一般×0.6 + 不满意×0.4 + 很不满意×0.2) / 五档项数之和 × 100% questionResultDTO.setAvgScore(calcMydScore(exportList)); result.add(questionResultDTO); }); @@ -297,11 +297,25 @@ private static final String VALUE_TYPE_MULTIPLE = "2"; /** * 满意度五档选项（顺序与权重顺序一致） */ private static final String[] MYD_SCORE_OPTIONS = {"很满意", "满意", "一般", "不满意", "很不满意"}; /** * 满意度五档权重：很满意 1、满意 0.8、一般 0.6、不满意 0.4、很不满意 0.2 */ private static final BigDecimal[] MYD_SCORE_WEIGHTS = { new BigDecimal("1"), new BigDecimal("0.8"), new BigDecimal("0.6"), new BigDecimal("0.4"), new BigDecimal("0.2")}; /** * 计算一道题的满意度综合得分（百分制，保留两位小数） * <p> * 综合满意度 = Σ(选项分值 × 项数) / Σ项数 / 本题最高分值 × 100% * 等价于 Σ(很满意×1 + 满意×0.8 + 一般×0.6 + 不满意×0.4 + 很不满意×0.2) / Σ(五档项数) × 100%。 * 用本题最高分值归一化，兼容明细分值存 0-1 权重（1、0.8…）和存 5 分制（5、4…）两种口径。 * 综合满意度 = (很满意项数×1 + 满意项数×0.8 + 一般项数×0.6 + 不满意项数×0.4 + 很不满意项数×0.2) * / (很满意项数 + 满意项数 + 一般项数 + 不满意项数 + 很不满意项数) × 100% * <p> * 权重按选项文案判定（见 {@link #mydScoreOptionIndex(String)}），不再依赖明细的 score 字段： * 历史数据里 score 有 0、「0000000001」这类脏值，按 score 算会把得分固定成 0 或 100。 * 「未经历」「不适用」等不在五档里的选项既不进分子也不进分母。 * * @param exportList 同一道题目的选项统计明细 * @return 百分制综合得分，无有效项数时返回 "0.00" @@ -309,9 +323,8 @@ private String calcMydScore(List<ServiceSubtaskDetailRatioExport> exportList) { if (CollectionUtils.isEmpty(exportList)) return "0.00"; BigDecimal scoreSum = BigDecimal.ZERO; //分子：Σ(选项分值 × 项数) BigDecimal countSum = BigDecimal.ZERO; //分母：Σ项数 BigDecimal maxScore = null; //本题最高分值，用于归一化 BigDecimal scoreSum = BigDecimal.ZERO; //分子：Σ(档位权重 × 项数) BigDecimal countSum = BigDecimal.ZERO; //分母：五档项数之和 for (ServiceSubtaskDetailRatioExport detail : exportList) { //多选题一行是多个选项的分值之和，分母只算 1 项，会把得分算高，不计入综合得分 @@ -319,27 +332,42 @@ //「不适用」不在公式的五档里，不计入综合得分 if (isNotApplicable(detail)) continue; BigDecimal score = parseDecimal(detail.getScore()); int optionIndex = mydScoreOptionIndex(detail.getOptionresult()); BigDecimal count = parseDecimal(detail.getCount()); if (score == null || count == null) continue; //0 分（未答/空答）、空数量：既不进分子也不进分母 if (score.signum() <= 0 || count.signum() <= 0) continue; if (optionIndex < 0 || count == null || count.signum() <= 0) continue; if (maxScore == null || score.compareTo(maxScore) > 0) maxScore = score; scoreSum = scoreSum.add(score.multiply(count)); scoreSum = scoreSum.add(MYD_SCORE_WEIGHTS[optionIndex].multiply(count)); countSum = countSum.add(count); } if (maxScore == null || countSum.signum() <= 0) return "0.00"; if (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(); } /** * 选项文案 → 满意度五档下标（很满意 0、满意 1、一般 2、不满意 3、很不满意 4），不在五档里返回 -1 */ private int mydScoreOptionIndex(String optionresult) { if (StringUtils.isEmpty(optionresult)) return -1; String text = optionresult.trim(); for (int i = 0; i < MYD_SCORE_OPTIONS.length; i++) { if (MYD_SCORE_OPTIONS[i].equals(text)) return i; } //兼容「A 很满意」「B.满意」这类带选项序号前缀的历史数据 if (text.length() > 2 && (text.charAt(1) == ' ' || text.charAt(1) == '.' || text.charAt(1) == '、')) { String stripped = text.substring(2).trim(); for (int i = 0; i < MYD_SCORE_OPTIONS.length; i++) { if (MYD_SCORE_OPTIONS[i].equals(stripped)) return i; } } return -1; } /** * 是否「不适用」选项 */ private boolean isNotApplicable(ServiceSubtaskDetailRatioExport detail) { ruoyi-admin/src/main/resources/application.yml
@@ -75,7 +75,7 @@ # 国际化资源文件路径 basename: i18n/messages profiles: active: nhfy active: druid # 文件上传 servlet: smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -97,6 +97,66 @@ private String dealDeptCode; /** * 安全解析分数：null、空串、空白串以及非法格式一律按 0 处理，避免 Double.parseDouble 抛 NumberFormatException * * @param scoreValue 分数字符串 * @return 解析后的分数，无法解析时返回 0 */ private double parseScore(String scoreValue) { if (StringUtils.isEmpty(scoreValue)) { return 0D; } try { return Double.parseDouble(scoreValue.trim()); } catch (NumberFormatException e) { log.warn("分数格式非法，按 0 处理，原始值：{}", scoreValue); return 0D; } } /** * 将累加后的分值格式化为落库字符串，去掉多余的小数位（如 5.0 -> 5） * * @param scoreValue 分值 * @return 分数字符串 */ private String formatScore(double scoreValue) { if (Double.isNaN(scoreValue) || Double.isInfinite(scoreValue)) { log.warn("分数计算结果非法，按 0 处理，原始值：{}", scoreValue); return "0"; } return BigDecimal.valueOf(scoreValue).stripTrailingZeros().toPlainString(); } /** * 安全解析异常标记：null、空串、非法格式一律按 0（正常）处理 * * @param isabnormalFlag 异常标记字符串 * @return 异常标记值 */ private Integer parseIsabnormal(String isabnormalFlag) { if (StringUtils.isEmpty(isabnormalFlag)) { return 0; } try { return Integer.valueOf(isabnormalFlag.trim()); } catch (NumberFormatException e) { log.warn("异常标记格式非法，按 0 处理，原始值：{}", isabnormalFlag); return 0; } } /** * 归一化分数字符串，避免把 null 或空串（前端未传/未作答）放到 map 中传递给累加逻辑 * * @param scoreValue 原始分值 * @return 非空分值，默认 "0" */ private String normalizeScore(String scoreValue) { return StringUtils.isEmpty(scoreValue) ? "0" : scoreValue.trim(); } /** * 查询任务问卷问题选项 * * @param id 任务问卷问题选项主键 @@ -237,7 +297,7 @@ subtaskCache.put(subtaskCacheKey, initialSubtaskList.get(0)); } String score = "0"; double scoreTotal = 0D; Long nextScriptno = null; aa: for (String key : targetKeys) { @@ -271,11 +331,7 @@ if (map == null) continue aa; if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo")); if (score == null || score.isEmpty()) { score = map.get("score"); } else { score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score"))); } scoreTotal += parseScore(map.get("score")); } } @@ -290,11 +346,7 @@ log.error("nextScriptNo的信息为：{}", map.get("nextScriptNo")); if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo")); if (score == null) { score = map.get("score"); } else { score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score"))); } scoreTotal += parseScore(map.get("score")); } } } @@ -313,11 +365,7 @@ Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid); if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo")); if (score == null || score.isEmpty()) { score = map.get("score"); } else { score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score"))); } scoreTotal += parseScore(map.get("score")); } } @@ -331,11 +379,7 @@ log.error("----nextScriptNo2的信息为：{}", map.get("nextScriptNo")); if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo")); if (score == null) { score = map.get("score"); } else { score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score"))); } scoreTotal += parseScore(map.get("score")); } } } @@ -375,7 +419,7 @@ serviceSubtask.setFinishtime(new Date()); serviceSubtask.setUpdateTime(new Date()); log.error("将该key和value从redis中,serviceSubtask的值为--------：{}", serviceSubtask); if (score != null && !score.isEmpty()) serviceSubtask.setScore(score); serviceSubtask.setScore(formatScore(scoreTotal)); serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask); //将当前发送状态改成 9 完成（缓存 preachform 查询） @@ -416,7 +460,7 @@ Long tid = Long.valueOf(serviceSubTaskCacheReq.getParam1()); Long pid = Long.valueOf(serviceSubTaskCacheReq.getParam2()); Long subid = Long.valueOf(serviceSubTaskCacheReq.getParam6()); String score = "0"; double scoreTotal = 0D; if (ObjectUtils.isNotEmpty(serviceSubTaskCacheReq)) { Long nextScriptno = null; String isabnormalFlag = "0"; @@ -463,18 +507,16 @@ if (shouldProcess) { Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid, preServiceSubtaskList, preServiceTask, preDetailIdMap, preTraceIdMap); log.error("nextScriptNo 的信息为：{}", map.get("nextScriptNo")); if (map == null) continue; log.info("nextScriptNo 的信息为：{}", map.get("nextScriptNo")); if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo")); if (score == null) { score = map.get("score"); } else { score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score"))); } scoreTotal += parseScore(map.get("score")); if (StringUtils.isNotEmpty(map.get("isabnormal"))) { isabnormalFlag = map.get("isabnormal"); } } } } else if (serviceSubTaskCacheReq.getType() == 1) { @@ -512,12 +554,10 @@ log.error("----nextScriptNo2 的信息为：{}", map.get("nextScriptNo")); if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo")); if (score == null) { score = map.get("score"); } else { score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score"))); } scoreTotal += parseScore(map.get("score")); if (StringUtils.isNotEmpty(map.get("isabnormal"))) { isabnormalFlag = map.get("isabnormal"); } } } } @@ -533,12 +573,12 @@ serviceSubtask.setTaskid(tid); serviceSubtask.setPatid(pid); serviceSubtask.setSubmit(1L); serviceSubtask.setIsabnormal(Integer.valueOf(isabnormalFlag)); serviceSubtask.setIsabnormal(parseIsabnormal(isabnormalFlag)); serviceSubtask.setSendstate(6L); serviceSubtask.setExcep(isabnormalFlag); serviceSubtask.setFinishtime(new Date()); serviceSubtask.setUpdateTime(new Date()); if (score != null && !score.isEmpty()) serviceSubtask.setScore(score); serviceSubtask.setScore(formatScore(scoreTotal)); serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask); //将当前发送状态改成9完成 @@ -594,7 +634,7 @@ } if (CollectionUtils.isNotEmpty(serviceSubTaskMYDAnswerReq.getSvyTaskTemplateScriptVOS())) { String score = "0"; double scoreTotal = 0D; List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOS = serviceSubTaskMYDAnswerReq.getSvyTaskTemplateScriptVOS(); Long nextScriptno = null; @@ -628,11 +668,7 @@ log.error("nextScriptNo 的信息为：{}", map.get("nextScriptNo")); if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo")); if (score == null || score.isEmpty()) { score = map.get("score"); } else { score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score"))); } scoreTotal += parseScore(map.get("score")); if (!Objects.isNull(map.get("id"))) { idList.add(Long.valueOf(map.get("id"))); @@ -694,7 +730,7 @@ serviceSubtask.setUpdateTime(new Date()); serviceSubtask.setCreateTime(new Date()); serviceSubtask.setVisitTime(new Date()); if (score != null && !score.isEmpty()) serviceSubtask.setScore(score); serviceSubtask.setScore(formatScore(scoreTotal)); serviceSubtaskMapper.insertServiceSubtask(serviceSubtask); //将当前发送状态改成9完成 ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform(); @@ -998,7 +1034,7 @@ nextScriptNo = getNextScriptNo(svyTaskTemplateScriptVO.getTemplateID(), svyTaskTemplateScriptVO.getScriptContent()); } if (svyTaskTemplateScriptVO.getScore() != null) { score = String.valueOf(svyTaskTemplateScriptVO.getScore()); score = normalizeScore(String.valueOf(svyTaskTemplateScriptVO.getScore())); } serviceSubtaskDetailVO.setAsrtext(StringUtils.isEmpty(svyTaskTemplateScriptVO.getScriptResult()) ? "" : svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", "")); serviceSubtaskDetailVO.setMatchedtext(StringUtils.isEmpty(svyTaskTemplateScriptVO.getScriptResult()) ? "" : svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", "")); @@ -1009,7 +1045,7 @@ if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getScriptResult())) { serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateScriptVO.getScriptResult()); if (svyTaskTemplateScriptVO.getScore() != null) { score = String.valueOf(svyTaskTemplateScriptVO.getScore()); score = normalizeScore(String.valueOf(svyTaskTemplateScriptVO.getScore())); } } nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno(); @@ -1153,7 +1189,7 @@ Map<String, String> map = new HashMap<>(); map.put("nextScriptNo", nextScriptNo); map.put("score", score); map.put("score", normalizeScore(score)); map.put("id", "" + serviceSubtaskDetail.getId()); map.put("isabnormal", isabnormalFlag.toString()); return map; @@ -1298,7 +1334,7 @@ } if (ivrTaskTemplateScriptVO.getScore() != null) { score = String.valueOf(ivrTaskTemplateScriptVO.getScore()); score = normalizeScore(String.valueOf(ivrTaskTemplateScriptVO.getScore())); } if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getQuestionResult())) { serviceSubtaskDetailVO.setAsrtext(ivrTaskTemplateScriptVO.getQuestionResult().replaceAll("^\"|\"$", "")); @@ -1319,7 +1355,7 @@ nextScriptNo = "" + getVoiceNextScriptNo(ivrTaskTemplateScriptVO.getTemplateID(), ivrTaskTemplateScriptVO.getScriptContent()); } if (ivrTaskTemplateScriptVO.getScore() != null) { score = String.valueOf(ivrTaskTemplateScriptVO.getScore()); score = normalizeScore(String.valueOf(ivrTaskTemplateScriptVO.getScore())); } } } @@ -1447,7 +1483,7 @@ Map<String, String> map = new HashMap<>(); map.put("nextScriptNo", nextScriptNo); map.put("score", score); map.put("score", normalizeScore(score)); map.put("isabnormal", isabnormalFlag); return map; } smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -5596,55 +5596,105 @@ } List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = serviceSubtaskMapper.statQuestionOptionBySubtaskIds(subtaskIds, startOutHospTime, endOutHospTime, startFinishTime, endFinishTime, scoreStart, scoreEnd, scriptContent, valueType); // 处理 targetvalue：按 & 分割成多条记录 // SQL 已按「题目 + 选项」汇总数量，这里再按题目合并（不同模板的 targetvalue 选项顺序不同，同一选项会拆成多行）， // 并把没人选的选项补成 0 行、按各选项数量之和重算比例 return mergeMydOptionRows(serviceSubtaskDetailRatioExports); } /** * 把 SQL 返回的「题目 + 选项」明细合并成「一行一个选项」 * <ul> * <li>同一题目下相同 optionresult 的数量累加：原实现遇到同名选项直接 continue， * 每个选项只会保留第一条明细的数量，多任务/多患者的项数全被丢掉，前端「数量」永远只有 1</li> * <li>选项清单取 targetvalue（用 & 连接），没人选的选项补 0 行，前端固定六列才能渲染</li> * <li>比例 = 该选项数量 / 该题各选项数量之和，保证一道题各选项比例合计 100%</li> * </ul> * * @param rows SQL 明细 */ private List<ServiceSubtaskDetailRatioExport> mergeMydOptionRows(List<ServiceSubtaskDetailRatioExport> rows) { List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>(); for (ServiceSubtaskDetailRatioExport export : serviceSubtaskDetailRatioExports) { if (StringUtils.isNotEmpty(export.getTargetvalue()) && export.getTargetvalue().contains("&")) { String[] values = export.getTargetvalue().split("&"); // 如果有多条目标值，拆分成多行 for (String value : values) { //先去 result 中查一下，有没有这个 questiontext 和对应的 targetvalue ServiceSubtaskDetailRatioExport existingExport = result.stream().filter(e -> { if (e == null || export == null) { return false; if (CollectionUtils.isEmpty(rows)) { return result; } String q1 = e.getQuestiontext() != null ? e.getQuestiontext() : ""; String q2 = export.getQuestiontext() != null ? export.getQuestiontext() : ""; String t1 = value.trim(); String t2 = e.getTargetvalue() != null ? e.getTargetvalue() : ""; return q1.equals(q2) && t1.equals(t2); }).findFirst().orElse(null); if (existingExport != null && "0".equals(existingExport.getRatio()) && "0".equals(existingExport.getCount())) { //如果存在，则将 result 里的这个问题所对应的 Targetvalue=value 这条数据更新成当前这条数据 if (value.equals(export.getOptionresult())) { existingExport.setRatio(export.getRatio()); existingExport.setScore(export.getScore()); existingExport.setCount(export.getCount()); existingExport.setOptionresult(export.getOptionresult()); } } else if (existingExport != null && !"0".equals(existingExport.getRatio())) { // key -> 选项 -> 数量，用 LinkedHashMap 保序：选项顺序沿用问卷配置 targetvalue 的顺序 Map<String, Map<String, long[]>> countMap = new LinkedHashMap<>(); Map<String, Map<String, String>> scoreMap = new LinkedHashMap<>(); Map<String, ServiceSubtaskDetailRatioExport> templateMap = new LinkedHashMap<>(); for (ServiceSubtaskDetailRatioExport row : rows) { if (row == null) { continue; } else { ServiceSubtaskDetailRatioExport newExport = DtoConversionUtils.sourceToTarget(export, ServiceSubtaskDetailRatioExport.class); newExport.setTargetvalue(value.trim()); // targetvalue 显示单个选项 if (!value.equals(export.getOptionresult())) { newExport.setOptionresult(null); newExport.setCount("0"); newExport.setRatio("0"); } result.add(newExport); String key = row.getQuestiontext(); if (key == null) { continue; } Map<String, long[]> counts = countMap.computeIfAbsent(key, k -> new LinkedHashMap<>()); Map<String, String> scores = scoreMap.computeIfAbsent(key, k -> new LinkedHashMap<>()); templateMap.putIfAbsent(key, row); // 题目配置的选项清单：没人选的选项也要列出来（数量为 0） for (String option : splitOptions(row.getTargetvalue())) { counts.computeIfAbsent(option, k -> new long[1]); } } else { // targetvalue 不包含 &，直接添加到结果 result.add(export); // 患者实际选中的选项：多选题 asrtext 是「选项1&选项2」，单选/问答题是整段文本 List<String> chosenOptions = "2".equals(row.getValueType()) ? splitOptions(row.getOptionresult()) : singleOption(row.getOptionresult()); if (chosenOptions.isEmpty()) { // 未作答：不进任何选项，也不进分母 continue; } long count = parseCount(row.getCount()); for (String chosen : chosenOptions) { // 选中的选项可能不在配置清单里（历史数据），补一行，数量不能丢 counts.computeIfAbsent(chosen, k -> new long[1])[0] += count; if (StringUtils.isNotEmpty(row.getScore()) && StringUtils.isEmpty(scores.get(chosen))) { scores.put(chosen, row.getScore()); } } } for (Map.Entry<String, Map<String, long[]>> entry : countMap.entrySet()) { ServiceSubtaskDetailRatioExport template = templateMap.get(entry.getKey()); Map<String, String> scores = scoreMap.get(entry.getKey()); long total = 0L; for (long[] count : entry.getValue().values()) { total += count[0]; } for (Map.Entry<String, long[]> optionEntry : entry.getValue().entrySet()) { String option = optionEntry.getKey(); long count = optionEntry.getValue()[0]; ServiceSubtaskDetailRatioExport merged = DtoConversionUtils.sourceToTarget(template, ServiceSubtaskDetailRatioExport.class); merged.setQuestiontext(template.getQuestiontext()); merged.setTargetvalue(option); // 没人选的选项 optionresult 置空，前端按 targetvalue 兜底展示，保持原有展示口径 merged.setOptionresult(count > 0 ? option : null); merged.setCount(String.valueOf(count)); merged.setRatio(formatRatio(count, total)); merged.setScore(StringUtils.isNotEmpty(scores.get(option)) ? scores.get(option) : template.getScore()); result.add(merged); } } return result; } /** * 单选/问答题的作答文本：不按 & 拆，避免把问答题的文本答案拆坏 */ private static List<String> singleOption(String answer) { List<String> options = new ArrayList<>(); String text = trimAll(answer); if (StringUtils.isNotEmpty(text)) { options.add(text); } return options; } /** * 标准化问卷答案文本：去掉 A/B/C/D 单字母前缀和后续空格 * 例如 "A 是" -> "是"，"B 否" -> "否" */ smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -3399,14 +3399,15 @@ <select id="statQuestionOptionBySubtaskIds" resultType="com.smartor.domain.ServiceSubtaskDetailRatioExport"> SELECT d.questiontext AS questiontext, t.taskid AS taskid, t.task_name AS taskName, <!-- 明细已按「题目 + 选项」汇总，任务/科室/病区只是附带信息，必须用聚合函数取值（MySQL ONLY_FULL_GROUP_BY） --> MAX(t.taskid) AS taskid, MAX(t.task_name) AS taskName, d.asrtext AS optionresult, d.score AS score, s.deptcode AS deptcode, s.deptname AS deptname, s.leavehospitaldistrictcode AS leavehospitaldistrictcode, s.leavehospitaldistrictname AS leavehospitaldistrictname, MAX(s.deptcode) AS deptcode, MAX(s.deptname) AS deptname, MAX(s.leavehospitaldistrictcode) AS leavehospitaldistrictcode, MAX(s.leavehospitaldistrictname) AS leavehospitaldistrictname, d.targetvalue AS targetvalue, d.value_type AS valueType, COUNT(*) AS count, @@ -3424,9 +3425,15 @@ AND d2.del_flag = '0' ) INNER JOIN ( <!-- 分母 = 该题各选项项数之和（未作答的空 asrtext 不进分母），这样一道题各选项比例合计才是 100% --> SELECT x.questiontext AS questiontext, SUM(x.option_count) AS total_count FROM ( SELECT d.questiontext, COUNT(*) AS total_count d.asrtext, COUNT(*) AS option_count FROM service_task t INNER JOIN service_subtask s ON s.taskid = t.taskid @@ -3467,7 +3474,11 @@ <if test="endFinishTime != null"> AND date_format(s.finishtime,'%y%m%d') <= date_format(#{endFinishTime},'%y%m%d') </if> GROUP BY d.questiontext <!-- 未作答（asrtext 为空）的明细不计入分母 --> AND d.asrtext IS NOT NULL AND TRIM(d.asrtext) <> '' GROUP BY d.questiontext, d.asrtext ) x GROUP BY x.questiontext ) t2 ON t2.questiontext = d.questiontext WHERE 1=1 <!-- 去重：明细行同一子任务同一题目只保留最新一条，重答不重复计入项数 --> @@ -3486,6 +3497,8 @@ </if> AND s.sendstate = 6 AND d.del_flag=0 <!-- 未作答（asrtext 为空）不算任何选项，明细里直接排除，避免出现空选项行 --> AND d.asrtext IS NOT NULL AND TRIM(d.asrtext) <> '' <if test="valueType != null">AND d.value_type >= #{valueType}</if> <if test="scoreStart != null">AND d.score >= #{scoreStart}</if> <if test="scoreEnd != null">AND d.score <= #{scoreEnd}</if> @@ -3504,21 +3517,17 @@ <if test="endFinishTime != null"> AND date_format(s.finishtime,'%y%m%d') <= date_format(#{endFinishTime},'%y%m%d') </if> <!-- 只按「题目 + 选项」汇总：原来 GROUP BY 带上 taskid/科室/病区，同一个选项被拆成多行、每行数量都是 1， 前端/导出拿到的「数量」就永远做不了累加 --> GROUP BY t.taskid, d.questiontext, d.asrtext, d.score, d.targetvalue, d.asrtext, t.task_name, s.deptcode, s.deptname, s.leavehospitaldistrictcode, s.leavehospitaldistrictname, d.value_type ORDER BY d.questiontext, t.taskid MIN(t.taskid) </select> <select id="statQuestionOptionByKsOrBq" resultType="com.smartor.domain.DTO.QuestionCountKsOrBqDTO"
