Skip to content

Unnable to seperate fields for different providers #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 7, 2024
Merged

Unnable to seperate fields for different providers #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39f8f15
download reports
ravishanigarapu Sep 27, 2024
cdc22b3
logic modified save Section-Fields
ravishanigarapu Oct 1, 2024
a654a34
AMM-1006
ravishanigarapu Oct 7, 2024
78fa81c
Merge branch 'PSMRI:develop' into develop
ravishanigarapu Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/iemr/common/repo/customization/SectionAndFieldsMappingRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ List<SectionAndFieldsMapping> findSectionIdAndSectionNameAndServiceProviderId(
@Query("SELECT sfm FROM SectionAndFieldsMapping sfm WHERE sfm.id = :id")
SectionAndFieldsMapping getById(@Param("id") Integer id);

@Query("SELECT sfm FROM SectionAndFieldsMapping sfm WHERE sfm.fieldName = :fieldName")
List<SectionAndFieldsMapping> getByFieldName(@Param("fieldName") String fieldName);
@Query("SELECT sfm FROM SectionAndFieldsMapping sfm WHERE sfm.fieldName = :fieldName and sfm.serviceProviderId = :serviceProviderId")
List<SectionAndFieldsMapping> getByFieldName(@Param("fieldName") String fieldName,@Param("serviceProviderId") Integer serviceProviderId);

}
2 changes: 1 addition & 1 deletion src/main/java/com/iemr/common/service/customization/CustomizationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public String saveSectionAndFields(SectionFieldsMappingDTO sectionFieldsMappingD
List<SectionAndFieldsMapping> sectionAndFieldsMappingList = new ArrayList<>();
for (SectionAndFieldsMapping sectionFieldsMapping : sectionFieldsMappingDTO.getFields()) {
List<SectionAndFieldsMapping> byFieldName = sectionAndFieldsMappingRepo
.getByFieldName(sectionFieldsMapping.getFieldName());
.getByFieldName(sectionFieldsMapping.getFieldName(),sectionFieldsMapping.getServiceProviderId());
sectionAndFieldsMapping = new SectionAndFieldsMapping();
sectionAndFieldsMapping.setSectionId(sectionFieldsMappingDTO.getSectionId());
sectionAndFieldsMapping.setCreatedBy(sectionFieldsMappingDTO.getCreatedBy());
Expand Down
Loading