From 2e1fc763314f7231780c7d6e36fd6922548b285a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 04 六月 2025 18:16:52 +0800
Subject: [PATCH] zjh20250604
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 3 ++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 2 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java | 4 ++++
6 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
index c93615d..ea55332 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
@@ -283,10 +283,11 @@
ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(),ltkjExamJcsqd.getJcxmid());
boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
-
+ log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}",ltkjExamJcsqd.getJgzt());
if(StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())){
jcycxmService.deletedByTjh(order.getTjNumber());
String[] split = ltkjExamJcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
+ log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙栧垎鍓叉柟娉曚綋 ->{}->{}",order.getTjNumber(),split);
for (String jg : split) {
if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
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 19e1285..4cf674c 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
@@ -430,7 +430,7 @@
public void zongjianshengchengyichangxiangmu(String s, String yqbm) {
TjOrder order = orderService.getOrderByTjNum(s);
- jcycxmService.deletedByTjh(order.getCardId());
+ jcycxmService.deletedByTjh(s);
List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
if(null !=list && !list.isEmpty()){
for (LtkjExamJcsqd jcsqd : list) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index faa6972..69cd4cd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -245,9 +245,11 @@
tjFlowingWater.setIsAddition("Y");
if (tjFlowingWater.getPayStasus().toString().equals("0")) {
tjFlowingWater.setPayStasus(0L);
+ tjFlowingWater.setZfgf(tjFlowingWater.getPayStasus().toString());
} else {
tjFlowingWater.setPayStasus(1L);
}
+ tjFlowingWater.setZfgf(tjFlowingWater.getPayStasus().toString());
if (tjFlowingWaterService.save(tjFlowingWater)) {
Date dates = new Date();
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 6cf1d4b..1f6585d 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
@@ -1430,7 +1430,7 @@
else hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
}
} catch (Exception e) {
- log.error(String.valueOf(e),e.getMessage());
+ log.error("鍙戠敓閿欒 ->{}"+String.valueOf(e),e.getMessage());
throw new IllegalStateException();
}
return AjaxResult.success(tjNumber);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
index dc93f04..e9cf4b4 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
@@ -180,6 +180,10 @@
@ApiModelProperty(value = "鍔犻」鏍囧織")
private String jxbz;
+
+ @ApiModelProperty(value = "鑷垂宸ヨ垂")
+ private String zfgf;
+
/**
* 鏀惰垂id
*/
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
index e2dbf3e..3a4d61f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
@@ -111,7 +111,7 @@
List<Map<String ,Object >> getCusInfoListByCardAndName(@Param("card") String card,@Param("name") String name);
- @Select("SELECT IF(b.cus_sex=0,'鐢�','濂�') xb FROM tj_order a JOIN tj_customer b ON b.cus_id=a.user_id \n" +
+ @Select("SELECT IF(b.cus_sex=0,'0','1') xb FROM tj_order a JOIN tj_customer b ON b.cus_id=a.user_id \n" +
"WHERE a.tj_number=#{tjNumber}")
String getSexByTjh(String tjNumber);
}
--
Gitblit v1.8.0