From 54d5ece5bca68e6f1f7b06536bb7f238e4b6cb8f Mon Sep 17 00:00:00 2001
From: cfl <chaifulai@163.com>
Date: Fri, 1 Dec 2023 11:44:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=EF=BC=8C=E4=BA=A7=E6=A3=80=E6=9C=AA=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E5=88=B0=E9=A2=84=E7=BA=A6=E6=95=B0=E6=8D=AEbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/RemoteController.java   | 30 +++++++++++++++++-----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
index 482bb2d..ef6dcaa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
@@ -107,18 +107,29 @@ public class RemoteController extends BaseController {
     @RequestMapping(value = "/bookArchive/history",method = RequestMethod.GET)
     @TokenRequired
     public void getBookArchive(HttpServletResponse response, String idCard,String cardNum,String phone, HttpServletRequest request){
-        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        ArchiveDataQuery query = new ArchiveDataQuery();
-        query.setIdCard(idCard);
-        query.setCardNum(cardNum);
-        query.setPhone(phone);
-
         if (StringUtils.isEmpty(idCard) && StringUtils.isEmpty(cardNum) && StringUtils.isEmpty(phone))
         {
             writeJson(response,"{\"errormsg\": \"参数为空\",\"errorcode\": 4097}");
             return;
         }
 
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        ArchiveDataQuery query = new ArchiveDataQuery();
+        //目前phone参数没有传
+        if(StringUtils.isNotEmpty(idCard)){
+            if(idCard.length() == 11 && idCard.startsWith("1")){
+                query.setPhone(idCard);
+            }else{
+                query.setIdCard(idCard);
+            }
+        }
+        //如果phone传了
+        if(StringUtils.isNotEmpty(phone)){
+            query.setPhone(phone);
+        }
+        query.setCardNum(cardNum);
+
+
         List<ArchiveData> list = archiveDataServicer.query(query.convertToQuery());
 
         if (CollectionUtils.isEmpty(list) && StringUtils.isNotEmpty(cardNum))
@@ -286,6 +297,13 @@ public class RemoteController extends BaseController {
         writeString(response,"success");
     }
 
+    /**
+     * 小程序预约直接建档
+     * @param response
+     * @param archiveUser
+     * @param healthResort
+     * @param archiveHistoryDTO
+     */
     @RequestMapping(value = "/confirmArchive",method = RequestMethod.POST)
     public void confirmArchive(HttpServletResponse response,
                                String archiveUser,
-- 
1.8.3.1