From 7a4ef2968a0d5d28b2fedaaaec2227557fc9d420 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 20 六月 2024 16:28:08 +0800
Subject: [PATCH] zjh 本地 2024/06/20 --2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
index b8aadcf..d598083 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
@@ -306,7 +306,6 @@
if (s.equals(tjOrder.getCheckDoctor()) && tjOrder.getReleaseTime() != null) {
releaseCount++;
}
- // TODO: 2023/3/31 鍙戦�佺煭淇�/閭欢缁熻
if (s.equals(tjOrder.getCheckDoctor()) && "1".equals(tjOrder.getSendEmail())) {
messageCount++;
}
@@ -720,13 +719,14 @@
Integer tuan=0;
BigDecimal shouyi=new BigDecimal(0);
for (TjOrder tjOrder : list) {
- final TjCustomer byId = customerService.getById(tjOrder.getUserId());
- if (byId.getCusSex()==0){
- boys+=1;
- }else if (byId.getCusSex()==1){
- girls+=1;
+ TjCustomer customer = customerService.getById(tjOrder.getUserId());
+ if(null !=customer){
+ if (customer.getCusSex()==0){
+ boys+=1;
+ }else if (customer.getCusSex()==1){
+ girls+=1;
+ }
}
-
if ("2".equals(tjOrder.getTjType())){
person+=1;
} else if ("1".equals(tjOrder.getTjType())) {
@@ -737,7 +737,10 @@
wqqq.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
final List<TjFlowingWater> list1 = tjFlowingWaterService.list(wqqq);
for (TjFlowingWater tjFlowingWater : list1) {
- shouyi.add(tjFlowingWater.getPaidIn());
+ if(null !=tjFlowingWater.getPaidIn()){
+ shouyi.add(tjFlowingWater.getPaidIn());
+ }
+
}
}
chartVo.setBoysNum(boys);
--
Gitblit v1.8.0