From 91bfc622d19a9b7eb130b89c3ecff7a7214e5ca7 Mon Sep 17 00:00:00 2001
From: Sk Shaifat Murshed <shaifat.murshed@sentientgeeks.com>
Date: Thu, 6 Feb 2025 16:09:20 +0530
Subject: [PATCH] Merged PatientModule

---
 .../proxy/appointments/appointment.service.ts |  3 +-
 angular/src/app/proxy/generate-proxy.json     |  4 +-
 angular/src/app/proxy/patients/dto/models.ts  | 64 +++++++++----------
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/angular/src/app/proxy/appointments/appointment.service.ts b/angular/src/app/proxy/appointments/appointment.service.ts
index f80e40f..16b9417 100644
--- a/angular/src/app/proxy/appointments/appointment.service.ts
+++ b/angular/src/app/proxy/appointments/appointment.service.ts
@@ -3,7 +3,6 @@ import { Injectable } from '@angular/core';
 import type { PagedResultDto } from '../abp/application/services/dto/models';
 import type { AppointmentDto, CreateOrUpdateAppointmentDto } from '../appoinments/dto/models';
 import type { PagingSortResultDto } from '../dto/models';
-import type { PatientRecordDto } from '../patients/dto/models';
 
 @Injectable({
   providedIn: 'root',
@@ -56,7 +55,7 @@ export class AppointmentService {
   
 
   updateAppointment = (input: CreateOrUpdateAppointmentDto, config?: Partial<Rest.Config>) =>
-    this.restService.request<any, PatientRecordDto>({
+    this.restService.request<any, AppointmentDto>({
       method: 'PUT',
       url: '/api/app/appointment/appointment',
       body: input,
diff --git a/angular/src/app/proxy/generate-proxy.json b/angular/src/app/proxy/generate-proxy.json
index 0475930..504c97d 100644
--- a/angular/src/app/proxy/generate-proxy.json
+++ b/angular/src/app/proxy/generate-proxy.json
@@ -1090,8 +1090,8 @@
                 }
               ],
               "returnValue": {
-                "type": "HospitalManagementSystem.Patients.Dto.PatientRecordDto",
-                "typeSimple": "HospitalManagementSystem.Patients.Dto.PatientRecordDto"
+                "type": "HospitalManagementSystem.Appoinments.Dto.AppointmentDto",
+                "typeSimple": "HospitalManagementSystem.Appoinments.Dto.AppointmentDto"
               },
               "allowAnonymous": null,
               "implementFrom": "HospitalManagementSystem.Appointments.AppointmentAppService"
diff --git a/angular/src/app/proxy/patients/dto/models.ts b/angular/src/app/proxy/patients/dto/models.ts
index 46e0dd7..1ce7102 100644
--- a/angular/src/app/proxy/patients/dto/models.ts
+++ b/angular/src/app/proxy/patients/dto/models.ts
@@ -1,6 +1,38 @@
 import type { Gender } from '../../global-enum/gender.enum';
 import type { Status } from '../../global-enum/status.enum';
 
+export interface CreateUpdatePatientDto {
+  id?: string;
+  name?: string;
+  gender: Gender;
+  mobile?: string;
+  email?: string;
+  age: number;
+  treatment?: string;
+  doctorAssigned?: string;
+  address?: string;
+  bloodGroup?: string;
+  admissionDate?: string;
+  dischargeDate?: string;
+  status: Status;
+  imageID?: string;
+}
+
+export interface CreateUpdatePatientRecordDto {
+  id?: string;
+  patientId?: string;
+  dateOfAdmission?: string;
+  labReportUrlID?: string;
+  medicationUrlID?: string;
+  medicationHistoryUrlID?: string;
+  nextFollowUp?: string;
+  diagnosis?: string;
+  treatmentPlan?: string;
+  doctorNotes?: string;
+  insuranceProvider?: string;
+  status: Status;
+}
+
 export interface PatientDto {
   id?: string;
   name?: string;
@@ -33,35 +65,3 @@ export interface PatientRecordDto {
   insuranceProvider?: string;
   status: Status;
 }
-
-export interface CreateUpdatePatientDto {
-  id?: string;
-  name?: string;
-  gender: Gender;
-  mobile?: string;
-  email?: string;
-  age: number;
-  treatment?: string;
-  doctorAssigned?: string;
-  address?: string;
-  bloodGroup?: string;
-  admissionDate?: string;
-  dischargeDate?: string;
-  status: Status;
-  imageID?: string;
-}
-
-export interface CreateUpdatePatientRecordDto {
-  id?: string;
-  patientId?: string;
-  dateOfAdmission?: string;
-  labReportUrlID?: string;
-  medicationUrlID?: string;
-  medicationHistoryUrlID?: string;
-  nextFollowUp?: string;
-  diagnosis?: string;
-  treatmentPlan?: string;
-  doctorNotes?: string;
-  insuranceProvider?: string;
-  status: Status;
-}