合并代码冲突
This commit is contained in:
parent
037d6b3f66
commit
78b8f9c721
@ -336,12 +336,22 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new ServiceException(e.getMessage());
|
throw new ServiceException(e.getMessage());
|
||||||
}
|
}
|
||||||
|
//获取手机号
|
||||||
String code;
|
String code;
|
||||||
|
String cityCode = "";
|
||||||
AppletPhoneVO phone = getPhone(phoneCode);
|
AppletPhoneVO phone = getPhone(phoneCode);
|
||||||
String phoneNumber = phone.getPhoneInfo().getPhoneNumber();
|
String phoneNumber = phone.getPhoneInfo().getPhoneNumber();
|
||||||
HashMap.put("phone",phoneNumber);
|
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("code",code);
|
||||||
|
HashMap.put("cityCode",cityCode);
|
||||||
return HashMap;
|
return HashMap;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user