From 76654b216b0d7a9cdafa01a037a4807204fb51ec Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 08 八月 2024 18:14:57 +0800
Subject: [PATCH] zjh 2024-08-08
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java | 158 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 145 insertions(+), 13 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 9441e70..f2772c4 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
@@ -9,6 +9,7 @@
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.DateUtils;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.dto.TjChartVo;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.*;
import com.ltkj.system.service.ISysDeptService;
@@ -16,10 +17,12 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -54,6 +57,9 @@
@Resource
private ITjOrderRemarkService remarkService;
+ @Resource
+ private ITjFlowingWaterService tjFlowingWaterService;
+
@GetMapping("/GetChartByDate")
@ApiOperation(value = "鏉″舰缁熻鏃堕棿娈靛唴涓汉鍜屽洟闃熶綋妫�鏁�")
@@ -68,13 +74,13 @@
Date beginTime = DateUtils.parseDate(date + " 00:00:00");
Date endTime = DateUtils.parseDate(date + " 23:59:59");
QueryWrapper<TjOrder> queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.ge("finish_time", beginTime);
- queryWrapper1.lt("finish_time", endTime);
+ queryWrapper1.ge("create_time", beginTime);
+ queryWrapper1.lt("create_time", endTime);
queryWrapper1.eq("tj_type", 2);
Integer personCount = orderService.count(queryWrapper1);
QueryWrapper<TjOrder> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.ge("finish_time", beginTime);
- queryWrapper2.lt("finish_time", endTime);
+ queryWrapper2.ge("create_time", beginTime);
+ queryWrapper2.lt("create_time", endTime);
queryWrapper2.eq("tj_type", 1);
Integer teamCount = orderService.count(queryWrapper2);
@@ -94,14 +100,14 @@
Date beginTime = DateUtils.parseDate(formatdate + " 00:00:00");
Date endTime = DateUtils.parseDate(formatdate + " 23:59:59");
QueryWrapper<TjOrder> queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.ge("finish_time", beginTime);
- queryWrapper1.lt("finish_time", endTime);
+ queryWrapper1.ge("create_time", beginTime);
+ queryWrapper1.lt("create_time", endTime);
queryWrapper1.eq("tj_type", 2);
Integer personCount = orderService.count(queryWrapper1);
QueryWrapper<TjOrder> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.ge("finish_time", beginTime);
- queryWrapper2.lt("finish_time", endTime);
+ queryWrapper2.ge("create_time", beginTime);
+ queryWrapper2.lt("create_time", endTime);
queryWrapper2.eq("tj_type", 1);
Integer teamCount = orderService.count(queryWrapper2);
@@ -300,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++;
}
@@ -604,7 +609,12 @@
public Integer ToBeToday() {
//褰撳墠鏃ユ湡鎷兼帴寮�濮嬪拰缁撴潫鏃堕棿
//鏃堕棿瀛楃涓茬被鍨嬭浆鎹㈡椂闂寸被鍨�
- return orderService.count(new QueryWrapper<TjOrder>().between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())).eq("check_status", 0));
+ return orderService.count(new QueryWrapper<TjOrder>()
+ .between("create_time", DateUtil.beginOfDay(new Date()),
+ DateUtil.endOfDay(new Date()))
+ .isNotNull("finish_time")
+ .eq("check_status", 0)
+ .ne("tj_category","13"));
}
/**
@@ -617,7 +627,10 @@
public Integer checkedToday() {
//褰撳墠鏃ユ湡鎷兼帴寮�濮嬪拰缁撴潫鏃堕棿
//鏃堕棿瀛楃涓茬被鍨嬭浆鎹㈡椂闂寸被鍨�
- return orderService.count(new QueryWrapper<TjOrder>().isNotNull("finish_time").between("finish_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
+ return orderService.count(new QueryWrapper<TjOrder>()
+ .isNotNull("finish_time")
+ .between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()))
+ .last("and (check_status=1 OR tj_category=13)"));
}
/**
@@ -628,7 +641,9 @@
public Integer ReportToday() {
//褰撳墠鏃ユ湡鎷兼帴寮�濮嬪拰缁撴潫鏃堕棿
//鏃堕棿瀛楃涓茬被鍨嬭浆鎹㈡椂闂寸被鍨�
- return orderService.count(new QueryWrapper<TjOrder>().isNotNull("report_time").between("report_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
+ return orderService.count(new QueryWrapper<TjOrder>()
+ .isNotNull("report_time")
+ .between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
}
/**
@@ -639,6 +654,123 @@
@GetMapping("/registerToday")
@ApiOperation(value = "鏌ヨ浠婃棩鐧昏")
public Integer RegisterToday() {
- return orderService.count(new QueryWrapper<TjOrder>().between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
+ return orderService.count(new QueryWrapper<TjOrder>()
+ .between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
}
+
+
+ @GetMapping("/getChartByDeptId")
+ @ApiOperation("鏍规嵁閮ㄩ棬鏌ヨ浣撴缁熻")
+ public AjaxResult getChartByDeptId(@RequestParam Long deptId,
+ @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
+ List<TjChartVo> res=new ArrayList();
+ LambdaQueryWrapper<TjOrderRemark> wq0 = new LambdaQueryWrapper<>();
+ wq0.eq(TjOrderRemark::getDeptId, deptId);
+ List<TjOrderRemark> remarkList = remarkService.list(wq0);
+
+ List<Long> proIdList = remarkList.stream().map(TjOrderRemark::getProId).distinct().collect(Collectors.toList());
+ for (Long aLong : proIdList) {
+ LambdaQueryWrapper<TjOrderRemark> wq00 = new LambdaQueryWrapper<>();
+ wq00.eq(TjOrderRemark::getDeptId, deptId);
+ List<TjOrderRemark> remarkList1 = remarkService.list(wq00);
+ Integer num1=0;
+ Integer num2=0;
+ Integer num3=0;
+ Integer num4=0;
+ TjChartVo chartVo=new TjChartVo();
+ chartVo.setDeptId(deptId);
+ chartVo.setDeptName(deptService.getById(deptId).getDeptName());
+ for (TjOrderRemark tjOrderRemark : remarkList1) {
+ if (tjOrderRemark.getType()==1){
+ num1+=1;
+ }else if (tjOrderRemark.getType()==0){
+ num1+=1;
+ }else if (tjOrderRemark.getType()==3){
+ num1+=1;
+ }else if (tjOrderRemark.getType()==2){
+ num1+=1;
+ }
+ }
+ chartVo.setYijianNum(String.valueOf(num1));
+ chartVo.setWeijianNum(String.valueOf(num2));
+ chartVo.setYanqiNum(String.valueOf(num3));
+ chartVo.setQijianNum(String.valueOf(num4));
+ res.add(chartVo);
+ }
+ return AjaxResult.success(res);
+ }
+
+
+ @GetMapping("/getTiaoByDeptId")
+ @ApiOperation("鏍规嵁閮ㄩ棬鍜屾椂闂存鏌ヨ浣撴缁熻鍥捐〃")
+ public AjaxResult getTiaoByDeptId(@RequestParam Long deptId,
+ @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
+
+ return AjaxResult.success();
+ }
+
+ @GetMapping("/getTiaoNumsByDate")
+ @ApiOperation("鏍规嵁鏃堕棿鏌ヨ浣撴缁熻鍥捐〃")
+ public AjaxResult getTiaoNumsByDate(@ApiParam(value = "寮�濮嬫椂闂�")String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") String endTime) {
+ TjChartVo chartVo=new TjChartVo();
+ LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
+ wqq.gt(TjOrder::getStatus,200);
+ if (null != beginTime && null != endTime) {
+ wqq.between(TjOrder::getCreateTime, beginTime, endTime);
+ }
+ final List<TjOrder> list = orderService.list(wqq);
+ chartVo.setTijianNum(list.size());
+
+ Integer boys=0;
+ Integer girls=0;
+ Integer person=0;
+ Integer tuan=0;
+ BigDecimal shouyi=new BigDecimal(0);
+ for (TjOrder tjOrder : list) {
+ 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())) {
+ tuan+=1;
+ }
+ //璁＄畻鏀剁泭
+ LambdaQueryWrapper<TjFlowingWater> wqqq=new LambdaQueryWrapper<>();
+ wqqq.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
+ final List<TjFlowingWater> list1 = tjFlowingWaterService.list(wqqq);
+ for (TjFlowingWater tjFlowingWater : list1) {
+ if(null !=tjFlowingWater.getPaidIn()){
+ shouyi.add(tjFlowingWater.getPaidIn());
+ }
+
+ }
+ }
+ chartVo.setBoysNum(boys);
+ chartVo.setGirlsNum(girls);
+ chartVo.setPersonNum(person);
+ chartVo.setTuanDuiNum(tuan);
+ chartVo.setMoneysNum(shouyi);
+ return AjaxResult.success(chartVo);
+ }
+
+
+ @GetMapping("/getListByTjNumber")
+ @ApiOperation("鏍规嵁浣撴鍙蜂笅鐨勯」鐩垪琛�")
+ public AjaxResult getListByTjNumber(@RequestParam String tjNumber) {
+ LambdaQueryWrapper<TjOrderRemark> wq0 = new LambdaQueryWrapper<>();
+ wq0.eq(TjOrderRemark::getTjNumber, tjNumber);
+ List<TjOrderRemark> remarkList = remarkService.list(wq0);
+ return AjaxResult.success(remarkList);
+ }
+
+
}
--
Gitblit v1.8.0