diff --git a/src/app/lab-order-search/lab-order-search-post.component.ts b/src/app/lab-order-search/lab-order-search-post.component.ts
index 3a7c7366b..c7e3ef7d2 100644
--- a/src/app/lab-order-search/lab-order-search-post.component.ts
+++ b/src/app/lab-order-search/lab-order-search-post.component.ts
@@ -72,11 +72,19 @@ export class LabOrderSearchPostComponent implements OnInit, OnChanges {
public hivSummary: any;
public error: any;
public hasDnaPcr = false;
+ public isHPVtest = false;
public dnaPcrData: any = {
hivStatusOfMother: '',
infantProphylaxis: '',
infantFeeding: ''
};
+ public HPVData: any = {
+ entryPoint: '',
+ hivStatus: '',
+ typeOfScreening: '',
+ sampleCollectionMethod: '',
+ dateOfSampleCollection: ''
+ };
public isPregnant = false;
public isBreastfeeding = false;
@@ -84,6 +92,7 @@ export class LabOrderSearchPostComponent implements OnInit, OnChanges {
public labLocations: any;
public patientIdentifers = [];
public sampleTypes: any;
+ public hpvTestSampleTypes: any;
public orderTypes: any;
public isBusy = true;
@@ -104,6 +113,7 @@ export class LabOrderSearchPostComponent implements OnInit, OnChanges {
this.labLocations = this.labOrdersSearchHelperService.labLocations;
this.sampleTypes = this.labOrdersSearchHelperService.sampleTypes;
this.orderTypes = this.labOrdersSearchHelperService.orderTypes;
+ this.hpvTestSampleTypes = this.labOrdersSearchHelperService.hpvTestSampleTypes;
}
public ngOnInit() {
@@ -152,6 +162,7 @@ export class LabOrderSearchPostComponent implements OnInit, OnChanges {
this.displayPregnancy();
this.loadHivSummary(this.person.uuid);
this.displayDnaPcrInputs();
+ this.displayHPVInputs();
this.setDefaultLocation();
}
@@ -224,7 +235,64 @@ export class LabOrderSearchPostComponent implements OnInit, OnChanges {
}
);
}
+ public displayHPVInputs() {
+ const ot = this.orderType.type;
+ if (ot !== 'HPV') {
+ return;
+ } else {
+ this.isHPVtest = true;
+ this.HPVData.entryPoint = this.hpvValue(
+ this.findObs(
+ this.order.encounter.obs,
+ 'a8a17e48-1350-11df-a1f1-0026b9348838'
+ ).display
+ );
+ this.HPVData.hivStatus = this.hpvValue(
+ this.findObs(
+ this.order.encounter.obs,
+ '9e4d6436-4040-46a3-a0ae-6dbc0acfe593'
+ ).display
+ );
+ this.HPVData.typeOfScreening = this.hpvValue(
+ this.findObs(
+ this.order.encounter.obs,
+ '6048b6bd-c698-48c9-8d20-424ab0b3d628'
+ ).display
+ );
+ this.HPVData.sampleCollectionMethod = this.hpvValue(
+ this.findObs(
+ this.order.encounter.obs,
+ 'aa14f397-5d82-4cd3-8dc8-bb381a935717'
+ ).display
+ );
+ this.HPVData.dateOfSampleCollection = this.hpvValue(
+ this.findObs(
+ this.order.encounter.obs,
+ 'e07623c2-38af-4caa-8d8d-d01791441c59'
+ ).display
+ );
+ }
+ }
+ public hpvValue(displayString: any) {
+ const parts = displayString.split(':');
+ return parts.length > 1 ? parts[1].trim() : displayString;
+ }
+ public getHpvConceptValues(uuid: string, property: string) {
+ this.conceptResourceService
+ .getConceptByUuid(uuid)
+ .pipe(take(1))
+ .subscribe(
+ (data) => {
+ if (data) {
+ this.dnaPcrData[property] += `${data.name.display} ,`;
+ }
+ },
+ (error) => {
+ console.error('Failed to load concepts ', error);
+ }
+ );
+ }
public displayDnaPcrInputs() {
const ot = this.orderType.type;
if (ot !== 'DNAPCR') {
@@ -298,8 +366,10 @@ export class LabOrderSearchPostComponent implements OnInit, OnChanges {
if (!this.hasLoadingTimeRequiredInputs()) {
return;
}
+
const payload = this.getPayload();
const location = this.selectedLabLocation;
+ console.log('uchunguzi ', payload);
this.isBusy = true;
this.labOrderPostService
.postOrderToEid(location, payload)
@@ -387,6 +457,21 @@ export class LabOrderSearchPostComponent implements OnInit, OnChanges {
this.isBreastfeeding ? 1 : 0
);
}
+ if (this.orderType.type === 'HPV') {
+ payload = this.labOrdersSearchHelperService.createHpvPayload(
+ order,
+ obs,
+ locationUuid,
+ patientIdentifier,
+ patientName,
+ gender,
+ birthdate,
+ this.dateReceived,
+ this.selectedSampleType,
+ this.isPregnant ? 1 : 0,
+ this.isBreastfeeding ? 1 : 0
+ );
+ }
if (this.orderType.type === 'CD4') {
payload = this.labOrdersSearchHelperService.createCD4Payload(
diff --git a/src/app/models/group.model.ts b/src/app/models/group.model.ts
index eaecc745a..c4e729881 100644
--- a/src/app/models/group.model.ts
+++ b/src/app/models/group.model.ts
@@ -39,17 +39,27 @@ export class Group extends BaseModel {
@serializable()
public get status() {
- const lastMeetingDate = this.getLatestMeetingDate(
- this._openmrsModel.cohortVisits
- );
- // if last meeting date is more than 3 months ago, group is inactive
+ let lastMeetingDate: any;
+
+ if (this._openmrsModel.cohortVisits.length > 0) {
+ lastMeetingDate = this.getLatestMeetingDate(
+ this._openmrsModel.cohortVisits
+ );
+ } else {
+ lastMeetingDate = new Date(this._openmrsModel.startDate);
+ }
+
+ // if last meeting date is more than 6 months ago, group is inactive
if (lastMeetingDate) {
const today = new Date();
- const threeMonthsAgo = new Date(today.setMonth(today.getMonth() - 3));
- if (lastMeetingDate < threeMonthsAgo) {
+ const sixMonthsAgo = new Date();
+ sixMonthsAgo.setMonth(today.getMonth() - 6);
+
+ if (lastMeetingDate <= sixMonthsAgo) {
return 'Inactive';
}
}
+
return this._openmrsModel.endDate ? 'Disbanded' : 'Active';
}
diff --git a/src/app/patient-dashboard/common/patient-banner/patient-banner.component.ts b/src/app/patient-dashboard/common/patient-banner/patient-banner.component.ts
index 6b90d1e65..81349130a 100644
--- a/src/app/patient-dashboard/common/patient-banner/patient-banner.component.ts
+++ b/src/app/patient-dashboard/common/patient-banner/patient-banner.component.ts
@@ -52,6 +52,7 @@ export class PatientBannerComponent implements OnInit, OnDestroy, OnChanges {
public isPatientEligibleForOtz = false;
public isPatientVerified = false;
public verificationStatus = false;
+ private isFamilyTestingEncounter = false;
modalRef: BsModalRef;
modalConfig = {
backdrop: true,
@@ -121,11 +122,32 @@ export class PatientBannerComponent implements OnInit, OnDestroy, OnChanges {
);
this.getHIVPatient(_.filter(patient.enrolledPrograms, 'isEnrolled'));
this.familyTestingService
- .getPatientEncounters(this.patient.uuid)
+ .getPatientEncounters(this.patient.uuid, true)
.subscribe((response: any) => {
- this.familyTestingEncounterUuid = _.first
(response.results);
+ if (response.results && response.results.length > 0) {
+ this.isFamilyTestingEncounter = true;
+ this.familyTestingEncounterUuid = _.first(
+ response.results
+ );
+ } else {
+ this.isFamilyTestingEncounter = false;
+ }
});
- this.getPatientEncounters();
+
+ setTimeout(async () => {
+ if (!this.isFamilyTestingEncounter) {
+ this.familyTestingService
+ .getPatientEncounters(this.patient.uuid, false)
+ .subscribe((response: any) => {
+ if (response.results && response.results.length > 0) {
+ this.familyTestingEncounterUuid = _.first(
+ response.results
+ );
+ }
+ });
+ }
+ this.getPatientEncounters(this.isFamilyTestingEncounter);
+ }, 4000);
} else {
this.searchIdentifiers = undefined;
this.birthdate = undefined;
@@ -347,7 +369,6 @@ export class PatientBannerComponent implements OnInit, OnDestroy, OnChanges {
this.displayContacts = false;
}
public updateContacts() {
- console.log('this.patient.uuid ', this.patient.uuid);
const encounterUuid = _.first(this.patientEncounters).uuid;
const familyPartnerHistoryForm = `3fbc8512-b37b-4bc2-a0f4-8d0ac7955127`;
const url = `/patient-dashboard/patient/${this.patient.uuid}/general/general/formentry/${familyPartnerHistoryForm}`;
@@ -361,9 +382,10 @@ export class PatientBannerComponent implements OnInit, OnDestroy, OnChanges {
this.displayContacts = false;
}
- public getPatientEncounters() {
- const familyAndPartnerTestingFormUuid =
- '3fbc8512-b37b-4bc2-a0f4-8d0ac7955127';
+ public getPatientEncounters(isFamilyTestingEncounter: boolean) {
+ const familyAndPartnerTestingFormUuid = isFamilyTestingEncounter
+ ? '3fbc8512-b37b-4bc2-a0f4-8d0ac7955127'
+ : '8b196bad-6ee5-4290-b1be-101539e04290';
this.encounterResourceService
.getEncountersByPatientUuid(this.patient.uuid, false, null)
.pipe(take(1))