From 7b248040f67265d54fb1a386f8e36a022ee22cee Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 24 十二月 2024 17:48:39 +0800
Subject: [PATCH] zjh202412024
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 56b7c3d..d9ca10e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1355,31 +1355,31 @@
final TjCustomer byId1 = customerService.getById(order.getUserId());
if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) {
//----------------------------------start
- for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
- final TjProject byId = projectService.getById(tjOrderDetail.getProId());
- //缁欑梾绉嶈褰曡〃瀛� 鏂逛究缁熻鐥呯鍜屽鎴蜂俊鎭箣闂寸殑鍏崇郴
- if (tjOrderDetail.getRulesList()!=null){
- for (TjRules tjRules : tjOrderDetail.getRulesList()) {
- TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
- orderDetailRules.setAid(tjRules.getAid());
- if (byId1!=null){
- orderDetailRules.setCusName(byId1.getCusName());
- orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
- orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
- orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
- }
- orderDetailRules.setBingzhong(tjRules.getBingzhong());
- orderDetailRules.setDoctorName(sysUser.getNickName());
- orderDetailRules.setTjNumber(order.getTjNumber());
- if (byId!=null){
- orderDetailRules.setProId(String.valueOf(byId.getProId()));
- orderDetailRules.setProName(byId.getProName());
- }
- orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
- tjOrderDetailRulesService.save(orderDetailRules);
- }
- }
- }
+// for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
+// final TjProject byId = projectService.getById(tjOrderDetail.getProId());
+// //缁欑梾绉嶈褰曡〃瀛� 鏂逛究缁熻鐥呯鍜屽鎴蜂俊鎭箣闂寸殑鍏崇郴
+// if (tjOrderDetail.getRulesList()!=null){
+// for (TjRules tjRules : tjOrderDetail.getRulesList()) {
+// TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
+// orderDetailRules.setAid(tjRules.getAid());
+// if (byId1!=null){
+// orderDetailRules.setCusName(byId1.getCusName());
+// orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
+// orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
+// orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
+// }
+// orderDetailRules.setBingzhong(tjRules.getBingzhong());
+// orderDetailRules.setDoctorName(sysUser.getNickName());
+// orderDetailRules.setTjNumber(order.getTjNumber());
+// if (byId!=null){
+// orderDetailRules.setProId(String.valueOf(byId.getProId()));
+// orderDetailRules.setProName(byId.getProName());
+// }
+// orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
+// tjOrderDetailRulesService.save(orderDetailRules);
+// }
+// }
+// }
asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order);
LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
@@ -1441,6 +1441,9 @@
String configByKey = configService.selectConfigByKey("sfkqdyhis");
// 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
+ if(null ==tjOrder){
+ return AjaxResult.error("鏈壘鍒颁綋妫�璁板綍");
+ }
LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
@@ -1524,7 +1527,7 @@
wq2.eq(TjProject::getNeedReport,"Y");
List<TjProject> Deptlist = projectService.list(wq2);
List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList());
- if (Deptlist.size() == 0 || proIdList.size() == 0) {
+ if (Deptlist.isEmpty() || proIdList.isEmpty()) {
return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
}
LambdaQueryWrapper<TjOrder> wqqq = new LambdaQueryWrapper<>();
--
Gitblit v1.8.0