This commit is contained in:
dpurbosakti
2025-11-06 11:18:37 +07:00
parent c6da80880c
commit 379b34d5ba
3 changed files with 21 additions and 17 deletions
+8 -8
View File
@@ -11,8 +11,8 @@ type CreateDto struct {
Code *string `json:"code" validate:"maxLength=20"`
Employee_Id *uint `json:"employee_id"`
IHS_Number *string `json:"ihs_number" validate:"maxLength=20"`
Unit_Id *uint16 `json:"unit_id"`
Infra_Id *uint16 `json:"infra_id"`
Unit_Code *string `json:"unit_code"`
Infra_Code *string `json:"infra_code"`
}
type ReadListDto struct {
@@ -25,8 +25,8 @@ type FilterDto struct {
Code *string `json:"code"`
Employee_Id *uint `json:"employee-id"`
IHS_Number *string `json:"ihs-number"`
Unit_Id *uint16 `json:"unit-id"`
Infra_Id *uint16 `json:"infra-id"`
Unit_Code *string `json:"unit-code"`
Infra_Code *string `json:"infra-code"`
}
type ReadDetailDto struct {
Id uint16 `json:"id"`
@@ -56,9 +56,9 @@ type ResponseDto struct {
Employee_Id *uint `json:"employee_id"`
Employee *ee.Employee `json:"employee,omitempty"`
IHS_Number *string `json:"ihs_number"`
Unit_Id *uint16 `json:"unit_id"`
Unit_Code *string `json:"unit_code"`
Unit *eu.Unit `json:"unit,omitempty"`
Infra_Id *uint16 `json:"infra_id"`
Infra_Code *string `json:"infra_code"`
Infra *ei.Infra `json:"infra,omitempty"`
}
@@ -68,9 +68,9 @@ func (d Nurse) ToResponse() ResponseDto {
Employee_Id: d.Employee_Id,
Employee: d.Employee,
IHS_Number: d.IHS_Number,
Unit_Id: d.Unit_Id,
Unit_Code: d.Unit_Code,
Unit: d.Unit,
Infra_Id: d.Infra_Id,
Infra_Code: d.Infra_Code,
Infra: d.Infra,
}
resp.Main = d.Main
@@ -20,6 +20,6 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Nurse) {
data.Code = inputSrc.Code
data.Employee_Id = inputSrc.Employee_Id
data.IHS_Number = inputSrc.IHS_Number
data.Unit_Id = inputSrc.Unit_Id
data.Infra_Id = inputSrc.Infra_Id
data.Unit_Code = inputSrc.Unit_Code
data.Infra_Code = inputSrc.Infra_Code
}
+11 -7
View File
@@ -124,8 +124,8 @@ func Create(input e.CreateDto) (*d.Data, error) {
Code: input.Code,
Employee_Id: &employeeData.Id,
IHS_Number: input.IHS_Number,
Unit_Id: input.Unit_Id,
Infra_Id: input.Infra_Id,
Unit_Code: input.Unit_Code,
Infra_Code: input.Infra_Code,
}
if _, err := un.CreateData(createNurse, &event, tx); err != nil {
return err
@@ -396,11 +396,13 @@ func Update(input e.UpdateDto) (*d.Data, error) {
return err
}
createDoc := ed.CreateDto{
Code: input.Code,
Employee_Id: &employeeData.Id,
IHS_Number: input.IHS_Number,
SIP_Number: input.SIP_Number,
Unit_Id: input.Unit_Id,
Code: input.Code,
Employee_Id: &employeeData.Id,
IHS_Number: input.IHS_Number,
SIP_Number: input.SIP_Number,
Unit_Code: input.Unit_Code,
Specialist_Code: input.Specialist_Code,
Subspecialist_Code: input.Subspecialist_Code,
}
if readDocData != nil {
if err := ud.UpdateData(ed.UpdateDto{CreateDto: createDoc}, readDocData, &event, tx); err != nil {
@@ -422,6 +424,8 @@ func Update(input e.UpdateDto) (*d.Data, error) {
Code: input.Code,
Employee_Id: &employeeData.Id,
IHS_Number: input.IHS_Number,
Unit_Code: input.Unit_Code,
Infra_Code: input.Infra_Code,
}
if readNurData != nil {
if err := un.UpdateData(en.UpdateDto{CreateDto: createNur}, readNurData, &event, tx); err != nil {