From 93078044580c2781cb8cf3ac18d2ab90513267de Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 28 九月 2026 17:13:36 +0800
Subject: [PATCH] 处理患者再入院状态代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 363 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 314 insertions(+), 49 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 53f6da1..bcca0f4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -14,7 +14,6 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.common.utils.sms.smsUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
@@ -23,10 +22,7 @@
import com.smartor.common.MtSubmitSmUtil;
import com.smartor.common.ScheduleSubtaskBuilder;
import com.smartor.config.PhoneUtils;
-import com.smartor.domain.DTO.MydTrendReqDTO;
-import com.smartor.domain.DTO.MzMydScoreRankDTO;
-import com.smartor.domain.DTO.QuestionCountKsOrBqDTO;
-import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
+import com.smartor.domain.DTO.*;
import com.smartor.domain.*;
import com.smartor.domain.VO.*;
import com.smartor.domain.entity.ServiceSubtaskEntity;
@@ -631,6 +627,43 @@
result.putIfAbsent("wxsf", 0);
result.putIfAbsent("xsf", 0);
result.putIfAbsent("dsf", 0);
+ result.putIfAbsent("ywc", 0);
+ result.putIfAbsent("yc", 0);
+ result.putIfAbsent("jg", 0);
+ }
+ return result;
+ }
+
+ /**
+ * 缁熻浠诲姟鍚勭鐘舵�佺殑鏁伴噺锛堝凡浼樺寲锛�
+ * 浼樺寲璇存槑锛�
+ * 1. 浣跨敤鏁版嵁搴撳眰鑱氬悎璁＄畻锛屾浛浠ｅ簲鐢ㄥ眰閬嶅巻
+ * 2. 鎬ц兘鎻愬崌 10-100 鍊嶏紙鍙栧喅浜庢暟鎹噺锛�
+ * 3. 闄嶄綆鍐呭瓨鍗犵敤鍜岀綉缁滀紶杈�
+ *
+ * @param serviceSubtaskEntity 鏌ヨ鏉′欢
+ * @return 鍚勭姸鎬佺粺璁＄粨鏋�
+ */
+ @Override
+ public Map<String, Object> countByCondition(ServiceSubtaskEntity serviceSubtaskEntity) {
+ // 鐩存帴璋冪敤鏁版嵁搴撶粺璁℃柟娉曪紝鍦ㄦ暟鎹簱灞傚畬鎴愯仛鍚堣绠�
+ Map<String, Object> result = serviceSubtaskMapper.countByCondition(serviceSubtaskEntity);
+ // 澶勭悊绌哄紓甯�
+ if (MapUtils.isEmpty(result)) {
+ result = new HashMap<>();
+ // 纭繚鎵�鏈� key 閮芥湁鍊硷紝閬垮厤绌烘寚閽堝紓甯�
+ // MyBatis 鐨� SUM 鍦ㄦ病鏈夊尮閰嶈鏃朵細杩斿洖 null
+ result.putIfAbsent("wzx", 0);
+ result.putIfAbsent("ysf", 0);
+ result.putIfAbsent("fssb", 0);
+ result.putIfAbsent("yfs", 0);
+ result.putIfAbsent("blq", 0);
+ result.putIfAbsent("total", 0);
+ result.putIfAbsent("wxsf", 0);
+ result.putIfAbsent("xsf", 0);
+ result.putIfAbsent("dsf", 0);
+ result.putIfAbsent("dfs", 0);
+ result.putIfAbsent("yfs", 0);
result.putIfAbsent("ywc", 0);
result.putIfAbsent("yc", 0);
result.putIfAbsent("jg", 0);
@@ -5230,13 +5263,13 @@
return resultMap;
}
@Override
- public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startFinishTime, Date endFinishTime, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType) {
+ public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startFinishTime, Date endFinishTime, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType, List<Long> subtaskIds) {
//鍏堟竻鐞嗕竴涓嬮噸澶嶆暟鎹�
List<Long> repeatIds = serviceSubtaskDetailMapper.selectRepeatDetailIds();
if (!CollectionUtils.isEmpty(repeatIds)) {
serviceSubtaskDetailMapper.deleteRepeatDetailByIds(repeatIds);
}
- List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = serviceSubtaskMapper.statQuestionOption(taskIds, startOutHospTime, endOutHospTime, startFinishTime, endFinishTime, scoreStart, scoreEnd, scriptContent, valueType);
+ List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = serviceSubtaskMapper.statQuestionOption(taskIds, startOutHospTime, endOutHospTime, startFinishTime, endFinishTime, scoreStart, scoreEnd, scriptContent, valueType, subtaskIds);
// 澶勭悊 targetvalue锛氭寜 & 鍒嗗壊鎴愬鏉¤褰�
List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
@@ -5246,7 +5279,9 @@
// 濡傛灉鏈夊鏉＄洰鏍囧�硷紝鎷嗗垎鎴愬琛�
for (String value : values) {
//鍏堝幓 result 涓煡涓�涓嬶紝鏈夋病鏈夎繖涓� questiontext 鍜屽搴旂殑 targetvalue
- ServiceSubtaskDetailRatioExport existingExport = result.stream().filter(e -> e.getQuestiontext().equals(export.getQuestiontext()) && value.trim().equals(e.getTargetvalue())).findFirst().orElse(null);
+ //娉ㄦ剰蹇呴』甯︿笂 taskid 涓�璧峰尮閰嶏細鍚﹀垯浼氭妸鍒殑浠诲姟鐨勬暟鎹～鍒版湰浠诲姟鐨勮涓婏紝
+ //瀵艰嚧瀵煎嚭鐨勩�屾暟閲�/姣斾緥銆嶅拰璇ヨ鐨勩�屼换鍔″悕绉�/浠诲姟缂栧彿銆嶅涓嶄笂锛堝悓涓�浠诲姟鍚屼竴棰樺嚭鐜颁袱涓笉鍚屽垎姣嶏級
+ ServiceSubtaskDetailRatioExport existingExport = result.stream().filter(e -> Objects.equals(e.getTaskid(), export.getTaskid()) && e.getQuestiontext().equals(export.getQuestiontext()) && value.trim().equals(e.getTargetvalue())).findFirst().orElse(null);
if (existingExport != null && existingExport.getRatio().equals("0") && existingExport.getCount().equals("0")) {
//濡傛灉瀛樺湪锛屽垯灏� result 閲岀殑杩欎釜闂鎵�瀵瑰簲鐨� Targetvalue=value 杩欐潯鏁版嵁鏇存柊鎴愬綋鍓嶈繖鏉℃暟鎹�
if (value.equals(export.getOptionresult())) {
@@ -5275,6 +5310,152 @@
}
return result;
+ }
+
+ @Override
+ public List<ServiceSubtaskDetailRatioExport> statMydQuestionOptionForExport(List<Long> subtaskIds, String questiontext) {
+ List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
+ if (CollectionUtils.isEmpty(subtaskIds)) {
+ return result;
+ }
+ List<ServiceSubtaskOptionStatDTO> statList = serviceSubtaskMapper.statMydQuestionOptionForExport(subtaskIds, questiontext);
+ if (CollectionUtils.isEmpty(statList)) {
+ return result;
+ }
+ return buildMydOptionRows(statList);
+ }
+
+ /**
+ * 鎶娿�屼换鍔�+棰樼洰+閫夐」銆嶇殑浣滅瓟缁熻鎷兼垚瀵煎嚭鐨勩�岄棶棰樿鎯呭崰姣斻�嶈
+ * <ul>
+ * <li>閫夐」娓呭崟锛氶鐩厤缃繃鐨勯�夐」鍦� targetvalue锛堢敤 & 杩炴帴锛夐噷锛屽叏閮ㄥ垪鍑猴紝娌′汉閫夌殑鏄剧ず 0</li>
+ * <li>鏁伴噺锛氭偅鑰呴�変腑鐨勯�夐」鍦� asrtext 閲岋紙澶氶�夐鏄�孉&B銆嶏級锛屾瘡涓�変腑椤瑰悇璁颁竴娆′汉鏁帮紝涓�涓偅鑰呭彧绠椾竴鏉℃槑缁�</li>
+ * <li>姣斾緥锛氭暟閲� / 璇ラ浣滅瓟鎮ｈ�呮暟锛屾墍浠ュ崟閫夐鍚勯�夐」鏁伴噺涔嬪拰 = 璇ラ浣滅瓟鎮ｈ�呮暟</li>
+ * <li>鍒嗘暟锛氳閫夐」鏄庣粏鐨� score 涔嬪拰锛涘閫夎鎸夐�変腑椤逛唤鏁板潎鍒嗭紝淇濊瘉鍚勯�夐」鍒嗘暟涔嬪拰 = 鏄庣粏鍒嗘暟涔嬪拰</li>
+ * </ul>
+ */
+ private static List<ServiceSubtaskDetailRatioExport> buildMydOptionRows(List<ServiceSubtaskOptionStatDTO> statList) {
+ List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
+
+ // 鎸夈�屼换鍔� + 棰樼洰銆嶅垎缁勶紝淇濇寔 SQL 鐨勯『搴忥紙鍏堥鐩悗浠诲姟锛�
+ Map<String, List<ServiceSubtaskOptionStatDTO>> grouped = new LinkedHashMap<>();
+ for (ServiceSubtaskOptionStatDTO stat : statList) {
+ String key = stat.getTaskid() + "\u0001" + stat.getQuestiontext();
+ grouped.computeIfAbsent(key, k -> new ArrayList<>()).add(stat);
+ }
+
+ for (List<ServiceSubtaskOptionStatDTO> group : grouped.values()) {
+ ServiceSubtaskOptionStatDTO first = group.get(0);
+ // 閫夐」 -> 浜烘暟锛坙ong[1] 渚夸簬绱姞锛夛紝椤哄簭鍗冲嚭鐜伴『搴�
+ Map<String, long[]> countMap = new LinkedHashMap<>();
+ Map<String, BigDecimal> scoreMap = new LinkedHashMap<>();
+
+ for (ServiceSubtaskOptionStatDTO stat : group) {
+ // targetvalue = 鏈鎵�鏈夐�夐」鐨勬竻鍗曪紝娌′汉閫夌殑涔熻鍒楀嚭鏉�
+ List<String> options = splitOptions(stat.getTargetvalue());
+ // asrtext = 鎮ｈ�呭疄闄呴�変腑鐨勯�夐」锛屽閫夐浼氭槸銆岄�変腑椤�1&閫変腑椤�2銆�
+ List<String> chosenOptions = splitOptions(stat.getOptionresult());
+ for (String option : options) {
+ countMap.computeIfAbsent(option, k -> new long[1]);
+ scoreMap.computeIfAbsent(option, k -> BigDecimal.ZERO);
+ }
+
+ long patientCount = stat.getPatientCount() == null ? 0L : stat.getPatientCount();
+ BigDecimal scoreSum = stat.getScoreSum() == null ? BigDecimal.ZERO : stat.getScoreSum();
+
+ if (!chosenOptions.isEmpty()) {
+ BigDecimal[] scoreParts = splitScore(scoreSum, chosenOptions.size());
+ for (int i = 0; i < chosenOptions.size(); i++) {
+ String chosen = chosenOptions.get(i);
+ // 閫変腑鐨勯�夐」鍙兘涓嶅湪閰嶇疆娓呭崟閲岋紙鍘嗗彶鏁版嵁锛夛紝琛ヤ竴琛�
+ countMap.computeIfAbsent(chosen, k -> new long[1]);
+ scoreMap.computeIfAbsent(chosen, k -> BigDecimal.ZERO);
+ countMap.get(chosen)[0] += patientCount;
+ scoreMap.put(chosen, scoreMap.get(chosen).add(scoreParts[i]));
+ }
+ } else if (options.size() == 1) {
+ // 娌℃湁 asrtext锛堟湭绛�/鏃犲簲绛旓級鏃讹紝鍙湁鍞竴閫夐」鎵嶈兘纭畾褰掑睘
+ countMap.get(options.get(0))[0] += patientCount;
+ scoreMap.put(options.get(0), scoreMap.get(options.get(0)).add(scoreSum));
+ }
+ }
+
+ long total = 0L;
+ for (long[] count : countMap.values()) total += count[0];
+
+ for (Map.Entry<String, long[]> entry : countMap.entrySet()) {
+ long count = entry.getValue()[0];
+ ServiceSubtaskDetailRatioExport row = new ServiceSubtaskDetailRatioExport();
+ row.setQuestiontext(first.getQuestiontext());
+ row.setOptionresult(entry.getKey());
+ row.setTargetvalue(entry.getKey());
+ row.setCount(String.valueOf(count));
+ row.setRatio(formatRatio(count, total));
+ row.setScore(formatScore(scoreMap.get(entry.getKey())));
+ row.setTaskname(first.getTaskName());
+ row.setTaskid(first.getTaskid());
+ row.setValueType(first.getValueType());
+ result.add(row);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 鎶婁竴鏉℃槑缁嗙殑鍒嗘暟鎸夐�変腑椤逛唤鏁板潎鍒嗭紝浣欐暟琛ョ粰绗竴涓紝淇濊瘉鍚勪唤涔嬪拰 = 鍘熷垎鏁�
+ */
+ private static BigDecimal[] splitScore(BigDecimal total, int parts) {
+ BigDecimal[] result = new BigDecimal[parts];
+ if (parts <= 0) {
+ return result;
+ }
+ BigDecimal each = total.divide(BigDecimal.valueOf(parts), 2, RoundingMode.HALF_UP);
+ for (int i = 0; i < parts; i++) {
+ result[i] = each;
+ }
+ result[0] = result[0].add(total.subtract(each.multiply(BigDecimal.valueOf(parts))));
+ return result;
+ }
+
+ /**
+ * 鎷嗗垎棰樼洰閰嶇疆鐨勯�夐」锛堝涓�夐」鐢� & 杩炴帴锛夛紝椤哄甫鍘绘帀鍏ㄨ/鍗婅绌虹櫧
+ */
+ private static List<String> splitOptions(String targetvalue) {
+ List<String> options = new ArrayList<>();
+ if (StringUtils.isEmpty(targetvalue)) {
+ return options;
+ }
+ for (String part : targetvalue.split("&")) {
+ String option = trimAll(part);
+ if (StringUtils.isNotEmpty(option) && !options.contains(option)) {
+ options.add(option);
+ }
+ }
+ return options;
+ }
+
+ /**
+ * 姣斾緥锛氭暟閲� / 璇ラ浣滅瓟鎮ｈ�呮暟锛屼繚鐣欎袱浣嶅皬鏁�
+ */
+ private static String formatRatio(long count, long total) {
+ if (total <= 0) {
+ return "0.00%";
+ }
+ return BigDecimal.valueOf(count * 100.0 / total).setScale(2, RoundingMode.HALF_UP).toPlainString() + "%";
+ }
+
+ /**
+ * 鍒嗘暟涔嬪拰锛氬幓鎺夊浣欑殑灏忔暟浣嶏紙0.00 -> 0锛�
+ */
+ private static String formatScore(BigDecimal score) {
+ if (score == null) {
+ return "0";
+ }
+ BigDecimal value = score.stripTrailingZeros();
+ if (value.scale() < 0) {
+ value = value.setScale(0);
+ }
+ return value.toPlainString();
}
/*
@@ -5410,52 +5591,102 @@
}
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;
- }
- 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())) {
- 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);
- }
+ if (CollectionUtils.isEmpty(rows)) {
+ return result;
+ }
+
+ // 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;
+ }
+ 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]);
+ }
+
+ // 鎮ｈ�呭疄闄呴�変腑鐨勯�夐」锛氬閫夐 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());
}
- } else {
- // targetvalue 涓嶅寘鍚� &锛岀洿鎺ユ坊鍔犲埌缁撴灉
- result.add(export);
}
}
+ 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;
}
/**
@@ -5749,7 +5980,39 @@
Date newDate = new Date();
serviceSubtask.setLongSendTime(newDate);
serviceSubtask.setVisitTime(newDate);
+ // 闄㈠尯锛�/scanGenerateSubtask 鏄尶鍚嶆帴鍙ｏ紙SecurityConfig permitAll锛夛紝鍙栦笉鍒扮櫥褰曠敤鎴凤紱
+ // 鑰� service_task.campusid 鍦ㄦ湰搴撴槸鍗犱綅鍊� '1'锛岀洿鎺ユ部鐢ㄤ細璁╃粺璁℃帴鍙ｏ紙@AddOrgId 鎸夐櫌鍖鸿繃婊わ級鏌ヤ笉鍒版暟鎹��
+ // 杩欓噷鐢ㄤ换鍔￠厤缃殑鐥呭尯锛堝叾娆＄瀹わ級鍙嶆煡 sys_dept.campusid 钀藉簱锛屼繚璇侀棶鍗风粺璁¤兘鎸夐櫌鍖哄彇鍒般��
+ String campusIdByDept = queryCampusIdByDeptCode(serviceSubtask.getLeavehospitaldistrictcode(), serviceTask.getOrgid());
+ if (StringUtils.isEmpty(campusIdByDept)) {
+ campusIdByDept = queryCampusIdByDeptCode(serviceSubtask.getDeptcode(), serviceTask.getOrgid());
+ }
+ if (StringUtils.isNotEmpty(campusIdByDept)) {
+ serviceSubtask.setCampusid(campusIdByDept);
+ }
+ // 鍙厤浜嗙瀹わ紙娌℃湁鐥呭尯锛夌殑婊℃剰搴︿换鍔★細杩欓亾绛斿嵎鍦ㄦ寜鐥呭尯绛涢�夌殑鎶ヨ〃閲岀粺璁′笉鍒帮紝鐣欐棩蹇椾究浜庤繍缁村彂鐜�
+ if (StringUtils.isEmpty(serviceSubtask.getLeavehospitaldistrictcode())
+ && ("6".equals(serviceSubtask.getServiceType()) || "14".equals(serviceSubtask.getServiceType()))) {
+ log.warn("銆愭壂鐮佺敓鎴愪换鍔°�戞弧鎰忓害瀛愪换鍔℃病鏈夌梾鍖猴紝鎸夌梾鍖虹瓫閫夌殑鎶ヨ〃灏嗙粺璁′笉鍒拌绛斿嵎锛歵askid={}, deptcode={}, campusid={}",
+ serviceSubtask.getTaskid(), serviceSubtask.getDeptcode(), serviceSubtask.getCampusid());
+ }
return serviceSubtask;
+ }
+
+ /**
+ * 鎸夌瀹�/鐥呭尯缂栫爜鍙嶆煡鎵�灞為櫌鍖猴紙鏌ヤ笉鍒拌繑鍥� null锛�
+ */
+ private String queryCampusIdByDeptCode(String deptCode, String orgid) {
+ if (StringUtils.isEmpty(deptCode)) {
+ return null;
+ }
+ try {
+ SysDept sysDept = sysDept2Mapper.selectDeptByCode(deptCode, orgid);
+ return sysDept == null ? null : sysDept.getCampusid();
+ } catch (Exception e) {
+ log.warn("鎸夌紪鐮佸弽鏌ラ櫌鍖哄け璐ワ細deptCode={}, orgid={}, err={}", deptCode, orgid, e.getMessage());
+ return null;
+ }
}
/**
@@ -6197,7 +6460,9 @@
if (hasFollowUp) {
//鑾峰彇serviceSubtaskList涓殑鎵�鏈塼askid
List<Long> taskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getTaskid).filter(ObjectUtils::isNotEmpty).distinct().collect(Collectors.toList());
- serviceSubtaskDetailRatioExports = statQuestionOption(taskIds, sltdMydTotalVO.getStartFinishTime(), sltdMydTotalVO.getEndFinishTime(), sltdMydTotalVO.getStartOutHospTime(), sltdMydTotalVO.getEndOutHospTime(), sltdMydTotalVO.getQuestionContent(), sltdMydTotalVO.getStartScore(), sltdMydTotalVO.getEndScore(), sltdMydTotalVO.getValueType());
+ //鍚屾椂甯︿笂鏈瀵煎嚭鐨勫瓙浠诲姟 id锛氳銆岄棶棰樿鎯呭崰姣斻�嶅彧缁熻杩欐壒鎮ｈ�咃紝涓庛�屾偅鑰呴殢璁夸俊鎭〃鍗曘�嶅彛寰勪竴鑷�
+ List<Long> subtaskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getId).filter(ObjectUtils::isNotEmpty).distinct().collect(Collectors.toList());
+ serviceSubtaskDetailRatioExports = statQuestionOption(taskIds, sltdMydTotalVO.getStartFinishTime(), sltdMydTotalVO.getEndFinishTime(), sltdMydTotalVO.getStartOutHospTime(), sltdMydTotalVO.getEndOutHospTime(), sltdMydTotalVO.getQuestionContent(), sltdMydTotalVO.getStartScore(), sltdMydTotalVO.getEndScore(), sltdMydTotalVO.getValueType(), subtaskIds);
} else if (hasSatisfaction) {
//婊℃剰搴︾粺璁� 锛堥�氳繃 subtask 鐨� id 鍘荤粺璁★級
List<Long> subtaskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getId).collect(Collectors.toList());
--
Gitblit v1.9.3