From 99d28bddd6ad5bd7c87babf7dcab670215993cb6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 03 七月 2025 13:51:36 +0800
Subject: [PATCH] zjh20250703
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 6 +++---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 40 +++++++++++++++++++++-------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 5 ++++-
ltkj-framework/src/main/java/com/ltkj/framework/web/exception/GlobalExceptionHandler.java | 6 +++---
4 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index e7a3bd5..87a916b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -440,25 +440,27 @@
public void zongjianshengchengyichangxiangmu(String s, String yqbm) {
TjOrder order = orderService.getOrderByTjNum(s);
- jcycxmService.deletedByTjh(s);
- List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
- if(null !=list && !list.isEmpty()){
- for (LtkjExamJcsqd jcsqd : list) {
- if(StringUtil.isNotBlank(jcsqd.getJgzt())){
- String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
- for (String jg : split) {
- if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
- && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏃犲紓甯�")
- && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
- TjJcycxm jcycxm=new TjJcycxm();
- jcycxm.setTjh(s);
- jcycxm.setYqid(yqbm);
- String[] split1 = jcsqd.getJcxmid().split(";");
- jcycxm.setProId(split1[0]);
- jcycxm.setProName(jcsqd.getJcxmmc());
- jcycxm.setCreateTime(new Date());
- jcycxm.setJcjg(jg);
- jcycxmService.save(jcycxm);
+ if(null != order){
+ jcycxmService.deletedByTjh(s);
+ List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
+ if(null !=list && !list.isEmpty()){
+ for (LtkjExamJcsqd jcsqd : list) {
+ if(StringUtil.isNotBlank(jcsqd.getJgzt())){
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
+ for (String jg : split) {
+ if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+ && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏃犲紓甯�")
+ && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
+ TjJcycxm jcycxm=new TjJcycxm();
+ jcycxm.setTjh(s);
+ jcycxm.setYqid(yqbm);
+ String[] split1 = jcsqd.getJcxmid().split(";");
+ jcycxm.setProId(split1[0]);
+ jcycxm.setProName(jcsqd.getJcxmmc());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ }
}
}
}
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 cc0e4dd..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
@@ -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<>();
@@ -855,14 +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());
int sfsf1 = ltkjJianchajianyanTreeService.getCallSfsfByCardId(tjOrder.getCardId());
log.info("瀛樺偍杩囩▼杩斿洖鐨勬槸: " + sfsf1 + " 浠ｇ爜杩斿洖鐨勬槸 " + sfsf);
- if (sfsf > 0 || sfsf1 > 0) {
+ if (sfsf1 > 0) {
log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� " + sfsf);
log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
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 5222178..a6a489d 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
@@ -1405,7 +1405,10 @@
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;
+ if (!ajaxResult.get("code").toString().equals("200")){
+ throw new IllegalStateException("鍥綋鐢宠鍗曞彂閫佸け璐�!" + result.get("msg").toString());
+// 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());
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/exception/GlobalExceptionHandler.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/exception/GlobalExceptionHandler.java
index 8f8e357..f5f4aaa 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/web/exception/GlobalExceptionHandler.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/exception/GlobalExceptionHandler.java
@@ -54,7 +54,7 @@
log.error(e.getMessage(), e);
Integer code = e.getCode();
return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
-// return AjaxResult.error("鏁版嵁澶勭悊寮傚父锛岃鑱旂郴绠＄悊鍛�!");
+// return AjaxResult.error("鏁版嵁姝ｅ湪鍔犺浇涓�, 璇风◢绛�!");
}
/**
@@ -64,7 +64,7 @@
public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
log.error("璇锋眰鍦板潃'{}',鍙戠敓鏈煡寮傚父.", requestURI, e);
- return AjaxResult.error("鏁版嵁澶勭悊寮傚父锛岃鑱旂郴绠＄悊鍛�!");
+ return AjaxResult.error("鏁版嵁姝ｅ湪鍔犺浇涓�, 璇风◢绛�!");
}
/**
@@ -74,7 +74,7 @@
public AjaxResult handleException(Exception e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
log.error("璇锋眰鍦板潃'{}',鍙戠敓绯荤粺寮傚父.", requestURI, e);
- return AjaxResult.error("鏁版嵁澶勭悊寮傚父锛岃鑱旂郴绠＄悊鍛�!");
+ return AjaxResult.error("鏁版嵁姝ｅ湪鍔犺浇涓�, 璇风◢绛�!");
}
/**
--
Gitblit v1.8.0