+
+
+
+
+
+
+
+
+
-
-
diff --git a/angular/src/app/appointment/view-appointment/view-appointment.component.ts b/angular/src/app/appointment/view-appointment/view-appointment.component.ts
index 5ec24af..c5881ff 100644
--- a/angular/src/app/appointment/view-appointment/view-appointment.component.ts
+++ b/angular/src/app/appointment/view-appointment/view-appointment.component.ts
@@ -1,5 +1,7 @@
import { Component } from '@angular/core';
+import { NgForm } from '@angular/forms';
import { DoctorService } from '@proxy/doctors';
+import { Gender } from '@proxy/global-enum';
@Component({
selector: 'app-view-appointment',
@@ -13,12 +15,14 @@ export class ViewAppointmentComponent {
patients: [];
isEditing = false;
appointmentDialog = false;
+ genders = Gender;
+ isEditMode: boolean = false;
appointment = {
firstname: '',
lastname: '',
email: '',
- gender: '',
+ gender: Gender.Male,
date: '',
dob:'',
time: '',
@@ -30,11 +34,13 @@ export class ViewAppointmentComponent {
status: '',
visitType: '',
paymentStatus: '',
+ Address:''
};
appointments = [
{
id: 1,
- name: 'John Doe',
+ firstname: 'John',
+ lastname: 'Doe',
doctor: 'Dr. Smith',
gender: 1,
date: new Date(),
@@ -46,7 +52,8 @@ export class ViewAppointmentComponent {
},
{
id: 2,
- name: 'Jane Smith',
+ firstname: 'Jane',
+ lastname: 'Smith',
doctor: 'Dr. Johnson',
gender: 0,
date: new Date(),
@@ -58,7 +65,8 @@ export class ViewAppointmentComponent {
},
{
id: 3,
- name: 'Mike Johnson',
+ firstname: 'Mike',
+ lastname: 'Johnson',
doctor: 'Dr. Brown',
gender: 1,
date: new Date(),
@@ -69,24 +77,24 @@ export class ViewAppointmentComponent {
visitType: 'Surgery',
},
];
- status = { 1: 'Scheduled', 2: 'Completed', 3: 'Canceled' };
- genders = [
- { label: 'Male', value: 'Male' },
- { label: 'Female', value: 'Female' },
- ];
+ // status = { 1: 'Scheduled', 2: 'Completed', 3: 'Canceled' };
+
+
doctors = [];
doctorOptions = [];
appointmentStatuses = [
{ label: 'Scheduled', value: 'Scheduled' },
{ label: 'Completed', value: 'Completed' },
+ { label: 'Canceled', value: 'Canceled' },
];
visitTypes = [
- { label: 'Consultation', value: 'Consultation' },
+ { label: 'New Patient', value: 'NewPatient' },
{ label: 'Follow-up', value: 'Follow-up' },
];
paymentStatuses = [
{ label: 'Pending', value: 'Pending' },
{ label: 'Paid', value: 'Paid' },
+ { label: 'Unpaid', value: 'Unpaid' },
];
createPermission = true;
@@ -105,7 +113,7 @@ export class ViewAppointmentComponent {
firstname: '',
lastname: '',
email: '',
- gender: '',
+ gender: Gender.Male,
date: '',
dob:'',
time: '',
@@ -117,6 +125,7 @@ export class ViewAppointmentComponent {
status: '',
visitType: '',
paymentStatus: '',
+ Address:''
};
}
@@ -131,10 +140,15 @@ export class ViewAppointmentComponent {
deleteAppointment(id: number) {
console.log('Deleting appointment with ID', id);
}
- saveAppointment() {
- console.log(this.appointment);
- this.appointmentDialog = false;
- }
+ saveAppointment(form: NgForm) {
+ debugger
+ console.log(form.controls);
+ if (form.invalid) {
+ Object.values(form.controls).forEach(control => control.markAsTouched());
+ return;
+ }
+
+ }
closeDialog() {
this.appointmentDialog = false;
@@ -143,9 +157,8 @@ export class ViewAppointmentComponent {
this.DoctorService.get().subscribe(result => {
debugger;
this.doctors = result;
- // Create a formatted array for dropdown
this.doctorOptions = this.doctors.map(doctor => ({
- label: `${doctor.firstName} ${doctor.lastName}`, // Combine first and last name
+ label: `Dr. ${doctor.firstName} ${doctor.lastName}`, // Combine first and last name
value: doctor.id, // Use the ID as the value
}));
});
diff --git a/angular/src/app/appointment/view-appointment/view-appointment.module.ts b/angular/src/app/appointment/view-appointment/view-appointment.module.ts
index 3505ed2..75a9da9 100644
--- a/angular/src/app/appointment/view-appointment/view-appointment.module.ts
+++ b/angular/src/app/appointment/view-appointment/view-appointment.module.ts
@@ -12,6 +12,7 @@ import { DropdownModule } from 'primeng/dropdown';
import { InputTextModule } from 'primeng/inputtext';
import { RadioButtonModule } from 'primeng/radiobutton';
import { DoctorService } from '@proxy/doctors';
+import { InputTextareaModule } from 'primeng/inputtextarea';
@NgModule({
declarations: [ViewAppointmentComponent],
@@ -28,6 +29,7 @@ import { DoctorService } from '@proxy/doctors';
CalendarModule,
DropdownModule,
RadioButtonModule,
+ InputTextareaModule
],
providers:[DoctorService]
diff --git a/angular/src/app/patients/all-patients/all-patients.component.html b/angular/src/app/patients/all-patients/all-patients.component.html
new file mode 100644
index 0000000..64159d6
--- /dev/null
+++ b/angular/src/app/patients/all-patients/all-patients.component.html
@@ -0,0 +1,238 @@
+
+
+
+
+
+
Patient List
+
+
+
+
+
+
+
+
+
+
+
+ | Patient ID |
+ Full Name |
+ Gender |
+ Date of Admission |
+ Blood Group |
+ Mobile |
+ Email |
+ Status |
+ Actions |
+
+
+
+
+
+ | {{ patient.id }} |
+ {{ patient.name }} |
+
+
+ {{ gender[patient.gender] }}
+
+ |
+ {{ patient.admissionDate | date }} |
+ {{ patient.bloodGroup }} |
+ {{ patient.mobile }} |
+ {{ patient.email }} |
+ {{ status[patient.status] }} |
+
+
+
+
+ |
+
+
+
+
+
+ | No Patients found. |
+
+
+
+
Total Records: {{totalRecords}}
+
+
\ No newline at end of file
diff --git a/angular/src/app/patients/all-patients/all-patients.component.scss b/angular/src/app/patients/all-patients/all-patients.component.scss
new file mode 100644
index 0000000..9b907b1
--- /dev/null
+++ b/angular/src/app/patients/all-patients/all-patients.component.scss
@@ -0,0 +1,28 @@
+.table-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+
+ .badge {
+ display: inline-block;
+ padding: 0.2rem 0.6rem;
+ border-radius: 0.5rem;
+ color: white;
+ font-weight: bold;
+ font-size: 0.8rem;
+ }
+
+ .male {
+ background-color: green;
+ }
+
+ .female {
+ background-color: purple;
+ }
+
+ .pdf-icon {
+ color: red;
+ font-size: 1.2rem;
+ }
+
\ No newline at end of file
diff --git a/angular/src/app/patients/all-patients/all-patients.component.ts b/angular/src/app/patients/all-patients/all-patients.component.ts
new file mode 100644
index 0000000..b9cbffb
--- /dev/null
+++ b/angular/src/app/patients/all-patients/all-patients.component.ts
@@ -0,0 +1,275 @@
+import { PermissionService } from '@abp/ng.core';
+import { Confirmation, ConfirmationService, ToasterService } from '@abp/ng.theme.shared';
+import { HttpClient } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+import { NgForm } from '@angular/forms';
+import { Router } from '@angular/router';
+import { PagingSortPatientResultDto } from '@proxy/dto';
+import { Gender, Status } from '@proxy/global-enum';
+import { PatientService } from '@proxy/patients';
+import { PatientDto, CreateUpdatePatientDto } from '@proxy/patients/dto';
+
+@Component({
+ selector: 'app-all-patients',
+ templateUrl: './all-patients.component.html',
+ styleUrl: './all-patients.component.scss',
+ providers: [PatientService, ConfirmationService, ToasterService, PermissionService],
+})
+export class AllPatientsComponent implements OnInit {
+ globalFilter: string = '';
+ patients: PatientDto[];
+ totalRecords: number = 0;
+ loading: boolean = false;
+ patientDialog: boolean = false;
+ selectedPatient: CreateUpdatePatientDto;
+ isEditMode: boolean = false;
+ patientDialogTitle: string = '';
+ params: PagingSortPatientResultDto;
+ status: any;
+ gender: any;
+ statuslist: any;
+ selectedstatus: any = 0;
+ selectedgender: any = 0;
+ selectadmissionDate: Date = new Date();
+ selectdischargeDate: Date = new Date();
+ createpermission: boolean;
+ editpermission: boolean;
+ deletepermission: boolean;
+ error: string = '';
+ imgpath: string = '';
+ guid: string = '00000000-0000-0000-0000-000000000000';
+ options: Partial
= {
+ hideCancelBtn: false,
+ hideYesBtn: false,
+ dismissible: false,
+ cancelText: 'Close',
+ // yesText: 'Confirm',
+ messageLocalizationParams: ['Demo'],
+ titleLocalizationParams: [],
+ // You can customize icon
+ // icon: 'fa fa-exclamation-triangle', // or
+ // iconTemplate : '
'
+ };
+
+ constructor(
+ private patientService: PatientService,
+ private http: HttpClient,
+ private confirmation: ConfirmationService,
+ private toaster: ToasterService,
+ private permissionChecker: PermissionService,
+ private router: Router
+ ) {}
+
+ ngOnInit() {
+ this.createpermission = this.permissionChecker.getGrantedPolicy(
+ 'HospitalManagementSystem.Patient.Create'
+ );
+ this.editpermission = this.permissionChecker.getGrantedPolicy(
+ 'HospitalManagementSystem.Patient.Edit'
+ );
+ this.deletepermission = this.permissionChecker.getGrantedPolicy(
+ 'HospitalManagementSystem.Patient.Delete'
+ );
+ this.status = Status;
+ this.gender = Gender;
+ this.patientService.getStatusDropdown().subscribe(result => {
+ this.statuslist = result;
+ });
+
+ this.resetselectpatient();
+ this.loadPatient({
+ first: 0,
+ rows: 10,
+ sortField: 'id',
+ sortOrder: 1,
+ globalFilter: null,
+ });
+ }
+ resetselectpatient() {
+ this.selectedPatient = {
+ name: '',
+ gender: Gender.Male,
+ mobile: '',
+ email: '',
+ age: 0,
+ treatment: '',
+ doctorAssigned: '',
+ address: '',
+ bloodGroup: '',
+ admissionDate: '',
+ dischargeDate: '',
+ status: Status.InTreatment,
+ };
+ this.imgpath = '';
+ this.selectedgender = 0;
+ this.selectedstatus = 0;
+ }
+
+ loadPatient(event: any) {
+ this.loading = true;
+ let order = event.sortOrder == 1 ? ' asc' : ' desc';
+ event.sortField = event.sortField == undefined ? 'id' : event.sortField;
+ this.params = {
+ skipCount: event.first,
+ maxResultCount: event.rows,
+ sorting: event.sortField + order,
+ search: event.globalFilter == null ? '' : event.globalFilter,
+ };
+
+ this.patientService.getPatientList(this.params).subscribe(data => {
+ this.patients = data.items;
+ this.totalRecords = data.totalCount;
+ this.loading = false;
+ });
+ }
+
+ exportPatient() {
+ this.patientService.getExportPatientData().subscribe(result => {
+ const binary = atob(result.fileContent);
+ const len = binary.length;
+ const bytes = new Uint8Array(len);
+
+ for (let i = 0; i < len; i++) {
+ bytes[i] = binary.charCodeAt(i);
+ }
+
+ const blob = new Blob([bytes], { type: 'application/xlsx' });
+
+ const url = window.URL.createObjectURL(blob);
+
+ const link = document.createElement('a');
+ link.href = url;
+ link.download = result.fileName;
+
+ document.body.appendChild(link);
+ link.click();
+
+ document.body.removeChild(link);
+ window.URL.revokeObjectURL(url);
+ });
+ }
+
+ openNewPatientDialog() {
+ this.patientDialogTitle = 'New Patient';
+ this.resetselectpatient();
+ this.selectedgender = 0;
+ this.selectedstatus = 0;
+ this.patientDialog = true;
+ this.isEditMode = false;
+ }
+
+ addnewrecord(id: any) {
+ this.router.navigate(['/patients/patient-record', id]);
+ }
+
+ profileimageupload(event: Event) {
+ if (this.selectedPatient.name == '') {
+ this.error = 'Please Type a Name';
+ return;
+ }
+ const input = event.target as HTMLInputElement;
+ if (input.files.length > 0) {
+ const tag = 'Image';
+ const formdata = new FormData();
+ formdata.append('file', input.files[0]);
+ this.UploadFileData(tag, formdata);
+ } else {
+ return;
+ }
+ }
+
+ UploadFileData(tag: string, formdata: FormData) {
+ this.patientService.uploadFile(tag, formdata).subscribe(result => {
+ this.selectedPatient.imageID = result;
+ });
+ }
+
+ editPatient(Patient: any) {
+ this.resetselectpatient();
+ this.patientDialogTitle = 'Edit Patient';
+ this.patientService.getPatientById(Patient.id).subscribe(result => {
+ this.selectedPatient = result;
+ this.imgpath = result.imagepath != null ? result.imagepath.split('\\')[3] : '';
+ this.selectadmissionDate = new Date(this.selectedPatient.admissionDate);
+ this.selectedgender = this.selectedPatient.gender;
+ this.selectedstatus = this.selectedPatient.status;
+ });
+ this.patientDialog = true;
+ this.isEditMode = true;
+ }
+
+ deletePatient(id: any) {
+ this.confirmation
+ .warn('Do you really want to delete this patient?', {
+ key: '::AreYouSure',
+ defaultValue: 'Are you sure?',
+ })
+ .subscribe((status: Confirmation.Status) => {
+ // your code here
+ if (status == 'confirm') {
+ this.patientService.deletePatient(id).subscribe(() => {
+ this.toaster.success('Patient deleted successfully', 'Success');
+ this.loadPatient(this.params);
+ });
+ }
+ });
+ }
+
+ savePatient(form: NgForm) {
+ console.log(form.controls);
+ if (form.invalid) {
+ Object.values(form.controls).forEach(control => control.markAsTouched());
+ return;
+ }
+ this.selectedPatient.gender = this.selectedgender;
+ this.selectedPatient.status = this.selectedstatus;
+ this.selectedPatient.admissionDate = this.selectadmissionDate.toDateString();
+ this.selectedPatient.dischargeDate = this.selectdischargeDate.toDateString();
+ this.selectedPatient.imageID = this.selectedPatient.imageID
+ ? this.selectedPatient.imageID.replace('"', '').replace('"', '')
+ : this.guid;
+ console.log(this.selectedPatient);
+
+ if (this.isEditMode) {
+ this.patientService.updatePatient(this.selectedPatient.id, this.selectedPatient).subscribe(
+ () => {
+ this.toaster.success('Patient updated successfully', 'Success');
+ this.patientDialog = false;
+ this.loadPatient({
+ first: 0,
+ rows: 10,
+ sortField: 'id',
+ sortOrder: 1,
+ globalFilter: null,
+ });
+ },
+ error => {
+ console.log(error);
+ this.closeDialog();
+ }
+ );
+ } else {
+ this.patientService.createPatient(this.selectedPatient).subscribe(
+ () => {
+ this.toaster.success('Patient created successfully', 'Success');
+ this.patientDialog = false;
+ this.loadPatient({
+ first: 0,
+ rows: 10,
+ sortField: 'id',
+ sortOrder: 1,
+ globalFilter: null,
+ });
+ },
+ error => {
+ console.log(error);
+ this.closeDialog();
+ }
+ );
+ }
+ }
+
+ closeDialog() {
+ this.patientDialog = false;
+ }
+}
diff --git a/angular/src/app/patients/patient-record/patient-record.component.html b/angular/src/app/patients/patient-record/patient-record.component.html
new file mode 100644
index 0000000..44ff19f
--- /dev/null
+++ b/angular/src/app/patients/patient-record/patient-record.component.html
@@ -0,0 +1,279 @@
+
+
+
+
+
![Patient Image]()
+
+
+
+
+
{{ patientdto?.name }}
+
+
+ Age: {{ patientdto?.age }}
+
+
+ Gender: {{ gender[patientdto?.gender] }}
+
+
+ Mobile: {{ patientdto?.mobile }}
+
+
+ Email: {{ patientdto?.email }}
+
+
+ Blood Group: {{ patientdto?.bloodGroup }}
+
+
+ Doctor: {{ patientdto?.doctorAssigned || 'N/A' }}
+
+
+ Admission: {{ patientdto?.admissionDate | date }}
+
+
+ Discharge: {{ patientdto?.dischargeDate | date }}
+
+
+ Treatment: {{ patientdto?.treatment || 'N/A' }}
+
+
+ Status:
+
+ {{ status[patientdto?.status] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{'::PatientHeader' | abpLocalization}}
+
+
+
+
+
+
+
+
+
+
+
+ | Patient ID |
+ Full Name |
+ Gender |
+ Date of Admission |
+ Diagnosis |
+ Lab Reports |
+ Medications |
+ Next Follow-Up |
+ Status |
+ Actions |
+
+
+
+
+
+ | {{ patientrecord.id }} |
+ {{ patientrecord.patients.name }} |
+
+
+ {{ gender[patientrecord.patients.gender] }}
+
+ |
+ {{ patientrecord.dateOfAdmission | date }} |
+ {{ patientrecord.diagnosis }} |
+ |
+ |
+ {{ patientrecord.nextFollowUp | date }} |
+ {{ status[patientrecord.patients.status] }} |
+
+
+
+ |
+
+
+
+
+ | No Patients found. |
+
+
+
+
Total Records: {{totalRecords}}
+