合并代码冲突

This commit is contained in:
赵旭 2023-10-16 14:37:56 +08:00
parent 037d6b3f66
commit 78b8f9c721

View File

@ -336,12 +336,22 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
} catch (Exception e) {
throw new ServiceException(e.getMessage());
}
//获取手机号
String code;
String cityCode = "";
AppletPhoneVO phone = getPhone(phoneCode);
String phoneNumber = phone.getPhoneInfo().getPhoneNumber();
HashMap.put("phone",phoneNumber);
code = residentPatientInfoMapper.selectPatientInfoByPhone(phoneNumber) == 0 ? "0" : "1";
List<PatientInfo> infoList = residentPatientInfoMapper.selectPatientInfoByPhone(phoneNumber);
code = infoList.size()== 0 ? "0" : "1";
//返回绑定城市
if ("1".equals(code)){
for (PatientInfo patientInfo : infoList) {
cityCode = patientInfo.getCityCode();
}
}
HashMap.put("code",code);
HashMap.put("cityCode",cityCode);
return HashMap;
}
}