diff --git a/pom.xml b/pom.xml index 7d5de642..60077138 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.lamisplus.modules hts - 2.5.0.2 + 2.5.1 jar Hts diff --git a/src/main/java/org/lamisplus/modules/hts/controller/HtsEncounterController.java b/src/main/java/org/lamisplus/modules/hts/controller/HtsEncounterController.java index d9da6dc8..e16c528c 100644 --- a/src/main/java/org/lamisplus/modules/hts/controller/HtsEncounterController.java +++ b/src/main/java/org/lamisplus/modules/hts/controller/HtsEncounterController.java @@ -20,7 +20,6 @@ import javax.validation.Valid; import java.time.LocalDate; import java.util.List; -import java.util.UUID; @RestController @RequestMapping("/api/v1/hts-encounter") @@ -86,7 +85,9 @@ public ResponseEntity getPatientSummaries( @PreAuthorize("hasAnyAuthority('hts_view', 'hts_encounter_view')") public ResponseEntity getForProphylaxis( @PathVariable("screening-date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate screeningDate, - @PathVariable("patient-uuid") UUID patientUuid) { + // patientUuid taken as a raw String (not java.util.UUID) so legacy/migrated + // patient_uuid values that aren't well-formed UUIDs don't 400 at binding time. + @PathVariable("patient-uuid") String patientUuid) { return ResponseEntity.ok(service.getForProphylaxis(screeningDate, patientUuid)); } diff --git a/src/main/java/org/lamisplus/modules/hts/domain/dto/HtsEncounterRequest.java b/src/main/java/org/lamisplus/modules/hts/domain/dto/HtsEncounterRequest.java index c24f7802..9d280926 100644 --- a/src/main/java/org/lamisplus/modules/hts/domain/dto/HtsEncounterRequest.java +++ b/src/main/java/org/lamisplus/modules/hts/domain/dto/HtsEncounterRequest.java @@ -69,14 +69,12 @@ public class HtsEncounterRequest { private String complaintsScroralSwelling; private String complaintsGenitalSores; private String complaintsSwollenLymphNodes; - private String partnerNewlyDiagnosed; private String partnerPregnantOnArv; private String adolescentHivPositive; private String partnerNotRegularlyOnDrugs; private String partnerRecentlyReturnedToTreatment; private String hadSexWithHivPositivePartnerInRiskGroup; - private String typeOfHivTestDone; private String initialHivTest; private String suspectedAcuteInfection; @@ -85,7 +83,6 @@ public class HtsEncounterRequest { private String syphilisTestResult; private String recencyTest; private String hivEarlyDetectResult; - private String previouslyTestedThisYear; private String clientReceivedTestResult; private String hivTestKitsProvided; @@ -100,7 +97,6 @@ public class HtsEncounterRequest { private String completedBy; private String designation; private Boolean pmtctHts = false; - private String source ="Web"; private String longitude; private String latitude; diff --git a/src/main/java/org/lamisplus/modules/hts/domain/dto/HtsEncounterResponse.java b/src/main/java/org/lamisplus/modules/hts/domain/dto/HtsEncounterResponse.java index 20e3e124..caeb060f 100644 --- a/src/main/java/org/lamisplus/modules/hts/domain/dto/HtsEncounterResponse.java +++ b/src/main/java/org/lamisplus/modules/hts/domain/dto/HtsEncounterResponse.java @@ -5,14 +5,13 @@ import org.lamisplus.modules.patient.domain.dto.PersonResponseDto; import java.time.LocalDate; -import java.util.UUID; @Data public class HtsEncounterResponse { private Long id; private String uuid; private Long patientId; - private UUID patientUuid; + private String patientUuid; private PersonResponseDto person; private String clientCode; private LocalDate dateOfVisit; diff --git a/src/main/java/org/lamisplus/modules/hts/domain/entity/HtsEncounter.java b/src/main/java/org/lamisplus/modules/hts/domain/entity/HtsEncounter.java index 8beffa4f..1aff63b4 100644 --- a/src/main/java/org/lamisplus/modules/hts/domain/entity/HtsEncounter.java +++ b/src/main/java/org/lamisplus/modules/hts/domain/entity/HtsEncounter.java @@ -15,7 +15,6 @@ import javax.persistence.*; import java.io.Serializable; import java.time.LocalDate; -import java.util.UUID; @Entity @Table(name = "hts_encounter") @@ -36,8 +35,9 @@ public class HtsEncounter extends Audit implements Serializable { @JoinColumn(name = "patient_id", nullable = false) private Person person; - @Column(name = "patient_uuid", columnDefinition = "uuid") - private UUID patientUuid; + + @Column(name = "patient_uuid", columnDefinition = "varchar(50)", length = 50) + private String patientUuid; @Column(name = "client_code", nullable = false, length = 50) private String clientCode; @@ -71,4 +71,4 @@ public class HtsEncounter extends Audit implements Serializable { @Column(nullable = false) private Boolean archived = false; -} +} \ No newline at end of file diff --git a/src/main/java/org/lamisplus/modules/hts/installers/HarmoniseNewHtsTablesInstaller.java b/src/main/java/org/lamisplus/modules/hts/installers/HarmoniseNewHtsTablesInstaller.java index 8139b271..ad440821 100644 --- a/src/main/java/org/lamisplus/modules/hts/installers/HarmoniseNewHtsTablesInstaller.java +++ b/src/main/java/org/lamisplus/modules/hts/installers/HarmoniseNewHtsTablesInstaller.java @@ -1,13 +1,12 @@ package org.lamisplus.modules.hts.installers; - import com.foreach.across.core.annotations.Installer; import com.foreach.across.core.installers.AcrossLiquibaseInstaller; import org.springframework.core.annotation.Order; @Order(23) -@Installer(name = "harmonize-new-hts-tables-new", +@Installer(name = "harmonize-new-hts-tables-new-bug-resolved", description = "Resolves divergent HTS tables", - version = 15) + version = 18) public class HarmoniseNewHtsTablesInstaller extends AcrossLiquibaseInstaller { public HarmoniseNewHtsTablesInstaller() { super("classpath:installers/hts/harmonise_new_hts_tables.xml"); diff --git a/src/main/java/org/lamisplus/modules/hts/installers/HtsEncounterSchemaInstaller.java b/src/main/java/org/lamisplus/modules/hts/installers/HtsEncounterSchemaInstaller.java index ff2cd8a4..7a5b3d73 100644 --- a/src/main/java/org/lamisplus/modules/hts/installers/HtsEncounterSchemaInstaller.java +++ b/src/main/java/org/lamisplus/modules/hts/installers/HtsEncounterSchemaInstaller.java @@ -5,9 +5,9 @@ import org.springframework.core.annotation.Order; @Order(20) -@Installer(name = "hts-encounter-schema-installer-new-again", +@Installer(name = "hts-encounter-schema-installer-new-again-bug-resolved", description = "Creates the hts_encounter table — V3: boolean archived, patient_id, patient_uuid, facility_uuid, observation column", - version = 43) + version = 44) public class HtsEncounterSchemaInstaller extends AcrossLiquibaseInstaller { public HtsEncounterSchemaInstaller() { super("classpath:installers/hts/encounter_schema.xml"); diff --git a/src/main/java/org/lamisplus/modules/hts/installers/IctEncounterSchemaInstaller.java b/src/main/java/org/lamisplus/modules/hts/installers/IctEncounterSchemaInstaller.java index 206d5101..fb9f8c39 100644 --- a/src/main/java/org/lamisplus/modules/hts/installers/IctEncounterSchemaInstaller.java +++ b/src/main/java/org/lamisplus/modules/hts/installers/IctEncounterSchemaInstaller.java @@ -5,9 +5,9 @@ import org.springframework.core.annotation.Order; @Order(21) -@Installer(name = "ict-encounter-schema-installer-new-again", +@Installer(name = "ict-encounter-schema-installer-new-again-bug-resolved", description = "Creates ict_encounter and ict_contact tables — V3: boolean archived, patient_id, patient_uuid, facility_uuid, contact renames, removed age columns", - version = 43) + version = 44) public class IctEncounterSchemaInstaller extends AcrossLiquibaseInstaller { public IctEncounterSchemaInstaller() { super("classpath:installers/hts/ict_encounter_schema.xml"); diff --git a/src/main/java/org/lamisplus/modules/hts/installers/Updates.java b/src/main/java/org/lamisplus/modules/hts/installers/Updates.java index bcc23d7a..db7cd425 100644 --- a/src/main/java/org/lamisplus/modules/hts/installers/Updates.java +++ b/src/main/java/org/lamisplus/modules/hts/installers/Updates.java @@ -6,7 +6,7 @@ @Order(3) @Installer(name = "schema-installer-update", description = "Updates the required database tables data", - version = 15) + version = 18) public class Updates extends AcrossLiquibaseInstaller { public Updates() { super("classpath:installers/hts/updates.xml"); diff --git a/src/main/java/org/lamisplus/modules/hts/repository/HtsClientRepository.java b/src/main/java/org/lamisplus/modules/hts/repository/HtsClientRepository.java index f56625cf..808f5b35 100644 --- a/src/main/java/org/lamisplus/modules/hts/repository/HtsClientRepository.java +++ b/src/main/java/org/lamisplus/modules/hts/repository/HtsClientRepository.java @@ -34,30 +34,40 @@ public interface HtsClientRepository extends JpaRepository { Optional findFirstByRiskStratificationCode(String riskStratificationCode); - @Query(value = "SELECT \n" + - " p.hospital_number AS hospitalNumber,\n" + - " p.id AS personId,\n" + - " p.uuid AS personUuid,\n" + - " p.first_name AS firstName,\n" + - " p.surname AS surname,\n" + - " p.other_name AS otherName,\n" + - " CAST(EXTRACT(YEAR FROM AGE(NOW(), p.date_of_birth)) AS INTEGER) AS age,\n" + - " INITCAP(p.sex) AS gender\n" + - "FROM patient_person p\n" + - "WHERE p.archived = ?1\n" + - "AND (\n" + - " p.first_name ILIKE ?3\n" + - " OR p.surname ILIKE ?3\n" + - " OR p.other_name ILIKE ?3\n" + - " OR p.hospital_number ILIKE ?3\n" + - " OR p.contact_point#>>'{contactPoint,0,value}' ILIKE ?3\n" + - ")\n" + + @Query(value = "SELECT hc.client_code as clientCode, p.id as personId, p.first_name as firstName, p.surname as surname, p.other_name as otherName, " + + "p.hospital_number as hospitalNumber, CAST (EXTRACT(YEAR from AGE(NOW(), date_of_birth)) AS INTEGER) as age, " + + "INITCAP(p.sex) as gender, p.date_of_birth as dateOfBirth, CAST (COUNT(hc.person_uuid) AS INTEGER) as htsCount " + + "FROM patient_person p " + + "LEFT JOIN hts_client hc ON hc.person_uuid = p.uuid AND hc.archived = ?1 " + + "WHERE p.archived=?1 AND p.facility_id=?2 AND (p.first_name ILIKE ?3 " + + "OR p.surname ILIKE ?3 OR p.other_name ILIKE ?3 " + + "OR p.hospital_number ILIKE ?3 OR hc.client_code ILIKE ?3) " + + "GROUP BY hc.client_code, p.id, p.first_name, p.first_name, p.surname, p.other_name, p.hospital_number, p.date_of_birth", nativeQuery = true) + List findAllPersonHtsBySearchParam(Integer archived, Long facilityId, String search); + + + String PATIENTS_INFANT_CTE = + "WITH pmtct_infants AS (\n" + + " SELECT DISTINCT hospital_number\n" + + " FROM pmtct_infant_hospital_numbers() AS t(hospital_number)\n" + + ")\n"; + + String PATIENTS_SELECT_COLS = + "SELECT p.hospital_number AS hospitalNumber, p.uuid AS personUuid, p.id AS personId,\n" + + " p.first_name AS firstName, p.surname AS surname, p.other_name AS otherName,\n" + + " CAST(EXTRACT(YEAR FROM AGE(NOW(), p.date_of_birth)) AS INTEGER) AS age,\n" + + " INITCAP(p.sex) AS gender\n" + + "FROM patient_person p\n"; + + // Two hts_encounter anti-joins — identical to findAllPersonHts — plus the + // set-based infant exclusion replacing is_pmtct_infant(p.hospital_number). + String PATIENTS_NOT_EXISTS = "AND NOT EXISTS (\n" + " SELECT 1\n" + " FROM hts_encounter hs\n" + " WHERE hs.client_code = p.hospital_number\n" + " AND hs.archived = false\n" + - " AND CAST(hs.patient_uuid AS TEXT) IS NOT NULL AND CAST(hs.patient_uuid AS TEXT) != ''\n" + + " AND CAST(hs.patient_uuid AS TEXT) is not null AND CAST(hs.patient_uuid AS TEXT) != ''\n" + " AND hs.facility_id = ?2\n" + ")\n" + "AND NOT EXISTS (\n" + @@ -67,72 +77,93 @@ public interface HtsClientRepository extends JpaRepository { " AND htse.facility_id = ?2\n" + " AND htse.archived = false\n" + ")\n" + - "AND is_pmtct_infant(p.hospital_number) = FALSE\n" + - "", nativeQuery = true) - Page findAllPersonHtsBySearchParam(Integer archived, Long facilityId, String search, Pageable pageable); - - - @Query(value = "SELECT DISTINCT hc.client_code AS clientCode, p.id as personId,p.uuid as personUuid, p.first_name as firstName, p.surname as surname, p.other_name as otherName, \n" + - "p.hospital_number as hospitalNumber, CAST (EXTRACT(YEAR from AGE(NOW(), date_of_birth)) AS INTEGER) as age, \n" + - "INITCAP(p.sex) as gender, p.date_of_birth as dateOfBirth,mini.person_uuid,mini.hts_count htsCount \n" + - "FROM patient_person p \n" + - "INNER JOIN hts_client hc ON hc.person_uuid = p.uuid AND hc.archived = ?1 \n" + - "INNER JOIN (SELECT person_uuid,MIN(date_created) first_hts_registration,COUNT(person_uuid) hts_count \n" + - "FROM hts_client \n" + - "WHERE person_uuid IS NOT NULL AND archived = ?1 AND facility_id=?2 " + - "GROUP BY 1) mini \n" + - "ON hc.person_uuid=mini.person_uuid AND hc.date_created=mini.first_hts_registration \n" + - "where p.first_name ILIKE ?3 OR p.surname ILIKE ?3 OR p.other_name ILIKE ?3 \n" + - "OR p.hospital_number ILIKE ?3 OR hc.client_code ILIKE ?3 ", nativeQuery = true) - Page findOnlyPersonHtsBySearchParam(Integer archived, Long facilityId, String search, Pageable pageable); + "AND NOT EXISTS (\n" + + " SELECT 1 FROM pmtct_infants pin WHERE pin.hospital_number = p.hospital_number\n" + + ")\n"; + @Query(value = + PATIENTS_INFANT_CTE + PATIENTS_SELECT_COLS + + "WHERE p.archived = ?1 AND p.facility_id = ?2\n" + + PATIENTS_NOT_EXISTS + + "ORDER BY p.created_date DESC", + countQuery = + PATIENTS_INFANT_CTE + + "SELECT COUNT(*) FROM patient_person p\n" + + "WHERE p.archived = ?1 AND p.facility_id = ?2\n" + + PATIENTS_NOT_EXISTS, + nativeQuery = true) + Page findAllPersonHtsOptimized(Integer archived, Long facilityId, Pageable pageable); - @Query(value = "SELECT hc.client_code as clientCode, p.id as personId, p.first_name as firstName, p.surname as surname, p.other_name as otherName, " + - "p.hospital_number as hospitalNumber, CAST (EXTRACT(YEAR from AGE(NOW(), date_of_birth)) AS INTEGER) as age, " + - "INITCAP(p.sex) as gender, p.date_of_birth as dateOfBirth, CAST (COUNT(hc.person_uuid) AS INTEGER) as htsCount " + - "FROM patient_person p " + - "LEFT JOIN hts_client hc ON hc.person_uuid = p.uuid AND hc.archived = ?1 " + - "WHERE p.archived=?1 AND p.facility_id=?2 AND (p.first_name ILIKE ?3 " + - "OR p.surname ILIKE ?3 OR p.other_name ILIKE ?3 " + - "OR p.hospital_number ILIKE ?3 OR hc.client_code ILIKE ?3) " + - "GROUP BY hc.client_code, p.id, p.first_name, p.first_name, p.surname, p.other_name, p.hospital_number, p.date_of_birth", nativeQuery = true) - List findAllPersonHtsBySearchParam(Integer archived, Long facilityId, String search); + @Query(value = + PATIENTS_INFANT_CTE + PATIENTS_SELECT_COLS + + "WHERE p.archived = ?1\n" + + "AND (\n" + + " p.first_name ILIKE ?3\n" + + " OR p.surname ILIKE ?3\n" + + " OR p.other_name ILIKE ?3\n" + + " OR p.hospital_number ILIKE ?3\n" + + " OR p.contact_point#>>'{contactPoint,0,value}' ILIKE ?3\n" + + ")\n" + + PATIENTS_NOT_EXISTS, + countQuery = + PATIENTS_INFANT_CTE + + "SELECT COUNT(*) FROM patient_person p\n" + + "WHERE p.archived = ?1\n" + + "AND (\n" + + " p.first_name ILIKE ?3\n" + + " OR p.surname ILIKE ?3\n" + + " OR p.other_name ILIKE ?3\n" + + " OR p.hospital_number ILIKE ?3\n" + + " OR p.contact_point#>>'{contactPoint,0,value}' ILIKE ?3\n" + + ")\n" + + PATIENTS_NOT_EXISTS, + nativeQuery = true) + Page findAllPersonHtsBySearchParamOptimized(Integer archived, Long facilityId, String search, Pageable pageable); + String ONLY_PERSON_HTS_CTE = + "WITH first_hc AS (\n" + + " SELECT DISTINCT ON (hc.person_uuid)\n" + + " hc.id, hc.client_code, hc.person_uuid, hc.date_created,\n" + + " COUNT(*) OVER (PARTITION BY hc.person_uuid) AS hts_count\n" + + " FROM hts_client hc\n" + + " WHERE hc.person_uuid IS NOT NULL\n" + + " AND hc.archived = ?1\n" + + " AND hc.facility_id = ?2\n" + + " ORDER BY hc.person_uuid, hc.date_created ASC, hc.id ASC\n" + + ")\n"; + String ONLY_PERSON_HTS_SELECT = + "SELECT fc.id, fc.client_code AS clientCode, p.id as personId, p.uuid as personUuid,\n" + + " p.first_name as firstName, p.surname as surname, p.other_name as otherName,\n" + + " p.hospital_number as hospitalNumber,\n" + + " CAST(EXTRACT(YEAR from AGE(NOW(), p.date_of_birth)) AS INTEGER) as age,\n" + + " INITCAP(p.sex) as gender, p.date_of_birth as dateOfBirth,\n" + + " fc.person_uuid, fc.hts_count htsCount\n" + + "FROM first_hc fc\n" + + "INNER JOIN patient_person p ON p.uuid = fc.person_uuid\n"; - @Query(value = "SELECT p.hospital_number AS hospitalNumber, p.uuid as personUuid, p.id AS personId, p.first_name AS firstName, p.surname AS surname, \n" + - " p.other_name AS otherName, CAST(EXTRACT(YEAR FROM AGE(NOW(), p.date_of_birth)) AS INTEGER) AS age, INITCAP(p.sex) AS gender \n" + - "\tFROM patient_person p \n" + - "\tWHERE p.archived = ?1 AND p.facility_id = ?2 \n" + - "\t\t\t\tAND NOT EXISTS (\n" + - "\t\t\t\t\tSELECT 1 \n" + - "\t\t\t\t\tFROM hts_encounter hs\n" + - "\t\t\t\t\tWHERE hs.client_code = p.hospital_number\n" + - "\t\t\t\t\tAND hs.archived = false \n" + - "\t\t\t\t\tAND CAST(hs.patient_uuid AS TEXT) is not null AND CAST(hs.patient_uuid AS TEXT) != ''\n" + - "\t\t\t\t\tAND hs.facility_id = ?2 \n" + - "\t\t\t\t)\n" + - " AND NOT EXISTS (\n" + - "\t\t\t\t SELECT 1\n" + - "\t\t\t\t FROM hts_encounter htse\n" + - "\t\t\t\t WHERE CAST(htse.patient_uuid AS TEXT) = p.uuid\n" + - "\t\t\t\t AND htse.facility_id = ?2\n" + - "\t\t\t\t AND htse.archived = false\n" + - " )\n" + - " AND is_pmtct_infant(p.hospital_number) = FALSE\n" + - "\t\t\tORDER BY p.created_date DESC" , nativeQuery = true) - Page findAllPersonHts(Integer archived, Long facilityId, Pageable pageable); - @Query(value = "SELECT DISTINCT hc.id, hc.client_code AS clientCode, p.id as personId,p.uuid as personUuid, p.first_name as firstName, p.surname as surname, p.other_name as otherName, \n" + - "p.hospital_number as hospitalNumber, CAST (EXTRACT(YEAR from AGE(NOW(), date_of_birth)) AS INTEGER) as age, \n" + - "INITCAP(p.sex) as gender, p.date_of_birth as dateOfBirth,mini.person_uuid,mini.hts_count htsCount\n" + - "FROM patient_person p\n" + - "INNER JOIN hts_client hc ON hc.person_uuid = p.uuid AND hc.archived = ?1 \n" + - "INNER JOIN (SELECT person_uuid,MIN(date_created) first_hts_registration,COUNT(person_uuid) hts_count\n" + - "FROM hts_client\n" + - "WHERE person_uuid IS NOT NULL AND archived = ?1 AND facility_id=?2 \n" + - "GROUP BY 1) mini\n" + - "ON hc.person_uuid=mini.person_uuid AND hc.date_created=mini.first_hts_registration ORDER BY hc.id DESC", nativeQuery = true) - Page findOnlyPersonHts(Integer archived, Long facilityId, Pageable pageable); + @Query(value = + ONLY_PERSON_HTS_CTE + ONLY_PERSON_HTS_SELECT + "ORDER BY fc.id DESC", + countQuery = + ONLY_PERSON_HTS_CTE + + "SELECT COUNT(*) FROM first_hc fc " + + "INNER JOIN patient_person p ON p.uuid = fc.person_uuid", + nativeQuery = true) + Page findOnlyPersonHtsOptimized(Integer archived, Long facilityId, Pageable pageable); + + @Query(value = + ONLY_PERSON_HTS_CTE + ONLY_PERSON_HTS_SELECT + + "WHERE p.first_name ILIKE ?3 OR p.surname ILIKE ?3 OR p.other_name ILIKE ?3\n" + + " OR p.hospital_number ILIKE ?3 OR fc.client_code ILIKE ?3\n" + + "ORDER BY fc.id DESC", + countQuery = + ONLY_PERSON_HTS_CTE + + "SELECT COUNT(*) FROM first_hc fc " + + "INNER JOIN patient_person p ON p.uuid = fc.person_uuid " + + "WHERE p.first_name ILIKE ?3 OR p.surname ILIKE ?3 OR p.other_name ILIKE ?3 " + + " OR p.hospital_number ILIKE ?3 OR fc.client_code ILIKE ?3", + nativeQuery = true) + Page findOnlyPersonHtsBySearchParamOptimized(Integer archived, Long facilityId, String search, Pageable pageable); @Query(value = "WITH hts_patients AS ( \n" + " SELECT DISTINCT \n" + diff --git a/src/main/java/org/lamisplus/modules/hts/repository/HtsEncounterRepository.java b/src/main/java/org/lamisplus/modules/hts/repository/HtsEncounterRepository.java index 9f94a881..ee328724 100644 --- a/src/main/java/org/lamisplus/modules/hts/repository/HtsEncounterRepository.java +++ b/src/main/java/org/lamisplus/modules/hts/repository/HtsEncounterRepository.java @@ -11,7 +11,6 @@ import java.time.LocalDate; import java.util.List; import java.util.Optional; -import java.util.UUID; public interface HtsEncounterRepository extends JpaRepository { @@ -20,7 +19,7 @@ public interface HtsEncounterRepository extends JpaRepository findByPerson_IdAndArchivedOrderByDateOfVisitDesc(Long patientId, Boolean archived); Optional findFirstByPatientUuidAndDateOfVisitAndArchivedOrderByIdDesc( - UUID patientUuid, LocalDate dateOfVisit, Boolean archived); + String patientUuid, LocalDate dateOfVisit, Boolean archived); @Query("SELECT e FROM HtsEncounter e " + "JOIN e.person p " + @@ -71,73 +70,92 @@ Page findPatientSummaries( @Param("search") String search, Pageable pageable); - @Query(value = - "SELECT \n" + - " e.id, \n" + - " CAST(e.uuid AS text), \n" + - " p.id AS person_id, \n" + - " e.client_code, \n" + - " e.date_of_visit, \n" + - " e.setting, \n" + - " CAST(e.observation AS text), \n" + - " e.facility_id, \n" + - " hts_agg.hts_count, \n" + - " ict_agg.ict_count \n" + - "FROM patient_person p \n" + - "INNER JOIN (\n" + - " SELECT patient_uuid, MAX(id) AS max_id \n" + - " FROM hts_encounter \n" + - " WHERE archived = false \n" + - "\tAND facility_id=:facilityId\n" + - " GROUP BY patient_uuid\n" + - ") latest ON latest.patient_uuid = p.uuid \n" + - "INNER JOIN hts_encounter e ON e.id = latest.max_id \n" + - "INNER JOIN (\n" + - " SELECT patient_uuid, COUNT(*) AS hts_count \n" + - " FROM hts_encounter \n" + - " WHERE archived = false \n" + - "\tAND facility_id=:facilityId\n" + + String HTS_SUMMARY_CTES = + "WITH hts_agg AS (\n" + + " SELECT DISTINCT ON (e.patient_uuid)\n" + + " e.id, e.uuid, e.patient_uuid, e.client_code, e.date_of_visit,\n" + + " e.setting, e.observation, e.facility_id,\n" + + " COUNT(*) OVER (PARTITION BY e.patient_uuid) AS hts_count\n" + + " FROM hts_encounter e\n" + + " WHERE e.archived = false\n" + + " AND e.facility_id = :facilityId\n" + + " ORDER BY e.patient_uuid, e.id DESC\n" + + "),\n" + + "ict_agg AS (\n" + + " SELECT patient_uuid, COUNT(*) AS ict_count\n" + + " FROM hts_ict_encounter\n" + + " WHERE archived = false\n" + + " AND facility_id = :facilityId\n" + " GROUP BY patient_uuid\n" + - ") hts_agg ON hts_agg.patient_uuid = p.uuid \n" + - "LEFT JOIN (\n" + - " SELECT patient_uuid, COUNT(*) AS ict_count \n" + - " FROM hts_ict_encounter \n" + - " WHERE archived = false \n" + - "\tAND facility_id=:facilityId\n" + - " GROUP BY patient_uuid\n" + - ") ict_agg ON ict_agg.patient_uuid = p.uuid \n" + - "WHERE p.archived = 0 \n" + - "\tAND p.facility_id=:facilityId\n" + - " AND (:search IS NULL \n" + - " OR p.first_name ILIKE CAST(:search AS text) \n" + - " OR p.surname ILIKE CAST(:search AS text) \n" + - " OR p.other_name ILIKE CAST(:search AS text) \n" + - " OR p.hospital_number ILIKE CAST(:search AS text) \n" + - " OR EXISTS (\n" + - " SELECT 1 \n" + - " FROM jsonb_array_elements(p.contact_point->'contactPoint') cp \n" + - " WHERE cp->>'value' ILIKE CAST(:search AS text)\n" + - " )) \n" + - "ORDER BY e.id DESC", + ")\n"; + + String HTS_SUMMARY_WHERE = + "WHERE p.archived = 0\n" + + " AND p.facility_id = :facilityId\n" + + " AND (:search IS NULL\n" + + " OR p.first_name ILIKE CAST(:search AS text)\n" + + " OR p.surname ILIKE CAST(:search AS text)\n" + + " OR p.other_name ILIKE CAST(:search AS text)\n" + + " OR p.hospital_number ILIKE CAST(:search AS text)\n" + + " OR hts.client_code ILIKE CAST(:search AS text)\n" + + " OR EXISTS (\n" + + " SELECT 1\n" + + " FROM jsonb_array_elements(p.contact_point->'contactPoint') cp\n" + + " WHERE cp->>'value' ILIKE CAST(:search AS text)\n" + + " ))\n"; + + @Query(value = + HTS_SUMMARY_CTES + + "SELECT\n" + + " hts.id,\n" + + " CAST(hts.uuid AS text),\n" + + " p.id AS person_id,\n" + + " hts.client_code,\n" + + " hts.date_of_visit,\n" + + " hts.setting,\n" + + " CAST(hts.observation AS text),\n" + + " hts.facility_id,\n" + + " hts.hts_count,\n" + + " COALESCE(ict.ict_count, 0) AS ict_count\n" + + "FROM patient_person p\n" + + // patient_uuid is now varchar (legacy-tolerant); p.uuid / ict.patient_uuid + // are still native uuid columns, so cast explicitly on both sides. + "INNER JOIN hts_agg hts ON hts.patient_uuid = CAST(p.uuid AS text)\n" + + "LEFT JOIN ict_agg ict ON CAST(ict.patient_uuid AS text) = CAST(p.uuid AS text)\n" + + HTS_SUMMARY_WHERE + + "ORDER BY hts.id DESC", countQuery = - "SELECT COUNT(DISTINCT p.id) \n" + - " FROM patient_person p \n" + - " INNER JOIN hts_encounter e ON e.patient_uuid = p.uuid AND e.archived = false \n" + - " WHERE p.archived = 0 \n" + - " AND p.facility_id=:facilityId\n" + - " AND (:search IS NULL \n" + - " OR p.first_name ILIKE CAST(:search AS text) \n" + - " OR p.surname ILIKE CAST(:search AS text) \n" + - " OR p.other_name ILIKE CAST(:search AS text) \n" + - " OR p.hospital_number ILIKE CAST(:search AS text) \n" + - " OR EXISTS (\n" + - " SELECT 1 \n" + - " FROM jsonb_array_elements(p.contact_point->'contactPoint') cp \n" + - " WHERE cp->>'value' ILIKE CAST(:search AS text)\n" + - " ))", + + "SELECT COUNT(*)\n" + + "FROM patient_person p\n" + + "WHERE p.archived = 0\n" + + " AND p.facility_id = :facilityId\n" + + " AND EXISTS (\n" + + " SELECT 1 FROM hts_encounter e\n" + + " WHERE e.patient_uuid = CAST(p.uuid AS text)\n" + + " AND e.archived = false\n" + + " AND e.facility_id = :facilityId\n" + + " )\n" + + " AND (:search IS NULL\n" + + " OR p.first_name ILIKE CAST(:search AS text)\n" + + " OR p.surname ILIKE CAST(:search AS text)\n" + + " OR p.other_name ILIKE CAST(:search AS text)\n" + + " OR p.hospital_number ILIKE CAST(:search AS text)\n" + + " OR EXISTS (\n" + + " SELECT 1 FROM hts_encounter e2\n" + + " WHERE CAST(e2.patient_uuid AS text) = CAST(p.uuid AS text)\n" + + " AND e2.archived = false\n" + + " AND e2.facility_id = :facilityId\n" + + " AND e2.client_code ILIKE CAST(:search AS text)\n" + + " )\n" + + " OR EXISTS (\n" + + " SELECT 1\n" + + " FROM jsonb_array_elements(p.contact_point->'contactPoint') cp\n" + + " WHERE cp->>'value' ILIKE CAST(:search AS text)\n" + + " ))", nativeQuery = true) - Page findHtsPatientSummaries( - Long facilityId, + Page findHtsPatientSummariesOptimized( + @Param("facilityId") Long facilityId, @Param("search") String search, Pageable pageable); } \ No newline at end of file diff --git a/src/main/java/org/lamisplus/modules/hts/service/HtsClientService.java b/src/main/java/org/lamisplus/modules/hts/service/HtsClientService.java index 6428173f..f06f657c 100644 --- a/src/main/java/org/lamisplus/modules/hts/service/HtsClientService.java +++ b/src/main/java/org/lamisplus/modules/hts/service/HtsClientService.java @@ -532,27 +532,32 @@ public Page getAllPersonHts(String search, int pageNo, int pageSize) Long facilityId = currentUserOrganizationService.getCurrentUserOrganization(); //List htsPeople = new ArrayList<>(); Pageable pageable = PageRequest.of(pageNo, pageSize); + // Optimized: PMTCT-infant exclusion is a single materialised NOT EXISTS + // anti-join (pmtct_infant_hospital_numbers() in a CTE) instead of a + // per-row is_pmtct_infant() call; two hts_encounter anti-joins unchanged. + // Revert by swapping back to findAllPersonHtsBySearchParam / findAllPersonHts. if(!String.valueOf(search).equals("null") && !search.equals("*")){ search = search.replaceAll("\\s", ""); String queryParam = "%"+search+"%"; return htsClientRepository - .findAllPersonHtsBySearchParam(UN_ARCHIVED, facilityId, queryParam, pageable); + .findAllPersonHtsBySearchParamOptimized(UN_ARCHIVED, facilityId, queryParam, pageable); } return htsClientRepository - .findAllPersonHts(UN_ARCHIVED, facilityId, pageable); + .findAllPersonHtsOptimized(UN_ARCHIVED, facilityId, pageable); } public Page getOnlyPersonHts(String search, int pageNo, int pageSize) { Long facilityId = currentUserOrganizationService.getCurrentUserOrganization(); Pageable pageable = PageRequest.of(pageNo, pageSize); + if(!String.valueOf(search).equals("null") && !search.equals("*")){ search = search.replaceAll("\\s", ""); String queryParam = "%"+search+"%"; return htsClientRepository - .findOnlyPersonHtsBySearchParam(UN_ARCHIVED, facilityId, queryParam, pageable); + .findOnlyPersonHtsBySearchParamOptimized(UN_ARCHIVED, facilityId, queryParam, pageable); } return htsClientRepository - .findOnlyPersonHts(UN_ARCHIVED, facilityId, pageable); + .findOnlyPersonHtsOptimized(UN_ARCHIVED, facilityId, pageable); } public HtsClientDtos getAllHtsClientDtos(Page page) { @@ -674,9 +679,6 @@ public HtsClientDtos getRiskStratificationHtsClients(Long personId) { } public Boolean checkForClientCode(String clientCode) { - // if the repository finds that the client code exists, - // should return false to indicate that - // this client code doesn't pass the check, else true return !htsClientRepository.existsByClientCode(clientCode); } diff --git a/src/main/java/org/lamisplus/modules/hts/service/HtsEncounterService.java b/src/main/java/org/lamisplus/modules/hts/service/HtsEncounterService.java index fb87320d..d4656a0b 100644 --- a/src/main/java/org/lamisplus/modules/hts/service/HtsEncounterService.java +++ b/src/main/java/org/lamisplus/modules/hts/service/HtsEncounterService.java @@ -26,7 +26,6 @@ import java.math.BigInteger; import java.time.LocalDate; import java.util.List; -import java.util.UUID; import java.util.stream.Collectors; @Service @@ -108,7 +107,7 @@ public Page search(Long facilityId, String search, Pageabl return repository.search(facilityId, searchParam, pageable).map(this::toResponse); } - public HtsEncounterResponse getForProphylaxis(LocalDate screeningDate, UUID patientUuid) { + public HtsEncounterResponse getForProphylaxis(LocalDate screeningDate, String patientUuid) { HtsEncounter encounter = repository .findFirstByPatientUuidAndDateOfVisitAndArchivedOrderByIdDesc(patientUuid, screeningDate, false) .orElseThrow(() -> new EntityNotFoundException( @@ -168,7 +167,7 @@ public Page getHtsPatientSummaries(String search, Pageable ); Long facilityId = currentUserOrganizationService.getCurrentUserOrganization(); - Page raw = repository.findHtsPatientSummaries(facilityId, searchParam, pageableWithoutSort); + Page raw = repository.findHtsPatientSummariesOptimized(facilityId, searchParam, pageableWithoutSort); return raw.map(row -> { HtsPatientSummaryDto dto = new HtsPatientSummaryDto(); @@ -308,10 +307,13 @@ private void putStr(ObjectNode node, String key, String value) { if (value != null) node.put(key, value); } - private UUID resolveUuid(Object uuid) { - if (uuid instanceof UUID) return (UUID) uuid; - if (uuid instanceof String) return UUID.fromString((String) uuid); - return null; + // Relaxed: patient_uuid is stored as varchar to tolerate legacy/migrated data + // that isn't a strictly well-formed UUID (e.g. "787-KXoSesiSLeE-787"). We no + // longer call UUID.fromString() here — doing so throws IllegalArgumentException + // and rejects the whole save/update for records we still need to support. + private String resolveUuid(Object uuid) { + if (uuid == null) return null; + return uuid.toString(); } private long toLong(Object val) { diff --git a/src/main/resources/installers/hts/encounter_schema.xml b/src/main/resources/installers/hts/encounter_schema.xml index de88db34..f764ff2e 100644 --- a/src/main/resources/installers/hts/encounter_schema.xml +++ b/src/main/resources/installers/hts/encounter_schema.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> diff --git a/src/main/resources/installers/hts/harmonise_new_hts_tables.xml b/src/main/resources/installers/hts/harmonise_new_hts_tables.xml index 51418009..3140421d 100644 --- a/src/main/resources/installers/hts/harmonise_new_hts_tables.xml +++ b/src/main/resources/installers/hts/harmonise_new_hts_tables.xml @@ -1,8 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd" +> @@ -285,7 +285,7 @@ ALTER TABLE hts_encounter - ALTER COLUMN client_code TYPE VARCHAR(200) USING client_code::VARCHAR(200), + ALTER COLUMN client_code TYPE VARCHAR(200) USING client_code::VARCHAR(200), ALTER COLUMN setting TYPE VARCHAR(200) USING setting::VARCHAR(200), ALTER COLUMN source TYPE VARCHAR(200) USING source::VARCHAR(200), ALTER COLUMN latitude TYPE VARCHAR(200) USING latitude::VARCHAR(200), @@ -295,13 +295,13 @@ ALTER TABLE hts_encounter - ALTER COLUMN client_code TYPE VARCHAR(50), - ALTER COLUMN setting TYPE VARCHAR(50), - ALTER COLUMN source TYPE VARCHAR(50), - ALTER COLUMN latitude TYPE VARCHAR(50), - ALTER COLUMN longitude TYPE VARCHAR(50), - ALTER COLUMN created_by TYPE VARCHAR(50), - ALTER COLUMN modified_by TYPE VARCHAR(50); + ALTER COLUMN client_code TYPE VARCHAR(50), + ALTER COLUMN setting TYPE VARCHAR(50), + ALTER COLUMN source TYPE VARCHAR(50), + ALTER COLUMN latitude TYPE VARCHAR(50), + ALTER COLUMN longitude TYPE VARCHAR(50), + ALTER COLUMN created_by TYPE VARCHAR(50), + ALTER COLUMN modified_by TYPE VARCHAR(50); @@ -313,15 +313,15 @@ ALTER TABLE hts_ict_encounter - ALTER COLUMN setting TYPE VARCHAR(200) USING setting::VARCHAR(200), + ALTER COLUMN setting TYPE VARCHAR(200) USING setting::VARCHAR(200), ALTER COLUMN created_by TYPE VARCHAR(200) USING created_by::VARCHAR(200), ALTER COLUMN modified_by TYPE VARCHAR(200) USING modified_by::VARCHAR(200); ALTER TABLE hts_ict_encounter - ALTER COLUMN setting TYPE VARCHAR(100), - ALTER COLUMN created_by TYPE VARCHAR(255), - ALTER COLUMN modified_by TYPE VARCHAR(255); + ALTER COLUMN setting TYPE VARCHAR(100), + ALTER COLUMN created_by TYPE VARCHAR(255), + ALTER COLUMN modified_by TYPE VARCHAR(255); @@ -332,13 +332,13 @@ ALTER TABLE hts_ict_contact - ALTER COLUMN created_by TYPE VARCHAR(200) USING created_by::VARCHAR(200), + ALTER COLUMN created_by TYPE VARCHAR(200) USING created_by::VARCHAR(200), ALTER COLUMN modified_by TYPE VARCHAR(200) USING modified_by::VARCHAR(200); ALTER TABLE hts_ict_contact - ALTER COLUMN created_by TYPE VARCHAR(255), - ALTER COLUMN modified_by TYPE VARCHAR(255); + ALTER COLUMN created_by TYPE VARCHAR(255), + ALTER COLUMN modified_by TYPE VARCHAR(255); @@ -398,7 +398,7 @@ -- Retype the column ALTER TABLE hts_encounter - ALTER COLUMN uuid TYPE VARCHAR(50) USING uuid::text; + ALTER COLUMN uuid TYPE VARCHAR(50) USING uuid::text; -- Restore the default and unique constraint ALTER TABLE hts_encounter @@ -420,11 +420,11 @@ Convert hts_encounter.patient_uuid from UUID to VARCHAR(50). ALTER TABLE hts_encounter - ALTER COLUMN patient_uuid TYPE VARCHAR(50) USING patient_uuid::text; + ALTER COLUMN patient_uuid TYPE VARCHAR(50) USING patient_uuid::text; ALTER TABLE hts_encounter - ALTER COLUMN patient_uuid TYPE UUID USING patient_uuid::uuid; + ALTER COLUMN patient_uuid TYPE UUID USING patient_uuid::uuid; @@ -435,7 +435,7 @@ ALTER TABLE hts_ict_encounter DROP CONSTRAINT IF EXISTS hts_ict_encounter_uuid_key; ALTER TABLE hts_ict_encounter - ALTER COLUMN uuid TYPE VARCHAR(50) USING uuid::text; + ALTER COLUMN uuid TYPE VARCHAR(50) USING uuid::text; ALTER TABLE hts_ict_encounter ALTER COLUMN uuid SET DEFAULT gen_random_uuid()::text; @@ -456,11 +456,11 @@ Convert hts_ict_encounter.patient_uuid from UUID to VARCHAR(50). ALTER TABLE hts_ict_encounter - ALTER COLUMN patient_uuid TYPE VARCHAR(50) USING patient_uuid::text; + ALTER COLUMN patient_uuid TYPE VARCHAR(50) USING patient_uuid::text; ALTER TABLE hts_ict_encounter - ALTER COLUMN patient_uuid TYPE UUID USING patient_uuid::uuid; + ALTER COLUMN patient_uuid TYPE UUID USING patient_uuid::uuid; @@ -471,7 +471,7 @@ ALTER TABLE hts_ict_contact DROP CONSTRAINT IF EXISTS hts_ict_contact_uuid_key; ALTER TABLE hts_ict_contact - ALTER COLUMN uuid TYPE VARCHAR(50) USING uuid::text; + ALTER COLUMN uuid TYPE VARCHAR(50) USING uuid::text; ALTER TABLE hts_ict_contact ALTER COLUMN uuid SET DEFAULT gen_random_uuid()::text; @@ -521,12 +521,12 @@ ALTER TABLE hts_ict_encounter - DROP CONSTRAINT IF EXISTS fk_ict_encounter_hts; + DROP CONSTRAINT IF EXISTS fk_ict_encounter_hts; ALTER TABLE hts_ict_encounter - ADD CONSTRAINT fk_ict_encounter_hts - FOREIGN KEY (hts_encounter_id) REFERENCES hts_encounter(id); + ADD CONSTRAINT fk_ict_encounter_hts + FOREIGN KEY (hts_encounter_id) REFERENCES hts_encounter(id); @@ -542,7 +542,7 @@ ALTER TABLE hts_ict_encounter - DROP CONSTRAINT IF EXISTS fk_ict_encounter_hts_uuid; + DROP CONSTRAINT IF EXISTS fk_ict_encounter_hts_uuid; @@ -583,12 +583,12 @@ ALTER TABLE hts_ict_contact - DROP CONSTRAINT IF EXISTS fk_ict_contact_encounter; + DROP CONSTRAINT IF EXISTS fk_ict_contact_encounter; ALTER TABLE hts_ict_contact - ADD CONSTRAINT fk_ict_contact_encounter - FOREIGN KEY (ict_encounter_id) REFERENCES hts_ict_encounter(id); + ADD CONSTRAINT fk_ict_contact_encounter + FOREIGN KEY (ict_encounter_id) REFERENCES hts_ict_encounter(id); @@ -604,7 +604,7 @@ ALTER TABLE hts_ict_contact - DROP CONSTRAINT IF EXISTS fk_ict_contact_encounter_uuid; + DROP CONSTRAINT IF EXISTS fk_ict_contact_encounter_uuid; @@ -630,26 +630,26 @@ ═══════════════════════════════════════════════════════════════════════ --> - - - Convert pmtct_hts from jsonb to boolean where it may still be jsonb. - - - ALTER TABLE hts_encounter - ALTER COLUMN pmtct_hts TYPE boolean + + + Convert pmtct_hts from jsonb to boolean where it may still be jsonb. + + + ALTER TABLE hts_encounter + ALTER COLUMN pmtct_hts TYPE boolean USING COALESCE((pmtct_hts::text)::boolean, false); - ALTER TABLE hts_encounter - ALTER COLUMN pmtct_hts SET DEFAULT false; + ALTER TABLE hts_encounter + ALTER COLUMN pmtct_hts SET DEFAULT false; - ALTER TABLE hts_encounter - ALTER COLUMN pmtct_hts SET NOT NULL; - - - ALTER TABLE hts_encounter - ALTER COLUMN pmtct_hts TYPE jsonb USING to_jsonb(pmtct_hts); - - + ALTER TABLE hts_encounter + ALTER COLUMN pmtct_hts SET NOT NULL; + + + ALTER TABLE hts_encounter + ALTER COLUMN pmtct_hts TYPE jsonb USING to_jsonb(pmtct_hts); + + @@ -928,4 +928,96 @@ - + + + UPDATE hts_encounter he + SET + setting = r.entry_point, + observation = jsonb_set( + he.observation, + '{facilitySetting}', + to_jsonb(r.testing_setting::text), + true + ) + FROM hts_client h + JOIN hts_risk_stratification r + ON r.code = h.risk_stratification_code + WHERE he.uuid = h.uuid; + + + + + + Backfills / corrects the derived "finalHivTestResult" field inside the + hts_encounter.observation JSONB column, using the same logic as + DiagnosticTestingSection.jsx: + + Path A (typeOfHivTestDone = TYPE_OF_HIV_TEST_HIV_EARLY_DETECT): + - hivEarlyDetectResult is Antigen Reactive or Antigen+Antibody Reactive + -> "Suspected Acute Infection" + - hivEarlyDetectResult is Antibody Reactive + -> confirmatoryHivTest positive -> "Positive" + -> confirmatoryHivTest negative -> "Negative" + + Path B (typeOfHivTestDone = TYPE_OF_HIV_TEST_RAPID_ANTIBODY): + - initialHivTest = STI_HIV_RESULT_NEGATIVE -> "Negative" + - initialHivTest = STI_HIV_RESULT_POSITIVE + -> confirmatoryHivTest positive -> "Positive" + -> confirmatoryHivTest negative -> "Negative" + + Any record for which none of the above branches resolve to a value + (incomplete data, unrecognised typeOfHivTestDone, etc.) is left + untouched — we only ever write a value we can actually derive. + + + WITH computed AS ( + SELECT + id, + CASE + WHEN observation->>'typeOfHivTestDone' = 'TYPE_OF_HIV_TEST_HIV_EARLY_DETECT' THEN + CASE + WHEN observation->>'hivEarlyDetectResult' IN ( + 'HIV_EARLY_DETECT_RESULT_ANTIGEN_REACTIVE', + 'HIV_EARLY_DETECT_RESULT_ANTIGEN_+_ANTIBODY_REACTIVE' + ) THEN 'Suspected Acute Infection' + WHEN observation->>'hivEarlyDetectResult' = 'HIV_EARLY_DETECT_RESULT_ANTIBODY_REACTIVE' THEN + CASE + WHEN lower(observation->>'confirmatoryHivTest') = 'hiv_confirmatory_test_result_positive' THEN 'Positive' + WHEN lower(observation->>'confirmatoryHivTest') = 'hiv_confirmatory_test_result_negative' THEN 'Negative' + ELSE NULL + END + ELSE NULL + END + WHEN observation->>'typeOfHivTestDone' = 'TYPE_OF_HIV_TEST_RAPID_ANTIBODY' THEN + CASE + WHEN observation->>'initialHivTest' = 'STI_HIV_RESULT_NEGATIVE' THEN 'Negative' + WHEN observation->>'initialHivTest' = 'STI_HIV_RESULT_POSITIVE' THEN + CASE + WHEN lower(observation->>'confirmatoryHivTest') = 'hiv_confirmatory_test_result_positive' THEN 'Positive' + WHEN lower(observation->>'confirmatoryHivTest') = 'hiv_confirmatory_test_result_negative' THEN 'Negative' + ELSE NULL + END + ELSE NULL + END + ELSE NULL + END AS computed_result + FROM public.hts_encounter + WHERE observation IS NOT NULL + ) + UPDATE public.hts_encounter e + SET observation = jsonb_set(e.observation, '{finalHivTestResult}', to_jsonb(c.computed_result::text), true) + FROM computed c + WHERE e.id = c.id + AND c.computed_result IS NOT NULL + AND (e.observation->>'finalHivTestResult') IS DISTINCT FROM c.computed_result; + + + + Not reversible: the prior values of finalHivTestResult (blank or + incorrect) are not preserved anywhere, so there's nothing safe to + roll back to. If you need reversibility, snapshot the affected + rows into a temp table before running this in production. + + + + \ No newline at end of file diff --git a/src/main/resources/installers/hts/updates.xml b/src/main/resources/installers/hts/updates.xml index 10980c74..695d3535 100644 --- a/src/main/resources/installers/hts/updates.xml +++ b/src/main/resources/installers/hts/updates.xml @@ -31,31 +31,31 @@ CREATE TABLE hivst ( - id SERIAL PRIMARY KEY, - patient_id BIGINT, - date_of_visit DATE, - service_delivery_point VARCHAR(255), - user_type VARCHAR(255), - serial_number VARCHAR(255), - client_code VARCHAR(255), - previously_tested_within_12_months VARCHAR(255), - result_of_previously_tested_within_12_months VARCHAR(255), - consent_for_follow_up_calls VARCHAR(255), - type_of_hivst_kit_received VARCHAR(255), - number_of_hivst_kits_received BIGINT, - name_of_test_kit VARCHAR(255), - lot_number VARCHAR(255), - expiry_date DATE, - test_kit_users JSONB, - other_test_kit_user_info_available VARCHAR(255), - other_test_kit_user_details JSONB, - part_b JSONB, - referral_information JSONB, - archived INTEGER DEFAULT 0, - created_by VARCHAR(255) NOT NULL, - date_created TIMESTAMP NOT NULL, - modified_by VARCHAR(255), - date_modified TIMESTAMP + id SERIAL PRIMARY KEY, + patient_id BIGINT, + date_of_visit DATE, + service_delivery_point VARCHAR(255), + user_type VARCHAR(255), + serial_number VARCHAR(255), + client_code VARCHAR(255), + previously_tested_within_12_months VARCHAR(255), + result_of_previously_tested_within_12_months VARCHAR(255), + consent_for_follow_up_calls VARCHAR(255), + type_of_hivst_kit_received VARCHAR(255), + number_of_hivst_kits_received BIGINT, + name_of_test_kit VARCHAR(255), + lot_number VARCHAR(255), + expiry_date DATE, + test_kit_users JSONB, + other_test_kit_user_info_available VARCHAR(255), + other_test_kit_user_details JSONB, + part_b JSONB, + referral_information JSONB, + archived INTEGER DEFAULT 0, + created_by VARCHAR(255) NOT NULL, + date_created TIMESTAMP NOT NULL, + modified_by VARCHAR(255), + date_modified TIMESTAMP ); @@ -80,6 +80,7 @@ + @@ -91,6 +92,9 @@ + + + ALTER TABLE hts_risk_stratification ADD COLUMN spoke_facility varchar(255); @@ -101,6 +105,9 @@ + + + ALTER TABLE hts_risk_stratification ADD COLUMN health_facility varchar(255); @@ -131,6 +138,7 @@ + @@ -152,7 +160,7 @@ ALTER TABLE hts_family_index_testing_tracker - ALTER COLUMN attempts SET DATA TYPE character varying USING attempts::text; + ALTER COLUMN attempts SET DATA TYPE character varying USING attempts::text; @@ -161,16 +169,18 @@ ALTER TABLE hts_family_index_testing_tracker - RENAME COLUMN attempts TO attempt; + RENAME COLUMN attempts TO attempt; - + + + UPDATE hts_risk_stratification SET entry_point = 'HTS_ENTRY_POINT_FACILITY' - where entry_point = 'Facility'; + where entry_point = 'Facility'; UPDATE hts_risk_stratification SET entry_point = 'HTS_ENTRY_POINT_COMMUNITY' where entry_point = 'Community'; @@ -178,7 +188,9 @@ - + + + UPDATE hts_risk_stratification SET testing_setting = 'COMMUNITY_HTS_TEST_SETTING_DELIVERY_HOMES' WHERE testing_setting = 'COMMUNITY_HTS_TEST_SETTING_DELIVERY_HOMES'; UPDATE hts_risk_stratification SET testing_setting = 'FACILITY_HTS_TEST_SETTING_CT' WHERE testing_setting = 'TEST_SETTING_CT'; @@ -235,7 +247,9 @@ - + + + UPDATE hts_client SET testing_setting = 'COMMUNITY_HTS_TEST_SETTING_DELIVERY_HOMES' WHERE testing_setting = 'COMMUNITY_HTS_TEST_SETTING_DELIVERY_HOMES'; UPDATE hts_client SET testing_setting = 'FACILITY_HTS_TEST_SETTING_CT' WHERE testing_setting = 'TEST_SETTING_CT'; @@ -291,4 +305,84 @@ + + + -- hts_encounter: DISTINCT ON latest + window COUNT driver + -- (filter on facility_id+archived, then order by patient_uuid, id DESC). + CREATE INDEX IF NOT EXISTS idx_hts_encounter_grid_latest + ON hts_encounter (facility_id, archived, patient_uuid, id DESC); + + -- hts_encounter: EXISTS semi-join in the lean count query. + CREATE INDEX IF NOT EXISTS idx_hts_encounter_grid_count + ON hts_encounter (patient_uuid, facility_id, archived); + + -- hts_ict_encounter: grouped ict_count CTE. + CREATE INDEX IF NOT EXISTS idx_hts_ict_encounter_grid_count + ON hts_ict_encounter (facility_id, archived, patient_uuid); + + + + + + DROP FUNCTION IF EXISTS is_pmtct_infant(TEXT); + + + + + + + -- patient_person driver + ORDER BY created_date DESC. + CREATE INDEX IF NOT EXISTS idx_patient_person_facility_arch_created + ON patient_person (facility_id, archived, created_date DESC); + + -- NOT EXISTS #1: hts_encounter.client_code = patient_person.hospital_number. + CREATE INDEX IF NOT EXISTS idx_hts_encounter_facility_arch_client_code + ON hts_encounter (facility_id, archived, client_code); + + -- NOT EXISTS #2: CAST(hts_encounter.patient_uuid AS TEXT) = patient_person.uuid. + CREATE INDEX IF NOT EXISTS idx_hts_encounter_facility_arch_uuid_text + ON hts_encounter (facility_id, archived, (CAST(patient_uuid AS text))); + + -- "HTS Patients Archived" tab (findOnlyPersonHts): DISTINCT ON first + -- (earliest) registration per person + per-person count. + CREATE INDEX IF NOT EXISTS idx_hts_client_facility_arch_person_created + ON hts_client (facility_id, archived, person_uuid, date_created); + + -- "HIVST Patients" tab (findAllPersonHivst): hivst ⋈ patient_person. + CREATE INDEX IF NOT EXISTS idx_hivst_patient_archived + ON hivst (patient_id, archived); + CREATE INDEX IF NOT EXISTS idx_patient_person_facility_arch_id + ON patient_person (facility_id, archived, id); + + + + + + CREATE OR REPLACE FUNCTION pmtct_infant_hospital_numbers() + RETURNS SETOF text + LANGUAGE plpgsql + STABLE + AS $func$ + BEGIN + IF to_regclass('public.pmtct_infant_information') IS NULL THEN + RETURN; + END IF; + + RETURN QUERY EXECUTE ' + SELECT infant_hospital_number + FROM public.pmtct_infant_information + WHERE infant_hospital_number IS NOT NULL + '; + + EXCEPTION WHEN OTHERS THEN + -- Table exists but column/shape differs on this facility: stay safe. + RETURN; + END; + $func$; + + + DROP FUNCTION IF EXISTS pmtct_infant_hospital_numbers(); + + + \ No newline at end of file diff --git a/src/main/webapp/api.js b/src/main/webapp/api.js index 0c47ea4d..d9c9aa9d 100644 --- a/src/main/webapp/api.js +++ b/src/main/webapp/api.js @@ -4,7 +4,7 @@ export const url = : "/api/v1/"; export const token = process.env.NODE_ENV === "development" - ? "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJyZGUtdXNlciIsImF1dGgiOiJTdXBlciBBZG1pbixVc2VyLFJERSIsImV4cCI6MTc4MDUwMjcxNSwibmFtZSI6InJkZS11c2VyIGxhc3RuYW1lIn0.JmZiXX_viGAUfgIt4iSgHucV558YNJ7LQ63yAh2RA6uETvIUpPwCHaGCBneqL-9BBRAm8sVA7C9PEnJb1-h0LA" + ? "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJyZGUtdXNlciIsImF1dGgiOiJTdXBlciBBZG1pbixVc2VyLFJERSIsImV4cCI6MTc4NDgxOTgwMywibmFtZSI6InJkZS11c2VyIGxhc3RuYW1lIn0.EQvz3OVEzcWLyjtgpYWca5no5qSP7amxZZLxC_0lAzWjTswwsgF5x_yZ8KbNM-3dsAm8oRyhxzp5t05LDCRVVg" : new URLSearchParams(window.location.search).get("jwt"); export const wsUrl = diff --git a/src/main/webapp/jsx/components/History/HTSEncounterHistory.js b/src/main/webapp/jsx/components/History/HTSEncounterHistory.js index 71db7b1e..7781a652 100644 --- a/src/main/webapp/jsx/components/History/HTSEncounterHistory.js +++ b/src/main/webapp/jsx/components/History/HTSEncounterHistory.js @@ -297,6 +297,14 @@ const formatHivResult = (rawCode) => { return ; }; +const formatPmtct = (rawCode) => { + if (rawCode?.pmtctHts === true) { + return TRUE + } + return FALSE; +}; + + const formatSyphilisResult = (rawCode) => { const { display, color } = mapResultCode(rawCode, SYPHILIS_RESULT_MAP); return ; @@ -411,6 +419,12 @@ const HTSEncounterHistory = (props) => { filtering: false, render: (rowData) => formatHivResult(rowData?.finalHivTestResult), }, + { + title: "PMTCT-HTS record", + field: "pmtctHts", + filtering: false, + render: (rowData) => formatPmtct(rowData), + }, { title: "Suspected Acute Infection", field: "suspectedAcuteInfection", @@ -472,6 +486,7 @@ const HTSEncounterHistory = (props) => { suspectedAcuteInfection: record.observation?.suspectedAcuteInfection ?? "", hivEarlyDetectResult: record.observation?.hivEarlyDetectResult ?? "", typeOfHivTestDone: record.observation?.typeOfHivTestDone ?? "", + pmtctHts: record?.pmtctHts ?? "", _raw: record, }))} options={{ diff --git a/src/main/webapp/jsx/components/IctForm/IctForm.jsx b/src/main/webapp/jsx/components/IctForm/IctForm.jsx index 6593b2c8..fc386390 100644 --- a/src/main/webapp/jsx/components/IctForm/IctForm.jsx +++ b/src/main/webapp/jsx/components/IctForm/IctForm.jsx @@ -111,7 +111,7 @@ const mapIctResponseToFormValues = (response) => { indexFirstName: d.indexFirstName ?? "", indexMiddleName: d.indexMiddleName ?? "", indexSurname: d.indexSurname ?? "", - indexSex: d.indexSex ?? "", // codeset code — display resolved in Section A + indexSex: d.indexSex ?? "", // codeset code - display resolved in Section A indexDob: d.indexDob ?? "", indexAge: d.indexAge != null ? String(d.indexAge) : "", indexPhone: d.indexPhone ?? "", @@ -289,9 +289,9 @@ const IctForm = ({

{readOnly - ? "Viewing ICT record — no changes can be made" + ? "Viewing ICT record - no changes can be made" : isEditMode - ? "Editing existing ICT record — all fields are editable" + ? "Editing existing ICT record - all fields are editable" : "Complete Section A, then add all elicited contacts in Section B"}

@@ -309,7 +309,7 @@ const IctForm = ({ }; const { formik } = useNewPatientFormik(onSubmit); + console.log(formik) + // Real-time value forwarding for the orchestrator eligibility watcher React.useEffect(() => { onValuesChange?.(formik.values); diff --git a/src/main/webapp/jsx/components/NewToolForms/ExistingPatientHtsForm.jsx b/src/main/webapp/jsx/components/NewToolForms/ExistingPatientHtsForm.jsx index 4bf22c51..ef1ef0af 100644 --- a/src/main/webapp/jsx/components/NewToolForms/ExistingPatientHtsForm.jsx +++ b/src/main/webapp/jsx/components/NewToolForms/ExistingPatientHtsForm.jsx @@ -303,6 +303,9 @@ const ExistingPatientHtsForm = ({ fullRecord, initialValues, readOnly = false, b const { formik } = useExistingPatientFormik(onSubmit, formInitialValues); + console.log(formik) + + const { errors, submitCount } = formik; const hasSubmitted = submitCount > 0; diff --git a/src/main/webapp/jsx/components/NewToolForms/NewEncounterHtsForm.jsx b/src/main/webapp/jsx/components/NewToolForms/NewEncounterHtsForm.jsx index 69ef43b1..180d374b 100644 --- a/src/main/webapp/jsx/components/NewToolForms/NewEncounterHtsForm.jsx +++ b/src/main/webapp/jsx/components/NewToolForms/NewEncounterHtsForm.jsx @@ -231,6 +231,9 @@ const NewEncounterHtsForm = ({ person, backButtonAction, onValuesChange, onSubmi onSubmit, }); + console.log(formik) + + useEffect(() => { onValuesChange?.(formik.values); }, [formik.values]); // eslint-disable-line react-hooks/exhaustive-deps diff --git a/src/main/webapp/jsx/components/NewToolForms/NewPatientHtsForm.jsx b/src/main/webapp/jsx/components/NewToolForms/NewPatientHtsForm.jsx index 0fcbfa60..a3634e55 100644 --- a/src/main/webapp/jsx/components/NewToolForms/NewPatientHtsForm.jsx +++ b/src/main/webapp/jsx/components/NewToolForms/NewPatientHtsForm.jsx @@ -64,6 +64,8 @@ const NewPatientHtsForm = ({ onValuesChange, onSubmitSuccess, onBack } = {}) => const { formik } = useNewPatientFormik(onSubmit); + console.log(formik) + const onSubmit = async (values) => { const payload = buildHtsEncounterPayload(values, true); diff --git a/src/main/webapp/jsx/components/NewToolForms/hooks/validationSchema.js b/src/main/webapp/jsx/components/NewToolForms/hooks/validationSchema.js index 9e4846d9..88e0bbe7 100644 --- a/src/main/webapp/jsx/components/NewToolForms/hooks/validationSchema.js +++ b/src/main/webapp/jsx/components/NewToolForms/hooks/validationSchema.js @@ -173,11 +173,11 @@ export const buildValidationSchema = (isNewPatient) => { serialNumber: yup .string() - .required("Serial number is required to generate a client code") - .matches( - /^[a-zA-Z0-9]+$/, - "Serial number must contain only letters and numbers — no special characters" - ), + .required("Serial number is required to generate a client code"), + // .matches( + // /^[a-zA-Z0-9]+$/, + // "Serial number must contain only letters and numbers — no special characters" + // ), setting: yup.string().required("Setting is required"), @@ -232,14 +232,17 @@ export const buildValidationSchema = (isNewPatient) => { return !!value || this.createError({ message: "Index client code/ID is required" }); } ), - previouslyTestedNegative: yup.mixed().test( - "prev-tested-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), + // previouslyTestedNegative: yup.mixed().test( + // "prev-tested-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + previouslyTestedNegative: yup.string().nullable(), + timeOfLastNegativeTest: yup.mixed().test( "time-last-negative-conditional", "Time of last negative test is required", @@ -249,108 +252,134 @@ export const buildValidationSchema = (isNewPatient) => { return !!value || this.createError({ message: "Time of last negative test is required" }); } ), - clientInformedTransmissionRoutes: yup.mixed().test( - "transmission-routes-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - clientInformedRiskFactors: yup.mixed().test( - "risk-factors-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - clientInformedPreventionMethods: yup.mixed().test( - "prevention-methods-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - clientInformedPossibleResults: yup.mixed().test( - "possible-results-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - informedConsentGiven: yup.mixed().test( - "consent-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - everHadSexualIntercourse: yup.mixed().test( - "ever-sex-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - moreThanOneSexPartner: yup.mixed().test( - "multi-partner-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - unprotectedVaginalSex: yup.mixed().test( - "vaginal-sex-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.sex !== "SEX_FEMALE") return true; - if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - unprotectedAnalSex: yup.mixed().test( - "anal-sex-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - bloodTransfusionLast3Months: yup.mixed().test( - "blood-transfusion-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - sexUnderInfluence: yup.mixed().test( - "sex-influence-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - historyOfSTI: yup.mixed().test( - "sti-history-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), + // clientInformedTransmissionRoutes: yup.mixed().test( + // "transmission-routes-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + clientInformedTransmissionRoutes: yup.string().nullable(), + clientInformedRiskFactors: yup.string().nullable(), + clientInformedPreventionMethods: yup.string().nullable(), + clientInformedPossibleResults: yup.string().nullable(), + informedConsentGiven: yup.string().nullable(), + // clientInformedRiskFactors: yup.mixed().test( + // "risk-factors-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + // clientInformedPreventionMethods: yup.mixed().test( + // "prevention-methods-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + // clientInformedPossibleResults: yup.mixed().test( + // "possible-results-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + // informedConsentGiven: yup.mixed().test( + // "consent-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + everHadSexualIntercourse: yup.string().nullable(), + + // everHadSexualIntercourse: yup.mixed().test( + // "ever-sex-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + moreThanOneSexPartner: yup.string().nullable(), + + // moreThanOneSexPartner: yup.mixed().test( + // "multi-partner-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + unprotectedVaginalSex: yup.string().nullable(), + + // unprotectedVaginalSex: yup.mixed().test( + // "vaginal-sex-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.sex !== "SEX_FEMALE") return true; + // if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + unprotectedAnalSex:yup.string().nullable(), + + // unprotectedAnalSex: yup.mixed().test( + // "anal-sex-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + // bloodTransfusionLast3Months: yup.mixed().test( + // "blood-transfusion-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + bloodTransfusionLast3Months: yup.string().nullable(), + sexUnderInfluence:yup.string().nullable(), + + // sexUnderInfluence: yup.mixed().test( + // "sex-influence-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + historyOfSTI: yup.string().nullable(), + + // historyOfSTI: yup.mixed().test( + // "sti-history-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), currentCough: yup.mixed().test( "curent-cough-conditional", "This field is required", @@ -383,116 +412,142 @@ export const buildValidationSchema = (isNewPatient) => { return !!value || this.createError({ message: "This field is required" }); } ), - complaintsVaginalDischarge: yup.mixed().test( - "vaginal-discharge-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.sex !== "SEX_FEMALE") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - complaintsLowerAbdominalPain: yup.mixed().test( - "lower-abdominal-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.sex !== "SEX_FEMALE") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - complaintsUrethralDischarge: yup.mixed().test( - "urethral-discharge-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.sex !== "SEX_MALE") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - complaintsScroralSwelling: yup.mixed().test( - "scrotal-swelling-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.sex !== "SEX_MALE") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - complaintsGenitalSores: yup.mixed().test( - "complaint-genital-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - complaintsSwollenLymphNodes: yup.mixed().test( - "complaint-swollen-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - partnerNewlyDiagnosed: yup.mixed().test( - "partner-new-dx-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - partnerPregnantOnArv: yup.mixed().test( - "partner-pmtct-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - adolescentHivPositive: yup.mixed().test( - "adolescent-hiv-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; - // Use resolveAge so the check works whether age comes from the - // age field or is derived from dateOfBirth (avoids invisible required error) - const age = resolveAge(this.parent); - if (age === null || age < 10 || age > 19) return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - partnerNotRegularlyOnDrugs: yup.mixed().test( - "partner-not-drugs-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - partnerRecentlyReturnedToTreatment: yup.mixed().test( - "partner-ltfu-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), - hadSexWithHivPositivePartnerInRiskGroup: yup.mixed().test( - "had-sex-with-hiv-conditional", - "This field is required", - function (value) { - if (skipKnowledgeAndRisk(this)) return true; - if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; - return !!value || this.createError({ message: "This field is required" }); - } - ), + complaintsVaginalDischarge: yup.string().nullable(), + + // complaintsVaginalDischarge: yup.mixed().test( + // "vaginal-discharge-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.sex !== "SEX_FEMALE") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + complaintsLowerAbdominalPain: yup.string().nullable(), + + // complaintsLowerAbdominalPain: yup.mixed().test( + // "lower-abdominal-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.sex !== "SEX_FEMALE") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + // complaintsUrethralDischarge: yup.mixed().test( + // "urethral-discharge-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.sex !== "SEX_MALE") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + complaintsUrethralDischarge: yup.string().nullable(), + complaintsScroralSwelling: yup.string().nullable(), + complaintsGenitalSores: yup.string().nullable(), + complaintsSwollenLymphNodes: yup.string().nullable(), + // complaintsScroralSwelling: yup.mixed().test( + // "scrotal-swelling-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.sex !== "SEX_MALE") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + // complaintsGenitalSores: yup.mixed().test( + // "complaint-genital-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + // complaintsSwollenLymphNodes: yup.mixed().test( + // "complaint-swollen-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + partnerNewlyDiagnosed: yup.string().nullable(), + + // partnerNewlyDiagnosed: yup.mixed().test( + // "partner-new-dx-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + partnerPregnantOnArv: yup.string().nullable(), + + // partnerPregnantOnArv: yup.mixed().test( + // "partner-pmtct-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + adolescentHivPositive: yup.string().nullable(), + + // adolescentHivPositive: yup.mixed().test( + // "adolescent-hiv-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; + // // Use resolveAge so the check works whether age comes from the + // // age field or is derived from dateOfBirth (avoids invisible required error) + // const age = resolveAge(this.parent); + // if (age === null || age < 10 || age > 19) return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + // partnerNotRegularlyOnDrugs: yup.mixed().test( + // "partner-not-drugs-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + partnerNotRegularlyOnDrugs: yup.string().nullable(), + partnerRecentlyReturnedToTreatment: yup.string().nullable(), + + // partnerRecentlyReturnedToTreatment: yup.mixed().test( + // "partner-ltfu-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + + hadSexWithHivPositivePartnerInRiskGroup: yup.string().nullable(), + + // hadSexWithHivPositivePartnerInRiskGroup: yup.mixed().test( + // "had-sex-with-hiv-conditional", + // "This field is required", + // function (value) { + // if (skipKnowledgeAndRisk(this)) return true; + // if (this.parent.everHadSexualIntercourse !== "YES_NO_YES") return true; + // return !!value || this.createError({ message: "This field is required" }); + // } + // ), + typeOfHivTestDone: yup.string().required("This field is required"), hivEarlyDetectResult: yup.mixed().test( "earlyDetectResult-conditional", @@ -539,9 +594,27 @@ export const buildValidationSchema = (isNewPatient) => { ), - recencyTest: yup.string(), - previouslyTestedThisYear: yup.string().required("This field is required"), - clientReceivedTestResult: yup.string().required("This field is required"), + // recencyTest: yup.string(), + + syphilisTestResult: yup.string().required("Syphilis Test Result is required"), + + recencyTest: yup.mixed().test( + "recencyTest-conditional", + "Recency test result is required", + function (value) { + // Mirrors DiagnosticTestingSection's `showRecency` flag: + // the field is only rendered — and therefore only required — + // when the initial HIV test result is Positive. + if (this.parent.initialHivTest !== "STI_HIV_RESULT_POSITIVE") return true; + return !!value || this.createError({ message: "Recency test result is required" }); + } + ), + + + // previouslyTestedThisYear: yup.string().required("This field is required"), + previouslyTestedThisYear: yup.string().nullable(), + clientReceivedTestResult: yup.string().nullable(), + // clientReceivedTestResult: yup.string().required("This field is required"), hivTestKitsProvided: yup.string().required("This field is required"), categoryOfClients: yup.mixed().test( @@ -588,11 +661,16 @@ export const buildValidationSchema = (isNewPatient) => { return !!value || this.createError({ message: "Accepted Index testing is required when confirmatory HIV test is positive" }); } ), - providedFpInfo: yup.string().required("This field is required"), - clientPartnerUseFpMethods: yup.string().required("This field is required"), - clientPartnerUseCondoms: yup.string().required("This field is required"), - correctCondomUseDemonstrated: yup.string().required("This field is required"), - condomsProvided: yup.string().required("This field is required"), + providedFpInfo: yup.string().nullable(), + // providedFpInfo: yup.string().required("This field is required"), + clientPartnerUseFpMethods: yup.string().nullable(), + // clientPartnerUseFpMethods: yup.string().required("This field is required"), + clientPartnerUseCondoms: yup.string().nullable(), + // clientPartnerUseCondoms: yup.string().required("This field is required"), + correctCondomUseDemonstrated: yup.string().nullable(), + // correctCondomUseDemonstrated: yup.string().required("This field is required"), + condomsProvided: yup.string().nullable(), + // condomsProvided: yup.string().required("This field is required"), clientReferredToOtherServices: yup.string().required("This field is required"), completedBy: yup.string().required("This field is required"), designation: yup.string().required("This field is required"), diff --git a/src/main/webapp/jsx/components/NewToolForms/sections/BasicInformationSection.jsx b/src/main/webapp/jsx/components/NewToolForms/sections/BasicInformationSection.jsx index 41bc63e0..54a3273f 100644 --- a/src/main/webapp/jsx/components/NewToolForms/sections/BasicInformationSection.jsx +++ b/src/main/webapp/jsx/components/NewToolForms/sections/BasicInformationSection.jsx @@ -469,7 +469,7 @@ const BasicInformationSection = ({ formik, isExistingPatient, readOnly }) => {
@@ -539,9 +539,9 @@ const BasicInformationSection = ({ formik, isExistingPatient, readOnly }) => { {touched.serialNumber && errors.serialNumber && ( {errors.serialNumber} )} - + {/* Letters and numbers only — no special characters - + */}
)} diff --git a/src/main/webapp/jsx/components/NewToolForms/sections/DiagnosticTestingSection.jsx b/src/main/webapp/jsx/components/NewToolForms/sections/DiagnosticTestingSection.jsx index a115d396..4581b55c 100644 --- a/src/main/webapp/jsx/components/NewToolForms/sections/DiagnosticTestingSection.jsx +++ b/src/main/webapp/jsx/components/NewToolForms/sections/DiagnosticTestingSection.jsx @@ -240,6 +240,7 @@ const DiagnosticTestingSection = ({ formik, readOnly }) => { )} @@ -270,6 +271,7 @@ const DiagnosticTestingSection = ({ formik, readOnly }) => { diff --git a/src/main/webapp/jsx/components/NewToolForms/sections/PostTestCounsellingSection.jsx b/src/main/webapp/jsx/components/NewToolForms/sections/PostTestCounsellingSection.jsx index c219f6c5..ac45d68a 100644 --- a/src/main/webapp/jsx/components/NewToolForms/sections/PostTestCounsellingSection.jsx +++ b/src/main/webapp/jsx/components/NewToolForms/sections/PostTestCounsellingSection.jsx @@ -1,28 +1,89 @@ -import React, { useState } from "react"; +import React, { useState, useEffect, useMemo } from "react"; import { FormSelect, SectionSubheading } from "./FormFields"; import { PREVIOUSLY_TESTED_OPTIONS, } from "../constants"; import { useGetCodesets } from "../../../hooks/useGetCodesets.hook"; import { capitalizeFirstLetter } from "../../utils"; - -const COMPLETED_BY_OPTIONS = [ - { label: "Counsellor", value: "Counsellor" }, - { label: "Nurse", value: "Nurse" }, - { label: "Doctor", value: "Doctor" }, - { label: "Lab Technician", value: "Lab Technician" }, -]; - -const DESIGNATION_OPTIONS = [ - { label: "HTS Provider", value: "HTS Provider" }, - { label: "Nurse", value: "Nurse" }, - { label: "Doctor", value: "Doctor" }, - { label: "Community Health Worker", value: "Community Health Worker" }, -]; +import { getAllUsers } from "../../../services/getAllUsers.service"; const PostTestCounsellingSection = ({ formik, readOnly }) => { const { values, errors, touched, handleChange, handleBlur } = formik; const [codesets, setCodesets] = useState(null); + const [isLoadingAllUsers, setIsLoadingAllUsers] = useState(false); + const [allUsers, setAllUsers] = useState([]); + + useEffect(() => { + let isMounted = true; + + const fetchAllUsers = async () => { + setIsLoadingAllUsers(true); + try { + const data = await getAllUsers(); + if (isMounted) { + setAllUsers(Array.isArray(data) ? data : []); + } + } catch (error) { + console.error("Failed to fetch users:", error); + if (isMounted) { + setAllUsers([]); + } + } finally { + if (isMounted) { + setIsLoadingAllUsers(false); + } + } + }; + + fetchAllUsers(); + + return () => { + isMounted = false; + }; + }, []); + + // "Completed By" options: derived from firstname + lastname of each user + const completedByOptions = useMemo(() => { + if (!Array.isArray(allUsers)) return []; + return allUsers + .filter((user) => user?.firstName && user?.lastName) + .map((user) => { + const fullName = `${user.firstName} ${user.lastName}`; + return { label: fullName, value: fullName }; + }); + }, [allUsers]); + + + const designationOptions = useMemo(() => { + if (!Array.isArray(allUsers)) return []; + + const toTitleCase = (str) => + str + .toLowerCase() + .split(/\s+/) + .map((word) => word.charAt(0).toUpperCase() + word.slice(1)) + .join(" "); + + const seen = new Map(); // normalized key -> display label + + allUsers.forEach((user) => { + const raw = user?.designation; + if (!raw || typeof raw !== "string") return; + + const trimmed = raw.trim(); + if (!trimmed) return; + + const key = trimmed.toLowerCase(); + if (!seen.has(key)) { + seen.set(key, toTitleCase(trimmed)); + } + }); + + return Array.from(seen.values()) + .sort() + .map((designation) => ({ label: designation, value: designation })); + }, [allUsers]); + const fp = (name) => ({ name, @@ -60,6 +121,8 @@ const PostTestCounsellingSection = ({ formik, readOnly }) => { }); + + const showCategoryOfClient = values.hivTestKitsProvided === "YES_NO_YES"; const showAcceptedIndexTesting = values.confirmatoryHivTest?.toLowerCase() === "hiv_confirmatory_test_result_positive"; @@ -70,14 +133,14 @@ const PostTestCounsellingSection = ({ formik, readOnly }) => {
@@ -189,13 +252,15 @@ const PostTestCounsellingSection = ({ formik, readOnly }) => {
diff --git a/src/main/webapp/jsx/components/NewToolForms/sections/PreTestCounsellingSection.jsx b/src/main/webapp/jsx/components/NewToolForms/sections/PreTestCounsellingSection.jsx index f20bfe2b..20cfe26e 100644 --- a/src/main/webapp/jsx/components/NewToolForms/sections/PreTestCounsellingSection.jsx +++ b/src/main/webapp/jsx/components/NewToolForms/sections/PreTestCounsellingSection.jsx @@ -3,6 +3,7 @@ import React, { useEffect, useState } from "react"; import { FormSelect, SectionSubheading, ScoreDisplay } from "./FormFields"; import { useGetCodesets } from "../../../hooks/useGetCodesets.hook"; import { capitalizeFirstLetter } from "../../utils"; +import { url, token } from "../../../../api"; const skippedNoticeStyle = { padding: "12px 16px", @@ -181,7 +182,7 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => {
@@ -200,35 +201,35 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => {
@@ -250,7 +251,7 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => { label="Ever Had Sexual Intercourse" {...sp("everHadSexualIntercourse", transformOptions(codesets?.["YES_NO"]))} onChange={readOnly ? undefined : handleEverHadSexChange} - required + // required /> {showSexDependent && ( @@ -259,7 +260,7 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => { {isFemale && ( @@ -267,7 +268,7 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => { )} @@ -275,7 +276,7 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => { @@ -284,7 +285,7 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => { {showSexDependent && ( @@ -293,14 +294,14 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => {
@@ -343,14 +344,14 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => {
@@ -361,14 +362,14 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => {
@@ -377,14 +378,14 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => {
@@ -405,14 +406,14 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => {
{Number(values?.age) >= 10 && Number(values?.age) <= 19 && ( @@ -420,7 +421,7 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => { )} @@ -428,21 +429,21 @@ const PreTestCounsellingSection = ({ formik, readOnly }) => {
diff --git a/src/main/webapp/jsx/components/Patient/HtsEncounterList.jsx b/src/main/webapp/jsx/components/Patient/HtsEncounterList.jsx index 941880d4..6336ee82 100644 --- a/src/main/webapp/jsx/components/Patient/HtsEncounterList.jsx +++ b/src/main/webapp/jsx/components/Patient/HtsEncounterList.jsx @@ -128,6 +128,7 @@ const HTSEncounterList = () => { age: computeAge(p.dateOfBirth ?? row.observation?.dateOfBirth), htsCount: row.htsCount ?? 0, ictCount: row.ictCount ?? 0, + clientCode: row.clientCode ?? "", // ── Raw record for route state ───────────────────────── _raw, }; @@ -201,6 +202,11 @@ const HTSEncounterList = () => { ), }, + { + title: "Client Code", + field: "clientCode", + filtering: false, + }, { title: "Actions", field: "actions", diff --git a/src/main/webapp/jsx/services/getAllUsers.service.js b/src/main/webapp/jsx/services/getAllUsers.service.js new file mode 100644 index 00000000..3d5af38c --- /dev/null +++ b/src/main/webapp/jsx/services/getAllUsers.service.js @@ -0,0 +1,13 @@ +import axios from "axios"; +import { url as baseUrl, token } from "../../api"; + + + +export const getAllUsers = async () => { + const response = await axios + .get(`${baseUrl}users`, { + headers: { Authorization: `Bearer ${token}` }, + }) + + return response.data +}