From e12b37ce15c67b522e94f399e3b8c18c2c0e7289 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期一, 25 十二月 2023 10:31:13 +0800
Subject: [PATCH] zjh 本地 2023/12/25 -2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index fbd986e..9b89654 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -5,7 +5,6 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.enums.DataSourceType;
-import com.ltkj.common.utils.bean.BeanUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.TjReservation;
@@ -15,23 +14,16 @@
import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
import com.ltkj.hosp.sqlDomain.LtkjTjPat;
import com.ltkj.system.service.ISysConfigService;
-import com.sun.xml.internal.bind.v2.TODO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.*;
-import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
-import com.ltkj.common.enums.BusinessType;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
-
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -64,6 +56,8 @@
private LtkjMiddleHeadService headService;
@Resource
private LtkjMiddleDetailService middleDetailService;
+ @Resource
+ private ITjOrderService tjOrderService;
@GetMapping("/newGetTjPat")
@ApiOperation(value = "鏌ヨhis鏁版嵁搴撹繑鍥炴柊鐨勬暟鎹�")
@@ -126,10 +120,13 @@
extracted(customer);
return success(customer);
}else {
- String cardId = tjCustomer.getCardId();
- // TODO: 2023/12/23 璇ュ鐢╟ardid鏌ヨorder琛ㄦ暟鎹�
- if(null !=cardId && cardId.equals(tjPatByIdCard.getFcardId())){
- return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
+ String cardId = tjPatByIdCard.getFcardId();
+ if(null !=cardId && !cardId.equals("0")){
+ int i = tjOrderService.selectTjOrderByCardId(cardId);
+ if(i>0){
+ return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
+ }
+
}
tjCustomer.setReservationId(tjCustomer.getCardId());
tjCustomer.setCardId(tjPatByIdCard.getFcardId());
--
Gitblit v1.8.0