From a2d12d52275c9fc34277d3e41c662a5ea9fb597f Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 24 一月 2024 10:11:44 +0800
Subject: [PATCH] 报告合并判断心电图和附件

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 9b89654..3007a46 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
@@ -80,7 +80,6 @@
     public AjaxResult getInfoByIdCard(@RequestParam @ApiParam(value = "瀹㈡埛韬唤璇佸彿") String cusIdcard) {
         if (!"".equals(cusIdcard) && cusIdcard != null) {
             //鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝g‘
-            // TODO: 2023/2/10  鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝g‘
 //            if(cusIdcard.length()==18){
 //                if (! MatchUtils.isIdCard(cusIdcard)) {
 //                    return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
@@ -293,9 +292,10 @@
         if(null !=tjCustomer.getIdType()){
             if(tjCustomer.getIdType().equals("1")){
                 b = MatchUtils.isIdCard(cusIdcard);
-            }else {
-                b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType());
             }
+//            else {
+//                b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType());
+//            }
         }else {
             return AjaxResult.error("璇烽�夋嫨璇佷欢绫诲瀷");
         }
@@ -320,7 +320,9 @@
         String substring = cusIdcard.substring(cusIdcard.length() - 6);
         substring = DigestUtils.md5DigestAsHex(substring.getBytes());
         tjCustomer.setCusPassword(substring);
-        tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
+        if(tjCustomer.getIdType().equals("1")){
+            tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
+        }
         tjCustomer.setCusNumber(0L);
         if (tjCustomerService.save(tjCustomer)) {
             return AjaxResult.success(tjCustomer);

--
Gitblit v1.8.0