Skip to content

fix code merge issue #403

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
vishwab1 merged 1 commit into from
Nov 4, 2026
Merged

fix code merge issue #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/UserServiceRoleDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ public class UserServiceRoleDTO {
private String villageName;
private Map<String, Object> facilityData;

// Stop TB / Nikshay location scope — populated only when serviceName = "Stop TB".
// Set via setters after construction (additive, not part of the base constructor
// so every other service line's DTO construction stays exactly as it is today).
private String tuId;
private String tuName;
private String healthFacilityId;
private String healthFacilityName;

public UserServiceRoleDTO(Integer userId, String name, String userName, Integer stateId, String stateName, Integer workingDistrictId, String workingDistrictName, Short serviceProviderId, Integer roleId, String roleName, Integer providerServiceMapId, Integer blockId, String blockName, String villageId, String villageName) {
this.userId = userId;
this.name = name;
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/iemr/flw/repo/iemr/UserServiceRoleRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,10 @@ List<Object[]> getNikshayMappingRows(@Param("userId") Integer userId,
@Query(value = "SELECT DistrictName FROM m_nikshay_district WHERE NikshayDistrictID = :id", nativeQuery = true)
String findNikshayDistrictName(@Param("id") Integer id);

@Query("SELECT new com.iemr.flw.dto.iemr.UserServiceRoleDTO(u.userId, u.name, u.userName, u.stateId, u.stateName, u.workingDistrictId," +
"u.workingDistrictName, u.serviceProviderId, u.roleId, u.roleName, u.providerServiceMapId, u.blockid, u.blockname, u.villageid, " +
"u.villagename) FROM UserServiceRole u WHERE u.userId IN :userIds " +
"AND u.userServciceRoleDeleted = false AND u.userDeleted = false")
List<UserServiceRoleDTO> getUserRolesByIds(@Param("userIds") List<Integer> userIds);

}
10 changes: 10 additions & 0 deletions src/main/java/com/iemr/flw/service/TBConfirmedCaseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.iemr.flw.service;

import com.iemr.flw.domain.iemr.TBConfirmedCaseDTO;
import com.iemr.flw.dto.iemr.TbReferralFollowUpDTO;
import com.iemr.flw.dto.iemr.TbTptFollowUpDTO;
import org.springframework.stereotype.Service;

import java.util.List;
Expand All @@ -18,4 +20,12 @@ public interface TBConfirmedCaseService {

// One record per row, in the same JSON shape getAll returns (STOP-TB changes feed), keyed by id.
java.util.Map<Long, String> getRecordsByIds(java.util.Collection<Long> ids);

String saveReferralFollowUp(TbReferralFollowUpDTO requestDTO, String token);

String getReferralFollowUp(String token);

String saveTptFollowUp(TbTptFollowUpDTO requestDTO, String token);

String getTptFollowUp(String token);
}
Loading
Loading