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 +++++++++++-----------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 185 +++++++++++++++-----------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java | 16 +-
4 files changed, 200 insertions(+), 169 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java
index ca17cd5..b8cbecc 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java
@@ -188,7 +188,7 @@
map.put("date", sfxmList);
map.put("total", sfxms.size());
} else {
- map.put("date", 0);
+ map.put("date", null);
map.put("total", 0);
}
return AjaxResult.success(map);
@@ -209,7 +209,7 @@
map.put("date", sfxmList);
map.put("total", sfx.size());
} else {
- map.put("date", 0);
+ map.put("date", null);
map.put("total", 0);
}
return AjaxResult.success(map);
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("鎿嶄綔鎴愬姛");
}
/**
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 40d0ced..3017fe0 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
@@ -1069,6 +1069,7 @@
return result;
}
}catch (Exception e){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.error(String.valueOf(e));
}
finally {
@@ -1077,7 +1078,8 @@
return AjaxResult.error();
}
- @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED)
+// @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED)
+ @Transactional(propagation = Propagation.REQUIRED) // 鍏变韩浜嬪姟
public AjaxResult processOrderWithTransaction(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, MallOrder mallOrder, SysUser sysUser) {
//鑾峰彇鎷兼帴鍓嶇紑
@@ -1234,7 +1236,8 @@
hisApiMethod.ZfHisApiMethod(jzh.toString());
}
log.info("璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId());
- return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
+// return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
+ throw new IllegalStateException("鎸傚彿澶辫触!" + result.get("msg").toString());
}
log.info("璇ョ櫥璁颁汉鐨刪is灏辫瘖鍙锋槸: " + tjOrder.getCardId());
@@ -1249,30 +1252,35 @@
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
}*/
// 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
- if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
- log.info("璋冪敤his寮�鍚� 杩涘叆涓嶆敹璐规柟娉� 璇ヤ綋妫�浜哄憳涓嶆敹璐�:"+tjOrder.getTjNumber());
- // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
- tjFlowingWater.setPayStasus(1L);
- newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
- if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
- tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
- sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
- List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
- xdPictureService.saveBatch(xdPictureList);
- List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
- addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
- log.info("璋冪敤his寮�鍚� 杩涘叆涓嶆敹璐规柟娉� 璇ユ柟娉曟墽琛屽畬姣�");
- } else {
- log.info("璋冪敤his寮�鍚� 杩涘叆鏀惰垂鏂规硶 璇ヤ綋妫�浜哄憳涓嶆敹璐�:"+tjOrder.getTjNumber());
- newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
- addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
- String isUseMx = configService.selectConfigByKey("jcxhis_is_use_mx");
- if (isUseMx.equalsIgnoreCase("Y"))
- hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
- else hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ try {
+ if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ log.info("璋冪敤his寮�鍚� 杩涘叆涓嶆敹璐规柟娉� 璇ヤ綋妫�浜哄憳涓嶆敹璐�:"+tjOrder.getTjNumber());
+ // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
+ tjFlowingWater.setPayStasus(1L);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
+ if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+ log.info("璋冪敤his寮�鍚� 杩涘叆涓嶆敹璐规柟娉� 璇ユ柟娉曟墽琛屽畬姣�");
+ } else {
+ log.info("璋冪敤his寮�鍚� 杩涘叆鏀惰垂鏂规硶 璇ヤ綋妫�浜哄憳涓嶆敹璐�:"+tjOrder.getTjNumber());
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+ String isUseMx = configService.selectConfigByKey("jcxhis_is_use_mx");
+ if (isUseMx.equalsIgnoreCase("Y"))
+ hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ else hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ throw new IllegalStateException();
}
return AjaxResult.success(tjNumber);
} else {
@@ -1371,24 +1379,36 @@
log.info("绛惧埌鐧昏鎺ュ彛璇ヤ汉鍛�: "+tjOrder.getTjNumber()+" 鐨勪綋妫�绫诲瀷鏄�:"+tjOrder.getTjType());
if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
- log.info(tjOrder.getTjNumber()+"绛惧埌鐧昏杩涘叆鏈敹璐规柟娉�");
- // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
- tjFlowingWater.setPayStasus(1L);
- newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
- sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
- List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
- xdPictureService.saveBatch(xdPictureList);
- List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
- log.info(tjOrder.getTjNumber()+"绛惧埌鐧昏:閲囨牱鏁版嵁鏌ヨ涓暟"+detailList.size());
- addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
- return AjaxResult.success(tjNumber);
+ try {
+ log.info(tjOrder.getTjNumber()+"绛惧埌鐧昏杩涘叆鏈敹璐规柟娉�");
+ // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
+ tjFlowingWater.setPayStasus(1L);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ log.info(tjOrder.getTjNumber()+"绛惧埌鐧昏:閲囨牱鏁版嵁鏌ヨ涓暟"+detailList.size());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+ return AjaxResult.success(tjNumber);
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ throw new IllegalStateException(e);
+ }
} else {
- log.info(tjOrder.getTjNumber()+"else绛惧埌鐧昏杩涘叆鏀惰垂鏂规硶");
- newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- AjaxResult error = isRequestCommonHisApi(tjOrder, tjCustomer, tjFlowingWater);
- if (error != null) return error;
+ try {
+ log.info(tjOrder.getTjNumber()+"else绛惧埌鐧昏杩涘叆鏀惰垂鏂规硶");
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ isRequestCommonHisApi(tjOrder, tjCustomer, tjFlowingWater);
+ } catch (Exception e) {
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ log.error("processOrderWithTransaction 鏂规硶寮傚父"+e.getMessage());
+ throw new RuntimeException("璋冪敤鍏叡鏂规硶澶辫触 寮哄埗瑙﹀彂鍥炴粴");
+// return AjaxResult.error();
+ }
+// if (error != null) return error;
// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
// addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
}
@@ -1397,11 +1417,12 @@
// pacsApiMethodService.OrderAdd(tjCustomer,tjOrder);
// return AjaxResult.success(tjNumber);
}
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error();
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ throw new RuntimeException("浣撴璁板綍淇濆瓨澶辫触 寮哄埗瑙﹀彂鍥炴粴");
}
- private AjaxResult isRequestCommonHisApi(TjOrder tjOrder, TjCustomer tjCustomer, TjFlowingWater tjFlowingWater) {
+ @Transactional(propagation = Propagation.REQUIRED) // 鍏变韩浜嬪姟
+ public void isRequestCommonHisApi(TjOrder tjOrder, TjCustomer tjCustomer, TjFlowingWater tjFlowingWater) {
String s = configService.selectConfigByKey("is_request_common_his_api");
if (null != s && s.equals("Y")) {
String apiUrl = configService.selectConfigByKey("common_api_url");
@@ -1463,13 +1484,16 @@
}
tjFlowingWaterService.updateById(tjFlowingWater);
} else {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error();
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ log.error("isRequestCommonHisApi 鏂规硶寮傚父");
+ throw new RuntimeException("is_request_common_his_api 寮哄埗瑙﹀彂鍥炴粴");
+// return AjaxResult.error();
}
}
- return null;
+// return null;
}
+ @Transactional(propagation = Propagation.REQUIRED) // 鍏变韩浜嬪姟
public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser, String jxbz) {
try {
String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
@@ -2866,46 +2890,51 @@
}
+ @Transactional(propagation = Propagation.REQUIRED) // 鍏变韩浜嬪姟
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
- tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
- if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
- tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),
- String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId(), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- } else {
- tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
- }
+ try {
+ tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
+ tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),
+ String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId(), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ } else {
+ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
+ }
- tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
+ tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
- //娣诲姞remark琛ㄦ暟鎹�
- if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
- remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+ //娣诲姞remark琛ㄦ暟鎹�
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
+ remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
- } else {
- remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+ } else {
+ remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
- }
- //鍒ゆ柇鏄惁浜ら挶
- if ("1".equals(tjOrder.getTjType())) {
- if (null != tjReservation && tjReservation.getPayType() == 1) {
+ }
+ //鍒ゆ柇鏄惁浜ら挶
+ if ("1".equals(tjOrder.getTjType())) {
+ if (null != tjReservation && tjReservation.getPayType() == 1) {
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
+ }
+ }
+ if (tjFlowingWater.getPayStasus() == 1L) {
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
+ tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
+ tjFlowingWater.setPayType(4L);
+ tjFlowingWaterService.updateById(tjFlowingWater);
remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ // asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
xdPictureService.saveBatch(xdPictureList);
}
- }
- if (tjFlowingWater.getPayStasus() == 1L) {
- tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
- sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
- tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
- tjFlowingWater.setPayType(4L);
- tjFlowingWaterService.updateById(tjFlowingWater);
- remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
-// asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
- List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
- xdPictureService.saveBatch(xdPictureList);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
}
}
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 4271cb5..57093e0 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
@@ -83,14 +83,14 @@
}
wq.orderByAsc(TjRules::getSort);
List<TjRules> list = tjRulesService.list(wq);
- if (list != null) {
- for (TjRules rules : list) {
- LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjRuleAdvice::getBz, rules.getAid());
- final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1);
- rules.setRuleAdvices(list1);
- }
- }
+// if (list != null) {
+// for (TjRules rules : list) {
+// LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();
+// wq1.eq(TjRuleAdvice::getBz, rules.getAid());
+// final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1);
+// rules.setRuleAdvices(list1);
+// }
+// }
return getDataTable(list);
}
--
Gitblit v1.8.0