From 3a991e8dedbb748b0623992485904cf29b110868 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 03 四月 2025 16:48:49 +0800
Subject: [PATCH] zjh20250403
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 164 +++++++++++++++++++++++++++---------------------------
1 files changed, 83 insertions(+), 81 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 869a18e..08262d2 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
@@ -964,92 +964,94 @@
@ApiOperation("鎻愪氦璇ョ瀹や笅瀹㈡埛浣撴缁撴灉鎺ュ彛")
@Transactional
public AjaxResult addRemark(@ApiParam(value = "浣撴鐖堕」鐩娉ㄩ泦鍚�") @RequestBody List<TjOrderRemark> remarklList) {
- Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
- SysUser sysUser = userService.getById(userId);
- if (remarklList == null || remarklList.isEmpty()) {
- return AjaxResult.success("鎿嶄綔澶辫触");
- }
- for (TjOrderRemark orderRemark : remarklList) {
- List<String> summaryList = orderRemark.getSummaryList();
- if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
- orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
- } else {
- orderRemark.setSummary(null);
+ try {
+ Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
+ SysUser sysUser = userService.getById(userId);
+ if (remarklList == null || remarklList.isEmpty()) {
+ return AjaxResult.success("鎿嶄綔澶辫触");
}
- if (StringUtils.isBlank(orderRemark.getRemark())) orderRemark.setRemark(null);
- LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
- qw.eq(TjOrder::getTjNumber, orderRemark.getTjNumber());
- TjOrder order = orderService.getOne(qw);
- orderRemark.setDeptId(sysUser.getDeptId());
- if (orderRemark.getDoctorName() == null) {
- orderRemark.setDoctorName(String.valueOf(sysUser.getUserId()));
- }
- List<TjOrderDetail> tjOrderDetailList = orderRemark.getTjOrderDetailList();
-
-// 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);
-// }
-// }
-// }
- asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order,orderRemark);
- LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
- qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
- qww.eq(TjOrderDetail::getProId, orderRemark.getProId());
- TjOrderDetail detail = detailService.getOne(qww);
- detail.setTjStatus(1L);
- detailService.updateById(detail);
- orderRemark.setType(1);
- LambdaQueryWrapper<TjOrderRemark> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrderRemark::getTjNumber, orderRemark.getTjNumber());
- wq1.eq(TjOrderRemark::getProId, orderRemark.getProId());
- TjOrderRemark one = remarkService.getOne(wq1);
- if (one == null) {
- TjOrderRemark remark = new TjOrderRemark();
- BeanUtils.copyBeanProp(orderRemark, remark);
- remarkService.save(remark);
+ for (TjOrderRemark orderRemark : remarklList) {
+ List<String> summaryList = orderRemark.getSummaryList();
+ if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
+ orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
} else {
- one.setRemark(orderRemark.getRemark());
- if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
- one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
- } else {
- one.setSummary(null);
- }
- one.setDoctorName(orderRemark.getDoctorName());
- one.setType(1);
- remarkService.updateById(one);
+ orderRemark.setSummary(null);
}
- asyncService.updateCheckType(orderRemark.getTjNumber());
- asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(), null, String.valueOf(orderRemark.getProId()));
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ if (StringUtils.isBlank(orderRemark.getRemark())) orderRemark.setRemark(null);
+ TjOrder order = orderService.getOrderByTjNum(orderRemark.getTjNumber());
+ if(null !=order && null !=order.getReportTime())return AjaxResult.error("璇ヤ汉鍛樻姤鍛婂凡鍑� 涓嶅彲淇敼");
+ orderRemark.setDeptId(sysUser.getDeptId());
+ if (orderRemark.getDoctorName() == null) {
+ orderRemark.setDoctorName(String.valueOf(sysUser.getUserId()));
+ }
+ List<TjOrderDetail> tjOrderDetailList = orderRemark.getTjOrderDetailList();
+
+ // 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);
+ // }
+ // }
+ // }
+ asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order,orderRemark);
+ LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
+ qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
+ qww.eq(TjOrderDetail::getProId, orderRemark.getProId());
+ TjOrderDetail detail = detailService.getOne(qww);
+ detail.setTjStatus(1L);
+ detailService.updateById(detail);
+ orderRemark.setType(1);
+ LambdaQueryWrapper<TjOrderRemark> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjOrderRemark::getTjNumber, orderRemark.getTjNumber());
+ wq1.eq(TjOrderRemark::getProId, orderRemark.getProId());
+ TjOrderRemark one = remarkService.getOne(wq1);
+ if (one == null) {
+ TjOrderRemark remark = new TjOrderRemark();
+ BeanUtils.copyBeanProp(orderRemark, remark);
+ remarkService.save(remark);
+ } else {
+ one.setRemark(orderRemark.getRemark());
+ if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
+ one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
+ } else {
+ one.setSummary(null);
+ }
+ one.setDoctorName(orderRemark.getDoctorName());
+ one.setType(1);
+ remarkService.updateById(one);
+ }
+ asyncService.updateCheckType(orderRemark.getTjNumber());
+ asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(), null, String.valueOf(orderRemark.getProId()));
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
+ }
}
-// asyncService.updateCheckType(orderRemark.getTjNumber());
-// asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
+ remarkService.tjYishengjianchajianyi(null, null, null, null);
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
+ } catch (NumberFormatException e) {
+ log.error(e.getMessage());
+ throw new RuntimeException(e);
}
- remarkService.tjYishengjianchajianyi(null, null, null, null);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
}
/**
--
Gitblit v1.8.0