From d3f31d08b9f6f3cb028bb9380c3de4a933f615e6 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Mon, 30 Oct 2023 11:36:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xinelu-familydoctor/pom.xml                   |  4 ----
 .../impl/ResidentPatientInfoServiceImpl.java  | 21 +++++++------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/xinelu-familydoctor/pom.xml b/xinelu-familydoctor/pom.xml
index 2ed898b..d32f405 100644
--- a/xinelu-familydoctor/pom.xml
+++ b/xinelu-familydoctor/pom.xml
@@ -43,9 +43,5 @@
           <groupId>com.xinelu</groupId>
           <artifactId>xinelu-nurse-applet</artifactId>
       </dependency>
-    <dependency>
-      <groupId>com.xinelu</groupId>
-      <artifactId>xinelu-nurse-applet</artifactId>
-    </dependency>
   </dependencies>
 </project>
diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
index 67fae22..fce191d 100644
--- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
+++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
@@ -1,14 +1,8 @@
 package com.xinelu.familydoctor.applet.service.impl;
 
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
-
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.xinelu.applet.dto.appletlogin.AppletUserInfoDTO;
 import com.xinelu.common.config.AppletChatConfig;
-import com.xinelu.common.core.domain.R;
 import com.xinelu.common.entity.AppletPhoneVO;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.bean.BeanUtils;
@@ -33,6 +27,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 小程序注册Service业务层处理
@@ -165,8 +165,6 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
             PatientInfo patientInfo;
             // 修改
             if (!StringUtils.isBlank(body.getPatientCode())) {
-                PatientInfo patientInfo = residentPatientInfoMapper.getPatientInfoByPatientCode(body.getPatientCode());
-            if(!StringUtils.isBlank(body.getPatientCode())) {
                 patientInfo = residentPatientInfoMapper.getPatientInfoByPatientCode(body.getPatientCode());
                 if (ObjectUtils.isNotEmpty(patientInfo)) {
                     BeanUtils.copyBeanProp(patientInfo, body);
@@ -181,8 +179,6 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
                 // 注册
             } else {
                 // 获取当前微信绑定的居民
-                List<PatientInfo> list = residentPatientInfoMapper.getList(body.getOpenid(), null);
-                PatientInfo patientInfo = residentPatientInfoMapper.isRegisterByCardNo(body.getCardNo());
                 List<PatientInfo> list = residentPatientInfoMapper.getList(body.getOpenid(), body.getCityCode());
                 patientInfo = residentPatientInfoMapper.isRegisterByCardNo(body.getCardNo());
                 if (patientInfo == null) {
@@ -388,17 +384,16 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
     }
 
     /**
+     * @return com.xinelu.familydoctor.applet.pojo.entity.PatientInfo
      * @Author mengkuiliang
      * @Description 是否已注册
      * @Date 2023-10-11 011 10:46
      * @Param [code]
-     * @return com.xinelu.familydoctor.applet.pojo.entity.PatientInfo
      **/
     /*@Override
     public PatientInfo isRegistered(String code) {
         return getCurrentResident(getOpenId(code), null);
     }*/
-
     @Override
     public HashMap<String, String> login(String loginCode, String phoneCode) throws Exception {
         HashMap<String, String> HashMap = new HashMap<>();
@@ -436,4 +431,4 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
         HashMap.put("cityCode", cityCode);
         return HashMap;
     }
-}
+}
\ No newline at end of file