From 9a6ae1d105033b057f58586723c78ae86ad3cfc9 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 08 六月 2026 15:54:46 +0800
Subject: [PATCH] 【丽水】随访查询页面-统计调整 * total: 患者服务总量 * wxsf: 无需随访数量 sendstate != 4 * xsf: 需随访数量 sendstate = 4 * dsf: 待随访数量 sendstate = 1L, 2L, 3L, 5L, 7L * ywc: 已完成数量 sendstate = 6L * yc: 异常数量 excep = '1' * yc: 警告数量 excep = '2'
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java
index 706566b..f96a3d0 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java
@@ -109,7 +109,8 @@
}
}
}
- Collections.sort(serviceSubtaskDetailSET, Comparator.comparingLong(ServiceSubtaskDetail::getTemplatequestionnum));
+ Collections.sort(serviceSubtaskDetailSET,
+ Comparator.comparing(ServiceSubtaskDetail::getTemplatequestionnum, Comparator.nullsLast(Long::compareTo)));
map1.put("filteredDetails", serviceSubtaskDetailSET);
map1.put("voice", "");
@@ -129,12 +130,17 @@
return map;
}
- /**
- * 鏂板璇煶浠诲姟鍛煎彨鏄庣粏
- *
- * @param serviceSubtaskDetail 璇煶浠诲姟鍛煎彨鏄庣粏
- * @return 缁撴灉
- */
+ @Override
+ public List<Map<String, Object>> getServiceSubtaskDetails(ServiceSubtaskDetailVO serviceSubtaskDetailVO) {
+ List<Map<String, Object>> serviceSubtaskDetails = ServiceSubtaskDetailMapper.getServiceSubtaskDetails(serviceSubtaskDetailVO);
+ return serviceSubtaskDetails;
+ }
+ /**
+ * 鏂板璇煶浠诲姟鍛煎彨鏄庣粏
+ *
+ * @param serviceSubtaskDetail 璇煶浠诲姟鍛煎彨鏄庣粏
+ * @return 缁撴灉
+ */
@Override
public int insertServiceSubtaskDetail(ServiceSubtaskDetail serviceSubtaskDetail) {
serviceSubtaskDetail.setCreateTime(DateUtils.getNowDate());
--
Gitblit v1.9.3