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 | 14 ++++----------
1 files changed, 4 insertions(+), 10 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 86bb882..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
@@ -163,11 +163,6 @@
return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
}
}
-// if(cusIdcard.length()==9){
-// if (!MatchUtils.cardValidates(cusIdcard)) {
-// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
-// }
-// }
}
@@ -287,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());
@@ -318,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);
@@ -332,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);
}
--
Gitblit v1.8.0