From 12614448a0e4c9521cc9d99cc56f4b453705c48c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 03 七月 2025 18:19:36 +0800
Subject: [PATCH] zjh20250703
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 03a6400..491498e 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
@@ -181,7 +181,7 @@
ksproList = projectService.getKsTjProjectIdList();
}
- if (ksproList == null || ksproList.size() == 0) {
+ if (ksproList == null || ksproList.isEmpty()) {
return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
}
List<TjCustomer> customerLis = new ArrayList<>();
@@ -545,7 +545,7 @@
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjOrder::getUserId, cusId);
List<TjOrder> orderList = orderService.list(wq1);
- if (null != orderList && orderList.size() > 0) {
+ if (null != orderList && !orderList.isEmpty()) {
List<TjOrder> orderList0 = new ArrayList<>();
for (TjOrder tjOrder : orderList) {
LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
@@ -822,8 +822,10 @@
@ApiOperation(value = "鍖荤敓鐐瑰嚮浣撴淇℃伅璇︽儏(鍙樉绀虹埗椤圭洰鍒楄〃)")
// 淇敼鎸夌収绉戝鏌ヨ
public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber,
- @ApiParam(value = "宸叉鏈鐘舵�� 0 鏈 1宸叉") @RequestParam Integer type) {
+ @ApiParam(value = "宸叉鏈鐘舵�� 0 鏈 1宸叉") @RequestParam(required = false) Integer type) {
+ if(type == null)type= 0;
String userId = SecurityUtils.getLoginUser().getUserId();
+ log.info("褰撳墠鐧诲綍鐢ㄦ埛ID ->{}",userId);
Integer ksId = null;
SysUser sysUser = null;
if (null != userId) {
@@ -853,12 +855,14 @@
if (configByKey.equals("Y")) {
HashMap<String, Object> hisRequestParams = new HashMap<>();
// 涓嶅湪闇�瑕佽韩浠借瘉鍙�
- hisRequestParams.put("patientId", tjOrder.getCardId());
+ hisRequestParams.put("patientId", tjOrder.getCardId());
log.info("ltkj--- " + DateUtil.date() + "鎿嶄綔浜篿d: " + userId + "鎿嶄綔绉戝: " + sysUser.getDeptId() + "鎿嶄綔鐨勪綋妫�浜�: " + tjNumber);
AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
- if (sfsf > 0) {
+ int sfsf1 = ltkjJianchajianyanTreeService.getCallSfsfByCardId(tjOrder.getCardId());
+ log.info("瀛樺偍杩囩▼杩斿洖鐨勬槸: " + sfsf1 + " 浠ｇ爜杩斿洖鐨勬槸 " + sfsf);
+ if (sfsf1 > 0) {
log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� " + sfsf);
log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
@@ -896,6 +900,7 @@
}
}
}
+ log.info("type ->{},鏌ヨ鍏宠仈绉戝闆嗗悎 ->{}",type,split);
List<TjOrderRemark> list;
if(null != sysUser && sysUser.getUserName().equals("10001")){
if(type !=1){
@@ -911,6 +916,7 @@
}
}
if (null ==list || list.isEmpty()) {
+ log.info("瑙﹀彂璇ョ瀹や笅鏃犻」鐩�");
return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
}
for (TjOrderRemark tjOrderRemark : list) {
--
Gitblit v1.8.0