Jian | BAH-460 | add api for search similar patient using PersonService #29
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,8 +22,13 @@ | |
| import org.openmrs.Patient; | ||
| import org.openmrs.PatientIdentifier; | ||
| import org.openmrs.PatientIdentifierType; | ||
| import org.openmrs.Person; | ||
| import org.openmrs.PersonName; | ||
| import org.openmrs.RelationshipType; | ||
| import org.openmrs.api.context.Context; | ||
| import org.openmrs.api.db.hibernate.HibernatePatientDAO; | ||
| import org.openmrs.api.db.hibernate.PersonLuceneQuery; | ||
| import org.openmrs.api.db.hibernate.search.LuceneQuery; | ||
| import org.openmrs.module.bahmniemrapi.visitlocation.BahmniVisitLocationServiceImpl; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Repository; | ||
|
|
@@ -100,6 +105,66 @@ public List<PatientResponse> getPatientsUsingLuceneSearch(String identifier, Str | |
| return patientResponses; | ||
| } | ||
|
|
||
| @Override | ||
| public List<PatientResponse> getSimilarPatientsUsingLuceneSearch(String identifier, String name, String gender, String customAttribute, | ||
|
There was a problem hiding this comment. This should really take some kind of search object (or a PatientProfile or BahmniPatient as I've suggested elsewhere) as its single parameter. As written here this seems like this method sign will need to be frequently modified in the future. There was a problem hiding this comment. Also, I'm surprised to see so much logic here, e.g. for program attributes. Is that required to address similar patient search when creating a new patient? |
||
| String addressFieldName, String addressFieldValue, Integer length, | ||
| Integer offset, String[] customAttributeFields, String programAttributeFieldValue, | ||
| String programAttributeFieldName, String[] addressSearchResultFields, | ||
| String[] patientSearchResultFields, String loginLocationUuid, | ||
| Boolean filterPatientsByLocation, Boolean filterOnAllIdentifiers) { | ||
|
|
||
| validateSearchParams(customAttributeFields, programAttributeFieldName, addressFieldName); | ||
| PatientResponseMapper patientResponseMapper = new PatientResponseMapper(Context.getVisitService(),new BahmniVisitLocationServiceImpl(Context.getLocationService())); | ||
|
|
||
| List<Patient> patients = getPatientsByNameAndGender(name, gender, length); | ||
| List<Integer> patientIds = patients.stream().map(patient -> patient.getPatientId()).collect(toList()); | ||
| Map<Object, Object> programAttributes = Context.getService(BahmniProgramWorkflowService.class).getPatientProgramAttributeByAttributeName(patientIds, programAttributeFieldName); | ||
| Set<Integer> uniquePatientIds = new HashSet<>(); | ||
| List<PatientResponse> patientResponses = patients.stream() | ||
| .map(patient -> { | ||
| if(!uniquePatientIds.contains(patient.getPatientId())) { | ||
| PatientResponse patientResponse = patientResponseMapper.map(patient, loginLocationUuid, patientSearchResultFields, addressSearchResultFields, | ||
| programAttributes.get(patient.getPatientId())); | ||
| uniquePatientIds.add(patient.getPatientId()); | ||
| return patientResponse; | ||
| }else | ||
| return null; | ||
| }).filter(Objects::nonNull) | ||
| .collect(toList()); | ||
| return patientResponses; | ||
| } | ||
|
|
||
|
|
||
| private List<Patient> getPatientsByNameAndGender(String name, String gender, Integer length) { | ||
| HibernatePatientDAO patientDAO = new HibernatePatientDAO(); | ||
| patientDAO.setSessionFactory(sessionFactory); | ||
| List<Patient> patients = new ArrayList<Patient>(); | ||
| String query = LuceneQuery.escapeQuery(name); | ||
| PersonLuceneQuery personLuceneQuery = new PersonLuceneQuery(sessionFactory); | ||
| LuceneQuery<PersonName> nameQuery = personLuceneQuery.getPatientNameQueryWithOrParser(query, false); | ||
| /* person.gender does not work somehow in LuceneQuery, so the dirty way is to filter result with person's gender */ | ||
| // if(gender != null && !gender.isEmpty()){ | ||
| // nameQuery.include("person.gender", gender); | ||
| // } | ||
| List<PersonName> persons = nameQuery.list().stream() | ||
| .filter( | ||
| personName -> | ||
| personName.getPreferred() | ||
| && checkGender(personName.getPerson(), gender) | ||
| ).collect(toList()); | ||
| persons = persons.subList(0, Math.min(length, persons.size())); | ||
| persons.forEach(person -> patients.add(patientDAO.getPatient(person.getPerson().getPersonId()))); | ||
|
There was a problem hiding this comment. @angshu @djazayeri we do not want to hit the database just to get the Patients from the Persons. We used the lucence index to get the PersonName's of similar Patients via cc @eyalgo (who is picking up on the work done by Jian with Martina) There was a problem hiding this comment. answering this late, I haven't ever used OpenMRS's lucene searching, so I don't know offhand how this works. |
||
| return patients; | ||
| } | ||
|
|
||
| private Boolean checkGender(Person person, String gender) { | ||
| if(gender != null && !gender.isEmpty()){ | ||
| return gender.equals(person.getGender()); | ||
| } else { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| private List<PatientIdentifier> getPatientIdentifiers(String identifier, Boolean filterOnAllIdentifiers, Integer offset, Integer length) { | ||
| FullTextSession fullTextSession = Search.getFullTextSession(sessionFactory.getCurrentSession()); | ||
| QueryBuilder queryBuilder = fullTextSession.getSearchFactory().buildQueryBuilder().forEntity(PatientIdentifier.class).get(); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we add this field here we also need to make sure it's respected by existing API methods that use PatientSearchParameters.
(It would be okay to skip the gender field when searching for similar patients, if your timeline to finish this is tight.)