honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Just use boolean

This commit is contained in:
Tadgh 2021-03-04 13:02:17 -05:00
parent f7153a609a
commit 94377c1159
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/GroupBulkItemReader.java
View File

@ -65,11 +65,12 @@ import java.util.stream.Collectors;
*/ */
public class GroupBulkItemReader extends BaseBulkItemReader implements ItemReader<List<ResourcePersistentId>> { public class GroupBulkItemReader extends BaseBulkItemReader implements ItemReader<List<ResourcePersistentId>> {
private static final Logger ourLog = Logs.getBatchTroubleshootingLog(); private static final Logger ourLog = Logs.getBatchTroubleshootingLog();
public static final int QUERY_CHUNK_SIZE = 100;
@Value("#{jobParameters['" + BulkExportJobConfig.GROUP_ID_PARAMETER + "']}") @Value("#{jobParameters['" + BulkExportJobConfig.GROUP_ID_PARAMETER + "']}")
private String myGroupId; private String myGroupId;
@Value("#{jobParameters['" + BulkExportJobConfig.EXPAND_MDM_PARAMETER+ "']}") @Value("#{jobParameters['" + BulkExportJobConfig.EXPAND_MDM_PARAMETER+ "']}")
private String myMdmEnabled; private boolean myMdmEnabled;
@Autowired @Autowired
private IdHelperService myIdHelperService; private IdHelperService myIdHelperService;
@ -96,7 +97,7 @@ public class GroupBulkItemReader extends BaseBulkItemReader implements ItemReade
//Next, let's search for the target resources, with their correct patient references, chunked. //Next, let's search for the target resources, with their correct patient references, chunked.
//The results will be jammed into myReadPids //The results will be jammed into myReadPids
QueryChunker<String> queryChunker = new QueryChunker<>(); QueryChunker<String> queryChunker = new QueryChunker<>();
queryChunker.chunk(new ArrayList<>(expandedMemberResourceIds), 100, (idChunk) -> { queryChunker.chunk(new ArrayList<>(expandedMemberResourceIds), QUERY_CHUNK_SIZE, (idChunk) -> {
queryResourceTypeWithReferencesToPatients(myReadPids, idChunk); queryResourceTypeWithReferencesToPatients(myReadPids, idChunk);
}); });
@ -118,7 +119,7 @@ public class GroupBulkItemReader extends BaseBulkItemReader implements ItemReade
List<Long> pidsOrThrowException = myIdHelperService.getPidsOrThrowException(ids); List<Long> pidsOrThrowException = myIdHelperService.getPidsOrThrowException(ids);
patientPidsToExport.addAll(pidsOrThrowException); patientPidsToExport.addAll(pidsOrThrowException);
if (Boolean.parseBoolean(myMdmEnabled)) { if (myMdmEnabled) {
IBaseResource group = myDaoRegistry.getResourceDao("Group").read(new IdDt(myGroupId)); IBaseResource group = myDaoRegistry.getResourceDao("Group").read(new IdDt(myGroupId));
Long pidOrNull = myIdHelperService.getPidOrNull(group); Long pidOrNull = myIdHelperService.getPidOrNull(group);
List<List<Long>> lists = myMdmLinkDao.expandPidsFromGroupPidGivenMatchResult(pidOrNull, MdmMatchResultEnum.MATCH); List<List<Long>> lists = myMdmLinkDao.expandPidsFromGroupPidGivenMatchResult(pidOrNull, MdmMatchResultEnum.MATCH);
@ -156,7 +157,7 @@ public class GroupBulkItemReader extends BaseBulkItemReader implements ItemReade
Long pidOrNull = myIdHelperService.getPidOrNull(group); Long pidOrNull = myIdHelperService.getPidOrNull(group);
//Attempt to perform MDM Expansion of membership //Attempt to perform MDM Expansion of membership
if (Boolean.parseBoolean(myMdmEnabled)) { if (myMdmEnabled) {
List<List<Long>> goldenPidTargetPidTuple = myMdmLinkDao.expandPidsFromGroupPidGivenMatchResult(pidOrNull, MdmMatchResultEnum.MATCH); List<List<Long>> goldenPidTargetPidTuple = myMdmLinkDao.expandPidsFromGroupPidGivenMatchResult(pidOrNull, MdmMatchResultEnum.MATCH);
//Now lets translate these pids into resource IDs //Now lets translate these pids into resource IDs
Set<Long> uniquePids = new HashSet<>(); Set<Long> uniquePids = new HashSet<>();