TRUNK-2218: remove direct method calls in PatientServiceImpl.java

https://tickets.openmrs.org/browse/TRUNK-2218