From 8b5f92972cf09ff0e52b5d15f44ba11e579a5928 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 05 六月 2025 16:27:16 +0800
Subject: [PATCH] 总价传递问题
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 284 +++++++++++++++++++++++++++-----------------------------
1 files changed, 135 insertions(+), 149 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 efc09dc..7d4d175 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,16 +1034,17 @@
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);
- if (null != tjReservation.getTeamNo() && tjOrder.getTjType().equals("1")) {
- tjOrder.setTjType("1");
- } else if (tjOrder.getTjType().equals("2")) {
- tjOrder.setTjType("2");
- }
+// if (null != tjReservation.getTeamNo() && tjOrder.getTjType().equals("1")) {
+// tjOrder.setTjType("1");
+// } else if (tjOrder.getTjType().equals("2")) {
+// tjOrder.setTjType("2");
+// }
}
if (StringUtil.isBlank(tjOrder.getFirmId())) {
tjOrder.setFirmId("0");
@@ -1505,6 +1506,10 @@
List<TbTransition> list = tbTransitionService.list(wrapper);
BigDecimal zongjia = new BigDecimal("0.0");
+
+ String tjfhisxmbm = configService.selectConfigByKey("tjfhisxmbm");
+ String lycdzjhmxj = configService.selectConfigByKey("lycdzjhmxj");
+
for (TbTransition transition : list) {
LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(TjProject::getProId, transition.getProId());
@@ -1529,7 +1534,25 @@
array.add(obj);
zongjia = zongjia.add(allPrice);
}
- map.put("feiYongInfoList", array);
+
+ if(StringUtil.isNotBlank(lycdzjhmxj) && lycdzjhmxj.equalsIgnoreCase("N")){
+ map.put("feiYongInfoList", array);
+ }else {
+ zongjia = tjFlowingWater.getPaidIn();
+ JSONArray zjarray = JSONUtil.createArray();
+ JSONObject obj = JSONUtil.createObj();
+ int sl = 1;
+ obj.putOpt("danJia", zongjia);
+ obj.putOpt("jieSuanJe", zongjia);
+ obj.putOpt("shuliang", sl);
+ obj.putOpt("zhiXingKs", "100");
+ obj.putOpt("zhiXingKsMc","浣撴涓績");
+ obj.putOpt("shouFeiXmId", tjfhisxmbm);
+ obj.putOpt("shouFeiXmMc", "浣撴璐�");
+ zjarray.add(obj);
+ map.put("feiYongInfoList", zjarray);
+ }
+
log.info("璋冪敤His鎺ュ彛鍓� 鏀惰垂鎬讳环:{}", zongjia.toString());
String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
@@ -1672,12 +1695,17 @@
if (null != cusIds && !cusIds.isEmpty()) {
ExecutorService threadPools = Executors.newFixedThreadPool(cusIds.size());
for (String cusId : cusIds) {
- threadPools.execute(new Runnable() {
- @Override
- public void run() {
- getAjaxResults(cusId);
- }
- });
+
+// threadPools.execute(new Runnable() {
+// @Override
+// public void run() {
+ try {
+ getAjaxResults(cusId);
+ } catch (Exception e) {
+
+ }
+// }
+// });
}
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.in(TjCustomer::getCusIdcard, cusIds);
@@ -1723,72 +1751,17 @@
}
// TODO 鍥犱负鏈変綋妫�鍙蜂細鏌ュ嚭绌烘暟鎹� 鍏堜娇鐢ㄦ鏁版嵁 鎵撳嵃瀵艰瘖鍗�
if (!tjNumbers.isEmpty()) {
- /* Map<String, Object> map = null;
- try {
- map = PDFDocumentUtil.getDocument();
- Document document = (Document) map.get("document");
-// for (int i = 0; i < tjNumbers.size(); i++) {
- int i = 0;
- for (String tjNumber : tjNumbers) {
- try {
- List<Map<String, Object>> djdInfos = tjOrderService.selectDjdInfo(tjNumber);
- Map<String, Object> userInfo = tjOrderService.selectDjdUserInfo(tjNumber);
- if(null !=userInfo && null !=djdInfos && !djdInfos.isEmpty()){
- LocalDateTime tjsj = (LocalDateTime) userInfo.get("tjsj");
- DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
- String time = null;
- if (tjsj != null) {
- time = dateFormat.format(tjsj);
- }
- PDFDocumentUtil.makeUserInfoTable(document, (String) userInfo.get("tjname"), (String) userInfo.get("sex")
- , (String) userInfo.get("tjh"), (String) userInfo.get("lxdh"), (String) userInfo.get("tjname"), time);
- PDFDocumentUtil.makeTjInfo(document, djdInfos);
- // 澶氭潯鍒欐崲椤�
- if (i + 1 < tjNumbers.size()) {
- document.newPage();
- }
- }
-
- } catch (DocumentException | IOException e) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- //杩欓噷鍒犻櫎鐨勬槸杩欎釜浜烘墍鏈夐」鐩寘鎷ˉ褰曢」鐩�
- TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
- tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
- tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
- remarkService.deletedOrderRemarkByTjNum(tjNumber);
- tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
-// transitionService.deletedTbTransitionByTjNum(tjNum);
- tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
-
- TjReservation reservation = tjReservationService.getById(order.getReservationId());
- if(null !=reservation){
- reservation.setIsExpire(2);
- tjReservationService.updateById(reservation);
- transitionService.updateTbTransitionByTjNum(tjNumber);
- }
- e.printStackTrace();
- }
- }
-
-// }
- document.close();
- ByteArrayOutputStream outputStream = (ByteArrayOutputStream) map.get("stream");
- String encodeToString = java.util.Base64.getEncoder().encodeToString(outputStream.toByteArray());
- return AjaxResult.success().put("file", encodeToString);
- } catch (IOException | DocumentException e) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- e.printStackTrace();
- }*/
Map<String,Object> map=new HashMap<>();
map.put("tjh",tjNumbers);
return AjaxResult.success("鎿嶄綔鎴愬姛",map);
}
+
if (!errTjh.isEmpty()){
Map<String,Object> map=new HashMap<>();
map.put("errtjh",errTjh);
return AjaxResult.success("浠ヤ笂浜哄憳绛惧埌澶辫触",map);
}
- return AjaxResult.success();
+ return AjaxResult.error();
}
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error();
@@ -1867,51 +1840,59 @@
tjReservationService.updateById(tjReservation);
// return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
}*/
- LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
- qw.eq(TjCustomer::getCusIdcard, cusIdcard);
- TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
- if (tjCustomer1 != null) {
- tjCustomer1.setTjType(tjReservation.getTjType());
- tjCustomer1.setCusName(tjReservation.getName());
- tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
- tjCustomer1.setCusBrithday(tjReservation.getBirthday());
- tjCustomer1.setCusPhone(tjReservation.getPhoe());
- tjCustomer1.setCusEmail(tjReservation.getEmail());
- tjCustomer1.setCusAddr(tjReservation.getAddress());
- tjCustomer1.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
- tjCustomer1.setCusNational(String.valueOf(tjReservation.getNation()));
- tjCustomer1.setIdType(tjReservation.getIdType());
- tjCustomer1.setAge(tjReservation.getAge());
- tjCustomer1.setAgeUnit(tjReservation.getAgeUnit());
- tjCustomer1.setCareer(tjReservation.getCareer());
- tjCustomerService.updateById(tjCustomer1);
- } else {
- TjCustomer tjCustomer = new TjCustomer();
- tjCustomer.setCusIdcard(tjReservation.getIdCard());
- tjCustomer.setCusName(tjReservation.getName());
- tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
- tjCustomer.setCusBrithday(tjReservation.getBirthday());
- tjCustomer.setCusPhone(tjReservation.getPhoe());
- tjCustomer.setCusEmail(tjReservation.getEmail());
- tjCustomer.setCusAddr(tjReservation.getAddress());
- tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
- tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
- tjCustomer.setIdType(tjReservation.getIdType());
- tjCustomer.setAge(tjReservation.getAge());
- tjCustomer.setAgeUnit(tjReservation.getAgeUnit());
- tjCustomer.setCareer(tjReservation.getCareer());
- tjCustomer.setDwPhone(tjReservation.getDwPhone());
- tjCustomer.setCardId(tjReservation.getCardId());
- tjCustomer.setIndexCard(tjReservation.getIndexCard());
- //鎴彇瀵嗙爜鑷姩鐢熸垚set杩涘幓
- String substring = cusIdcard.substring(cusIdcard.length() - 6);
- substring = DigestUtils.md5DigestAsHex(substring.getBytes());
- tjCustomer.setCusPassword(substring);
- tjCustomer.setTjType(tjReservation.getTjType());
- tjCustomerService.save(tjCustomer);
+ try {
+ LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
+ qw.eq(TjCustomer::getCusIdcard, cusIdcard);
+ TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
+ if (tjCustomer1 != null) {
+ tjCustomer1.setTjType(tjReservation.getTjType());
+ tjCustomer1.setCusName(tjReservation.getName());
+ tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
+ tjCustomer1.setCusBrithday(tjReservation.getBirthday());
+ tjCustomer1.setCusPhone(tjReservation.getPhoe());
+ tjCustomer1.setCusEmail(tjReservation.getEmail());
+ tjCustomer1.setCusAddr(tjReservation.getAddress());
+ tjCustomer1.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
+ tjCustomer1.setCusNational(String.valueOf(tjReservation.getNation()));
+ tjCustomer1.setIdType(tjReservation.getIdType());
+ tjCustomer1.setAge(tjReservation.getAge());
+ tjCustomer1.setAgeUnit(tjReservation.getAgeUnit());
+ tjCustomer1.setCareer(tjReservation.getCareer());
+ tjCustomerService.updateById(tjCustomer1);
+ } else {
+ TjCustomer tjCustomer = new TjCustomer();
+ tjCustomer.setCusIdcard(tjReservation.getIdCard());
+ tjCustomer.setCusName(tjReservation.getName());
+ tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
+ tjCustomer.setCusBrithday(tjReservation.getBirthday());
+ tjCustomer.setCusPhone(tjReservation.getPhoe());
+ tjCustomer.setCusEmail(tjReservation.getEmail());
+ tjCustomer.setCusAddr(tjReservation.getAddress());
+ tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
+ tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
+ tjCustomer.setIdType(tjReservation.getIdType());
+ tjCustomer.setAge(tjReservation.getAge());
+ tjCustomer.setAgeUnit(tjReservation.getAgeUnit());
+ tjCustomer.setCareer(tjReservation.getCareer());
+ tjCustomer.setDwPhone(tjReservation.getDwPhone());
+ tjCustomer.setCardId(tjReservation.getCardId());
+ tjCustomer.setIndexCard(tjReservation.getIndexCard());
+ //鎴彇瀵嗙爜鑷姩鐢熸垚set杩涘幓
+ String substring = cusIdcard.substring(cusIdcard.length() - 6);
+ substring = DigestUtils.md5DigestAsHex(substring.getBytes());
+ tjCustomer.setCusPassword(substring);
+ tjCustomer.setTjType(tjReservation.getTjType());
+ tjCustomerService.save(tjCustomer);
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
}
+ }else {
+ throw new RuntimeException();
}
+ }else {
+ throw new RuntimeException();
}
}
@@ -2004,7 +1985,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;
@@ -2248,9 +2229,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()));
}
}
@@ -3120,9 +3103,9 @@
TjReport tjReport = new TjReport();
tjReport.setTjNumber(String.valueOf(tjNumber));
tjReport.setPath(urlValue + outputFileName1);
- String outputPath1 = value + File.separator;
- String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
- tjReport.setReport(pdfBinary);
+// String outputPath1 = value + File.separator;
+// String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
+// tjReport.setReport(pdfBinary);
tjReport.setType("浣撴鎶ュ憡");
tjReport.setPrint("pdf");
tjReportService.save(tjReport);
@@ -3253,13 +3236,14 @@
TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
if (null != order) {
-// String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
-// if (null != payByTjNum) {
-// return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
-// }
+
if (null != order.getFinishTime()) return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲鎾ら攢!!!");
Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
+ String username = SecurityUtils.getUsername();
+ LambdaQueryWrapper<TjCustomer> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjCustomer::getCusId, order.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wrapper);
String s = configService.selectConfigByKey("is_request_common_his_api");
// if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
@@ -3273,9 +3257,7 @@
wrapper1.eq(TjFlowingWater::getOrderId, order.getOrderId());
wrapper1.orderByDesc(TjFlowingWater::getJxbz);
List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1);
- LambdaQueryWrapper<TjCustomer> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjCustomer::getCusId, order.getUserId());
- TjCustomer tjCustomer = tjCustomerService.getOne(wrapper);
+
for (TjFlowingWater water : list) {
if (water.getPayStasus() == 0L) {
@@ -3285,11 +3267,18 @@
}
}
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴峰嵆灏嗘挙閿� 浣撴鍙蜂负:"+tjNum+" 鐨勪綋妫�璁板綍;" );
AjaxResult error = zuofeiWeiZhifu(weizhifu, tjCustomer, apiUrl, hospbm, order, true, tjNum);
- if (error != null && !error.get("code").toString().equals("200")) return error;
-
+ if (error != null && !error.get("code").toString().equals("200")){
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴锋鍦ㄦ挙閿� 浣撴鍙蜂负:"+tjNum+" 骞朵笖鏈敮浠樼殑浣撴璁板綍;" );
+ return error;
+ }
AjaxResult error1 = zuofeiYiZhifu(yizhifu, tjCustomer, order, apiUrl, hospbm, false, tjNum);
- if (error1 != null && !error.get("code").toString().equals("200")) return error1;
+ if (error1 != null && !error.get("code").toString().equals("200"))
+ {
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴锋鍦ㄦ挙閿� 浣撴鍙蜂负:"+tjNum+" 骞朵笖宸叉敮浠樼殑浣撴璁板綍;" );
+ return error1;
+ }
} else {
tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
@@ -3297,10 +3286,8 @@
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(tjNum);
ycxmService.delOrderYcXmJyByTjh(tjNum);
-
- TjCustomer customer = tjCustomerService.getById(order.getUserId());
- customer.setCardId("0");
- tjCustomerService.updateById(customer);
+ tjCustomer.setCardId("0");
+ tjCustomerService.updateById(tjCustomer);
xdPictureService.deleteTjXdPictureBytjNum(tjNum);
tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId());
}
@@ -3510,11 +3497,9 @@
public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ String username = SecurityUtils.getUsername();
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴峰嵆灏嗗己鍒舵挙閿� 浣撴鍙蜂负:"+tjNum+" 鐨勪綋妫�璁板綍;" );
if (null != order) {
-// String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
-// if (null != payByTjNum) {
-// return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
-// }
//杩欓噷鍒犻櫎鐨勬槸杩欎釜浜烘墍鏈夐」鐩寘鎷ˉ褰曢」鐩�
tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
@@ -3572,7 +3557,10 @@
}
TjOrder order = tjOrderService.getOrderByTjNum(dto.getTjh());
+ String username = SecurityUtils.getUsername();
if (null != order) {
+
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴峰嵆灏嗘挙閿� 浣撴鍙蜂负:"+dto.getTjh()+"琛ュ綍鍗曞彿涓�: " + dto.getBldhs()+ " 鐨� 琛ュ綍浣撴璁板綍;" );
String configByKey = configService.selectConfigByKey("sfkqdyhis");
if (null != configByKey && configByKey.equals("Y")) {
log.info("dto鐨勬暟鎹槸" + JSONUtil.toJsonStr(dto));
@@ -3634,10 +3622,18 @@
wrapper.eq(TjCustomer::getCusId, order.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wrapper);
AjaxResult error = zuofeiWeiZhifu(weizhifu, tjCustomer, apiUrl, hospbm, order, true, dto.getTjh());
- if (error != null && !error.get("code").toString().equals("200")) return error;
+ if (error != null && !error.get("code").toString().equals("200"))
+ {
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴锋鍦ㄦ挙閿� 浣撴鍙蜂负:"+dto.getTjh()+"琛ュ綍鍗曞彿涓�: " + dto.getBldhs()+ " 骞朵笖鏈敮浠樼殑琛ュ綍浣撴璁板綍;" );
+ return error;
+ }
AjaxResult error1 = zuofeiYiZhifu(yizhifu, tjCustomer, order, apiUrl, hospbm, false, dto.getTjh());
- if (error1 != null && !error.get("code").toString().equals("200")) return error1;
+ if (error1 != null && !error.get("code").toString().equals("200"))
+ {
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴锋鍦ㄦ挙閿� 浣撴鍙蜂负:"+dto.getTjh()+"琛ュ綍鍗曞彿涓�: " + dto.getBldhs()+ " 骞朵笖宸叉敮浠樼殑琛ュ綍浣撴璁板綍;" );
+ return error1;
+ }
return AjaxResult.success();
} else {
try {
@@ -3993,16 +3989,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