fix filtering

internal/domain/main-entities/mcu-src/dto.go

@@ -11,6 +11,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Code                 string  `json:"code"`
 	Name                 string  `json:"name"`
 	CheckupCategory_Code *string `json:"checkupCategory_code"`

internal/domain/main-entities/medical-action-src-item/dto.go

@@ -14,6 +14,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	MedicalActionSrc_Id *uint `json:"medicalActionSrc_id"`
 	ProcedureSrc_Id     *uint `json:"procedureSrc_id"`
 	Item_Id             *uint `json:"item_id"`

internal/domain/main-entities/medical-action-src/dto.go

@@ -12,6 +12,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Code    string `json:"code"`
 	Name    string `json:"name"`
 	Item_Id *uint  `json:"item_id"`

internal/domain/main-entities/medicine-mix-item/dto.go

@@ -13,6 +13,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	MedicineMix_Id *uint  `json:"medicineMix_id"`
 	Medicine_Id    *uint  `json:"medicine_id"`
 	Dose           *uint8 `json:"dose"`

internal/domain/main-entities/medicine/dto.go

@@ -22,6 +22,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Code                string  `json:"code"`
 	Name                string  `json:"name"`
 	MedicineGroup_Code  *string `json:"medicineGroup_code"`

internal/domain/main-entities/nurse/dto.go

@@ -11,6 +11,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Employee_Id *uint   `json:"employee_id"`
 	IHS_Number  *string `json:"ihs_number"`
 
@@ -18,7 +24,6 @@ type ReadListDto struct {
 	PageSize     int `json:"page_size"`
 	NoPagination int `json:"no_pagination"`
 }
-
 type ReadDetailDto struct {
 	Id          uint16  `json:"id"`
 	Employee_Id *uint   `json:"employee_id"`

internal/domain/main-entities/nutritionist/dto.go

@@ -11,6 +11,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Employee_Id *uint   `json:"employee_id"`
 	IHS_Number  *string `json:"ihs_number"`
 

internal/domain/main-entities/person/dto.go

@@ -23,6 +23,23 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
+	Name                   string             `json:"name"`
+	BirthDate              *time.Time         `json:"birthDate,omitempty"`
+	BirthRegency_Code      *string            `json:"birthRegency_code"`
+	Gender_Code            *erp.GenderCode    `json:"gender_code"`
+	ResidentIdentityNumber *string            `json:"residentIdentityNumber"`
+	Religion_Code          *erp.ReligionCode  `json:"religion_code"`
+	Education_Code         *erp.EducationCode `json:"education_code"`
+	Ocupation_Code         *erp.OcupationCode `json:"occupation_code"`
+	Ocupation_Name         *string            `json:"occupation_name"`
+	Ethnic_Code            *string            `json:"ethnic_code"`
+
 	Page         int `json:"page"`
 	PageSize     int `json:"page_size"`
 	NoPagination int `json:"no_pagination"`

internal/domain/main-entities/pharmacist/dto.go

@@ -11,6 +11,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Employee_Id *uint   `json:"employee_id"`
 	IHS_Number  *string `json:"ihs_number"`
 

internal/domain/main-entities/practice-schedule/dto.go

@@ -14,6 +14,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Doctor_Id *uint        `json:"doctor_id"`
 	Unit_Code *string      `json:"unit_code"`
 	Day_Code  *erc.DayCode `json:"day_code"`

internal/domain/main-entities/unit/dto.go

@@ -12,6 +12,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Installation_Id *uint16 `json:"installation_id"`
 	Code            string  `json:"code"`
 	Name            string  `json:"name"`