This commit is contained in:
dpurbosakti
2025-11-06 11:12:28 +07:00
parent 7461e1cf91
commit 9ebcb604c6
4 changed files with 53 additions and 50 deletions
+39 -36
View File
@@ -6,16 +6,18 @@ import (
es "simrs-vx/internal/domain/main-entities/specialist" es "simrs-vx/internal/domain/main-entities/specialist"
ess "simrs-vx/internal/domain/main-entities/subspecialist" ess "simrs-vx/internal/domain/main-entities/subspecialist"
eu "simrs-vx/internal/domain/main-entities/unit" eu "simrs-vx/internal/domain/main-entities/unit"
"time"
) )
type CreateDto struct { type CreateDto struct {
Code *string `json:"code" validate:"maxLength=20"` Code *string `json:"code" validate:"maxLength=20"`
Employee_Id *uint `json:"employee_id"` Employee_Id *uint `json:"employee_id"`
IHS_Number *string `json:"ihs_number"` IHS_Number *string `json:"ihs_number"`
SIP_Number *string `json:"sip_number"` SIP_Number *string `json:"sip_number"`
Unit_Id *uint16 `json:"unit_id"` SIP_ExpiredDate *time.Time `json:"sip_expiredDate"`
Specialist_Id *uint16 `json:"specialist_id"` Unit_Code *string `json:"unit_code"`
Subspecialist_Id *uint16 `json:"subspecialist_id"` Specialist_Code *string `json:"specialist_code"`
Subspecialist_Code *string `json:"subspecialist_code"`
} }
type ReadListDto struct { type ReadListDto struct {
@@ -25,13 +27,14 @@ type ReadListDto struct {
} }
type FilterDto struct { type FilterDto struct {
Code *string `json:"code"` Code *string `json:"code"`
Employee_Id *uint `json:"employee-id"` Employee_Id *uint `json:"employee-id"`
IHS_Number *string `json:"ihs-number" validate:"maxLength=20"` IHS_Number *string `json:"ihs-number" validate:"maxLength=20"`
SIP_Number *string `json:"sip-number" validate:"maxLength=20"` SIP_Number *string `json:"sip-number" validate:"maxLength=20"`
Unit_Id *uint `json:"unit-id"` SIP_ExpiredDate *string `json:"sip-expiredDate"`
Specialist_Id *uint16 `json:"specialist-id"` Unit_Code *string `json:"unit-code"`
Subspecialist_Id *uint16 `json:"subspecialist-id"` Specialist_Code *string `json:"specialist-code"`
Subspecialist_Code *string `json:"subspecialist-code"`
} }
type ReadDetailDto struct { type ReadDetailDto struct {
@@ -59,32 +62,32 @@ type MetaDto struct {
type ResponseDto struct { type ResponseDto struct {
ecore.Main ecore.Main
Code *string `json:"code"` Code *string `json:"code"`
Employee_Id *uint `json:"employee_id"` Employee_Id *uint `json:"employee_id"`
Employee *ee.Employee `json:"employee,omitempty"` Employee *ee.Employee `json:"employee,omitempty"`
IHS_Number *string `json:"ihs_number"` IHS_Number *string `json:"ihs_number"`
SIP_Number *string `json:"sip_number"` SIP_Number *string `json:"sip_number"`
Unit_Id *uint16 `json:"unit_id"` Unit_Code *string `json:"unit_code"`
Unit *eu.Unit `json:"unit,omitempty"` Unit *eu.Unit `json:"unit,omitempty"`
Specialist_Id *uint16 `json:"specialist_id"` Specialist_Code *string `json:"specialist_code"`
Specialist *es.Specialist `json:"specialist,omitempty" ` Specialist *es.Specialist `json:"specialist,omitempty" `
Subspecialist_Id *uint16 `json:"subspecialist_id"` Subspecialist_Code *string `json:"subspecialist_code"`
Subspecialist *ess.Subspecialist `json:"subspecialist,omitempty"` Subspecialist *ess.Subspecialist `json:"subspecialist,omitempty"`
} }
func (d Doctor) ToResponse() ResponseDto { func (d Doctor) ToResponse() ResponseDto {
resp := ResponseDto{ resp := ResponseDto{
Code: d.Code, Code: d.Code,
Employee_Id: d.Employee_Id, Employee_Id: d.Employee_Id,
Employee: d.Employee, Employee: d.Employee,
IHS_Number: d.IHS_Number, IHS_Number: d.IHS_Number,
SIP_Number: d.SIP_Number, SIP_Number: d.SIP_Number,
Unit_Id: d.Unit_Id, Unit_Code: d.Unit_Code,
Unit: d.Unit, Unit: d.Unit,
Specialist_Id: d.Specialist_Id, Specialist_Code: d.Specialist_Code,
Specialist: d.Specialist, Specialist: d.Specialist,
Subspecialist_Id: d.Subspecialist_Id, Subspecialist_Code: d.Subspecialist_Code,
Subspecialist: d.Subspecialist, Subspecialist: d.Subspecialist,
} }
resp.Main = d.Main resp.Main = d.Main
return resp return resp
+4 -4
View File
@@ -24,10 +24,10 @@ type CreateDto struct {
Employee *EmployeUpdateDto `json:"employee"` Employee *EmployeUpdateDto `json:"employee"`
IHS_Number *string `json:"ihs_number" validate:"maxLength=20"` IHS_Number *string `json:"ihs_number" validate:"maxLength=20"`
SIP_Number *string `json:"sip_number" validate:"maxLength=20"` SIP_Number *string `json:"sip_number" validate:"maxLength=20"`
Unit_Id *uint16 `json:"unit_id"` Unit_Code *string `json:"unit_code"`
Infra_Id *uint16 `json:"infra_id"` Infra_Code *string `json:"infra_code"`
Specialist_Id *uint16 `json:"specialist_id"` Specialist_Code *string `json:"specialist_code"`
Subspecialist_Id *uint16 `json:"subspecialist_id"` Subspecialist_Code *string `json:"subspecialist_code"`
ContractPosition_Code erg.ContractPositionCode `json:"contractPosition_code" gorm:"not null;size:20"` ContractPosition_Code erg.ContractPositionCode `json:"contractPosition_code" gorm:"not null;size:20"`
} }
@@ -21,7 +21,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Doctor) {
data.Employee_Id = inputSrc.Employee_Id data.Employee_Id = inputSrc.Employee_Id
data.IHS_Number = inputSrc.IHS_Number data.IHS_Number = inputSrc.IHS_Number
data.SIP_Number = inputSrc.SIP_Number data.SIP_Number = inputSrc.SIP_Number
data.Unit_Id = inputSrc.Unit_Id data.Unit_Code = inputSrc.Unit_Code
data.Specialist_Id = inputSrc.Specialist_Id data.Specialist_Code = inputSrc.Code
data.Subspecialist_Id = inputSrc.Subspecialist_Id data.Subspecialist_Code = inputSrc.Code
} }
+7 -7
View File
@@ -108,13 +108,13 @@ func Create(input e.CreateDto) (*d.Data, error) {
switch input.Employee.Position_Code { switch input.Employee.Position_Code {
case ero.EPCDoc: case ero.EPCDoc:
createDoc := ed.CreateDto{ createDoc := ed.CreateDto{
Code: input.Code, Code: input.Code,
Employee_Id: &employeeData.Id, Employee_Id: &employeeData.Id,
IHS_Number: input.IHS_Number, IHS_Number: input.IHS_Number,
SIP_Number: input.SIP_Number, SIP_Number: input.SIP_Number,
Unit_Id: input.Unit_Id, Unit_Code: input.Unit_Code,
Specialist_Id: input.Specialist_Id, Specialist_Code: input.Specialist_Code,
Subspecialist_Id: input.Subspecialist_Id, Subspecialist_Code: input.Subspecialist_Code,
} }
if _, err := ud.CreateData(createDoc, &event, tx); err != nil { if _, err := ud.CreateData(createDoc, &event, tx); err != nil {
return err return err