From 3dec90c4e5b1b71a1af2bdd855fda1591b53bc88 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 17 十二月 2024 20:38:25 +0800
Subject: [PATCH] zjh202412017
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 16 +++++++++++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 9 +++------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java | 4 ++--
3 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index b7188ec..bd296ab 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1212,7 +1212,7 @@
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
-
+ Date date = new Date();
if (null != tjNumber) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -1224,17 +1224,14 @@
tjOrder.setCheckStatus(checkStatus);
tjOrder.setStatus(TjConstants.TJ_CHECK);
tjOrder.setCheckDoctor(sysUser.getNickName());
- tjOrder.setCheckTime(new Date());
+ tjOrder.setCheckTime(date);
tjOrder.setStatus(401);
+ tjOrder.setFinishTime(date);
if (orderService.updateById(tjOrder)) {
TjCustomer customer = customerService.getById(tjOrder.getUserId());
if (null != customer) {
customer.setCusNumber(customer.getCusNumber() + 1);
if (customerService.updateById(customer)) {
-// LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
-// wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
-// wqq.eq(TbTransition::getCardId, customer.getCardId());
-// transitionService.remove(wqq);
asyncService.updateCheckType(tjNumber);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 8027547..db9aef2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -471,7 +471,7 @@
order.setZt("鍦ㄦ");
orders.add(order);
}
- if (zt==2 && sfwc == 0) {
+ if (zt==2 && sfwc == 0 && order.getCheckStatus()==0 && order.getCheckTime()==null && order.getHeshouStatus()==0 && order.getPrintLastTime()==null) {
//宸插畬鎴�2
order.setZt("宸插畬鎴�");
orders.add(order);
@@ -520,15 +520,29 @@
if(null !=zt){
if(zt==3){
+ //宸插鏍�
wq.isNotNull(TjOrder::getCheckTime);
+ wq.eq(TjOrder::getCheckStatus,1);
+ wq.isNull(TjOrder::getHeshouTime);
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus,0);
}
if(zt==4){
+ //鐢熸垚鎶ュ憡
wq.isNotNull(TjOrder::getReportTime);
+ wq.isNull(TjOrder::getHeshouTime);
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus,0);
}
if(zt==5){
+ //鎶ュ憡鏍告敹
wq.eq(TjOrder::getHeshouStatus,1);
+ wq.isNull(TjOrder::getPrintLastTime);
}
if(zt==6){
+ //宸插嚭鎶ュ憡
+ wq.isNotNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus,1);
wq.isNotNull(TjOrder::getPrintLastTime);
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
index 2b67a4a..f5331c7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
@@ -229,7 +229,7 @@
wq.eq(TjRules::getProId, proId);
wq.lt(TjRules::getAgeLt, MatchUtils.getAgeByIdCard(byId.getCusIdcard()));
wq.gt(TjRules::getAgeGt, MatchUtils.getAgeByIdCard(byId.getCusIdcard()));
- wq.in(TjRules::getSex, 0, byId.getCusSex());
+// wq.in(TjRules::getSex, 0, byId.getCusSex());
final List<TjRules> list = tjRulesService.list(wq);
if (list==null){
return AjaxResult.success(res);
@@ -256,7 +256,7 @@
}
}
- if (res!=null && res.size() > 0) {
+ if (!res.isEmpty()) {
//寤鸿璧嬪��
for (TjRules re : res) {
LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();
--
Gitblit v1.8.0