From 2a85542341319a4085b04ec9a6a667be6ae799df Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 01 八月 2025 16:01:00 +0800
Subject: [PATCH] 弃检见附件以及主键医师不打印

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 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 4b108b7..855bbd2 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
@@ -282,8 +282,8 @@
                     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.setCusMarryStatus(String.valueOf(tjReservation.getMarriage())==null ?"0": tjReservation.getMarriage().toString());
+                    tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()) ==null ? "0": tjReservation.getNation().toString());
 
                     tjCustomer.setIdType(tjReservation.getIdType());
                     tjCustomer.setAge(tjReservation.getAge());
@@ -313,7 +313,7 @@
                                 String pationid = resultData.get("PationId").toString();
                                 if (null != pationid) {
                                     tjCustomer.setPationId(pationid);
-                                    tjCustomerService.save(tjCustomer);
+//                                    tjCustomerService.save(tjCustomer);
                                     //淇濆瓨娉ㄥ唽鍏ュ弬鍑哄弬
                                     resultData.put("cardId",pationid);
                                     JSONObject object4 = JSONUtil.parseObj(resultData);
@@ -327,14 +327,13 @@
                     } else if(null != s && s.equalsIgnoreCase("Y")) {
                         tjCustomer = isRequestCommonHisApi(tjCustomer);
                     }
-                    if(null != tjCustomer){
                         tjCustomerService.save(tjCustomer);
                         tjCustomer.setTeamNo(tjReservation.getTeamNo());
                         tjCustomer.setCompId(tjReservation.getCompanyId());
                         tjCustomer.setReservationId(tjReservation.getId());
                         tjCustomer.setDiscount(tjReservation.getDiscount());
                         tjCustomer.setGroupingId(tjReservation.getGroupingId());
-                    }
+
                     return success(tjCustomer);
                 }
 
@@ -456,7 +455,7 @@
     @PostMapping
     @ApiOperation(value = "鏂板瀹㈡埛")
     @Transactional
-//    @RepeatSubmit
+    @RepeatSubmit
     @Log(title = "鏂板瀹㈡埛淇℃伅", businessType = BusinessType.INSERT)
     public AjaxResult add(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄淇℃伅") TjCustomer tjCustomer) {
         if (null == tjCustomer.getCusIdcard() || null == tjCustomer.getCusPhone()) {

--
Gitblit v1.8.0