xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码合并

Browse Source
This commit is contained in:
zhangheng 2023-10-30 11:36:42 +08:00
parent c6d6eeeb19
commit d3f31d08b9
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xinelu-familydoctor/pom.xml
View File

@ -43,9 +43,5 @@
<groupId>com.xinelu</groupId> <groupId>com.xinelu</groupId>
<artifactId>xinelu-nurse-applet</artifactId> <artifactId>xinelu-nurse-applet</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.xinelu</groupId>
<artifactId>xinelu-nurse-applet</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

19
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
View File

@ -1,14 +1,8 @@
package com.xinelu.familydoctor.applet.service.impl; 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.JSON;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.xinelu.applet.dto.appletlogin.AppletUserInfoDTO;
import com.xinelu.common.config.AppletChatConfig; import com.xinelu.common.config.AppletChatConfig;
import com.xinelu.common.core.domain.R;
import com.xinelu.common.entity.AppletPhoneVO; import com.xinelu.common.entity.AppletPhoneVO;
import com.xinelu.common.exception.ServiceException; import com.xinelu.common.exception.ServiceException;
import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.common.utils.bean.BeanUtils;
@ -33,6 +27,12 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; 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业务层处理 * 小程序注册Service业务层处理
@ -164,8 +164,6 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
if (ObjectUtils.isNotEmpty(body.getCardNo())) { if (ObjectUtils.isNotEmpty(body.getCardNo())) {
PatientInfo patientInfo; PatientInfo patientInfo;
// 修改 // 修改
if (!StringUtils.isBlank(body.getPatientCode())) {
PatientInfo patientInfo = residentPatientInfoMapper.getPatientInfoByPatientCode(body.getPatientCode());
if (!StringUtils.isBlank(body.getPatientCode())) { if (!StringUtils.isBlank(body.getPatientCode())) {
patientInfo = residentPatientInfoMapper.getPatientInfoByPatientCode(body.getPatientCode()); patientInfo = residentPatientInfoMapper.getPatientInfoByPatientCode(body.getPatientCode());
if (ObjectUtils.isNotEmpty(patientInfo)) { if (ObjectUtils.isNotEmpty(patientInfo)) {
@ -181,8 +179,6 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
// 注册 // 注册
} else { } else {
// 获取当前微信绑定的居民 // 获取当前微信绑定的居民
List<PatientInfo> list = residentPatientInfoMapper.getList(body.getOpenid(), null);
PatientInfo patientInfo = residentPatientInfoMapper.isRegisterByCardNo(body.getCardNo());
List<PatientInfo> list = residentPatientInfoMapper.getList(body.getOpenid(), body.getCityCode()); List<PatientInfo> list = residentPatientInfoMapper.getList(body.getOpenid(), body.getCityCode());
patientInfo = residentPatientInfoMapper.isRegisterByCardNo(body.getCardNo()); patientInfo = residentPatientInfoMapper.isRegisterByCardNo(body.getCardNo());
if (patientInfo == null) { if (patientInfo == null) {
@ -388,17 +384,16 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
} }
/** /**
* @return com.xinelu.familydoctor.applet.pojo.entity.PatientInfo
* @Author mengkuiliang * @Author mengkuiliang
* @Description 是否已注册 * @Description 是否已注册
* @Date 2023-10-11 011 10:46 * @Date 2023-10-11 011 10:46
* @Param [code] * @Param [code]
* @return com.xinelu.familydoctor.applet.pojo.entity.PatientInfo
**/ **/
/*@Override /*@Override
public PatientInfo isRegistered(String code) { public PatientInfo isRegistered(String code) {
return getCurrentResident(getOpenId(code), null); return getCurrentResident(getOpenId(code), null);
}*/ }*/
@Override @Override
public HashMap<String, String> login(String loginCode, String phoneCode) throws Exception { public HashMap<String, String> login(String loginCode, String phoneCode) throws Exception {
HashMap<String, String> HashMap = new HashMap<>(); HashMap<String, String> HashMap = new HashMap<>();