Merge pull request #85 from dikstub-rssa/feat/encounter

Feat/encounter

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

@@ -27,6 +27,7 @@ type FilterDto struct {
 	User_Id       *uint                `json:"user-id"`
 	Person_Id     *uint                `json:"person-id"`
 	Division_Code *string              `json:"division-code"`
+	Position_Code *string              `json:"position-code"`
 	Number        *string              `json:"number"`
 	Status_Code   erc.ActiveStatusCode `json:"status-code"`
 }

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

@@ -70,7 +70,8 @@ type FilterDto struct {
 }
 
 type ReadDetailDto struct {
-	Id uint16 `json:"id"`
+	Id       uint16 `json:"id"`
+	Includes string `json:"includes"`
 }
 
 type UpdateDto struct {
@@ -119,8 +120,8 @@ type ResponseDto struct {
 	Member_Number             *string                  `json:"member_number"`
 	Ref_Number                *string                  `json:"ref_number"`
 	Trx_Number                *string                  `json:"trx_number"`
-	Appointment_Doctor_Id     *uint                    `json:"assignment_doctor_id"`
-	Appointment_Doctor        *ed.Doctor               `json:"assignment_doctor,omitempty"`
+	Appointment_Doctor_Id     *uint                    `json:"appointment_doctor_id"`
+	Appointment_Doctor        *ed.Doctor               `json:"appointment_doctor,omitempty"`
 	Responsible_Doctor_Id     *uint                    `json:"responsible_doctor_id"`
 	Responsible_Doctor        *ed.Doctor               `json:"responsible_doctor,omitempty"`
 	Adm_Employee_Id           *uint                    `json:"adm_employee_id"`