From a3da2a6fe70e9514638ea4700c4bb2b61ecbc317 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 22 五月 2025 16:50:55 +0800
Subject: [PATCH] zjh20250522
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
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 a303366..ccca65b 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
@@ -144,8 +144,8 @@
private ITbTransitionService transitionService;
@Resource
private ISysConfigService configService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
@Resource
private ITjOrderRemarkService remarkService;
@Resource
@@ -1034,8 +1034,9 @@
if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
if (null != tjReservation.getTjCategory()) tjOrder.setTjCategory(tjReservation.getTjCategory());
if (null != tjReservation.getGroupingId()) {
+ TjDwGrouping dwGrouping = dwGroupingService.getById(tjReservation.getGroupingId());
tjOrder.setGroupId(tjReservation.getGroupingId());
- tjOrder.setFirmDeptId(tjReservation.getPacId());
+ tjOrder.setFirmDeptId(dwGrouping.getDwDeptId());
}
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
@@ -1962,7 +1963,7 @@
//鑾峰彇鎷兼帴鍓嶇紑
String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
// String tjNumber = (sysUser.getUserName() + idUtils.getTjNumber());
- String tjNumber = idUtils.getTjNumber();
+ String tjNumber = idUtils.getNewTjNumberRedisLockAndMysql();
if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
@@ -2206,9 +2207,11 @@
transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
//琛ュ樊浠�
- List<Map<String, Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId.toString(), cusId);
+ List<Map<String, Object>> cjMaps = transitionService.addTbhuoquxiangmuchajia(pacId.toString(), cusId);
if (null != cjMaps && !cjMaps.isEmpty()) {
+ log.info("璇ュ椁�"+pacId+"涓湁宸环:"+cjMaps.size()+"涓�");
for (Map<String, Object> cjMap : cjMaps) {
+ log.info("娣诲姞涓存椂琛ㄥ椁愭暟鎹椂鎵�閫夌殑宸环涓�:"+ cjMap.get("cj").toString());
transitionService.buxiangmuchajia(cusId, pacId.toString(), cjMap.get("xmid").toString(), new BigDecimal(cjMap.get("cj").toString()));
}
}
@@ -3078,7 +3081,7 @@
TjReport tjReport = new TjReport();
tjReport.setTjNumber(String.valueOf(tjNumber));
tjReport.setPath(urlValue + outputFileName1);
- String outputPath1 = value + File.separator;
+// String outputPath1 = value + File.separator;
// String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
// tjReport.setReport(pdfBinary);
tjReport.setType("浣撴鎶ュ憡");
@@ -3951,16 +3954,6 @@
@GetMapping(value = "newgetTransitionList")
@ApiOperation(value = "鏈�鏂版煡璇㈣繃娓¤〃鏁版嵁")
public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) {
-// String pacId = transitionService.getTbTransitionPacId(cusId);
-// if(StringUtil.isNotBlank(pacId)){
-// //琛ュ樊浠�
-// List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId, cusId);
-// if(null !=cjMaps && !cjMaps.isEmpty()){
-// for (Map<String, Object> cjMap : cjMaps) {
-// transitionService.buxiangmuchajia(cusId,pacId,cjMap.get("xmid").toString(),new BigDecimal(cjMap.get("cj").toString()));
-// }
-// }
-// }
List<TbTransition> list = transitionService.newgetTransitionList(cusId);
return AjaxResult.success(list);
}
--
Gitblit v1.8.0