dev: hotfix, doctor getdetail
This commit is contained in:
No files matched your search
@@ -43,6 +43,7 @@ type ReadDetailDto struct {
|
|||||||
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"`
|
||||||
|
Includes string `json:"includes"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type UpdateDto struct {
|
type UpdateDto struct {
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package mcuordersubitem
|
||||||
|
|
||||||
|
import (
|
||||||
|
ecore "simrs-vx/internal/domain/base-entities/core"
|
||||||
|
|
||||||
|
erc "simrs-vx/internal/domain/references/common"
|
||||||
|
)
|
||||||
|
|
||||||
|
type McuOrderSubItem struct {
|
||||||
|
ecore.Main // adjust this according to the needs
|
||||||
|
McuSubSrc_Code *string `json:"mcuSubSrc_code" gorm:"uniqueIndex:idx_order_sub_src"`
|
||||||
|
McuOrderItem_Id *uint `json:"mcuOrderItem_id" gorm:"uniqueIndex:idx_order_sub_src"`
|
||||||
|
Result *string `json:"result"`
|
||||||
|
Status_Code erc.DataStatusCode `json:"status_code"`
|
||||||
|
}
|
||||||
@@ -5,17 +5,15 @@ import (
|
|||||||
emoi "simrs-vx/internal/domain/main-entities/mcu-order-item"
|
emoi "simrs-vx/internal/domain/main-entities/mcu-order-item"
|
||||||
emss "simrs-vx/internal/domain/main-entities/mcu-sub-src"
|
emss "simrs-vx/internal/domain/main-entities/mcu-sub-src"
|
||||||
|
|
||||||
|
emosi "simrs-vx/internal/domain/main-entities/mcu-order-sub-item/base"
|
||||||
erc "simrs-vx/internal/domain/references/common"
|
erc "simrs-vx/internal/domain/references/common"
|
||||||
)
|
)
|
||||||
|
|
||||||
type McuOrderSubItem struct {
|
type McuOrderSubItem struct {
|
||||||
ecore.Main // adjust this according to the needs
|
ecore.Main // adjust this according to the needs
|
||||||
McuSubSrc_Code *string `json:"mcuSubSrc_code" gorm:"uniqueIndex:idx_order_sub_src"`
|
McuSubSrc *emss.McuSubSrc `json:"mcuSubSrc,omitempty" gorm:"foreignKey:McuSubSrc_Code;references:Code"`
|
||||||
McuSubSrc *emss.McuSubSrc `json:"mcuSubSrc,omitempty" gorm:"foreignKey:McuSubSrc_Code;references:Code"`
|
McuOrderItem *emoi.McuOrderItem `json:"mcuOrderItem,omitempty" gorm:"foreignKey:McuOrderItem_Id;references:Id"`
|
||||||
McuOrderItem_Id *uint `json:"mcuOrderItem_id" gorm:"uniqueIndex:idx_order_sub_src"`
|
emosi.McuOrderSubItem
|
||||||
McuOrderItem *emoi.McuOrderItem `json:"mcuOrderItem,omitempty" gorm:"foreignKey:McuOrderItem_Id;references:Id"`
|
|
||||||
Result *string `json:"result"`
|
|
||||||
Status_Code erc.DataStatusCode `json:"status_code"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d McuOrderSubItem) IsCompleted() bool {
|
func (d McuOrderSubItem) IsCompleted() bool {
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
dto := e.ReadDetailDto{}
|
dto := e.ReadDetailDto{}
|
||||||
|
sf.UrlQueryParam(&dto, *r.URL)
|
||||||
dto.Code = &code
|
dto.Code = &code
|
||||||
res, err := u.ReadDetail(dto)
|
res, err := u.ReadDetail(dto)
|
||||||
rw.DataResponse(w, res, err)
|
rw.DataResponse(w, res, err)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package doctor
|
package doctor
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
e "simrs-vx/internal/domain/main-entities/doctor"
|
e "simrs-vx/internal/domain/main-entities/doctor"
|
||||||
|
|
||||||
plh "simrs-vx/pkg/lib-helper"
|
plh "simrs-vx/pkg/lib-helper"
|
||||||
@@ -90,7 +91,8 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
|
|||||||
if input.Code != nil {
|
if input.Code != nil {
|
||||||
tx = tx.Where("\"Code\" = ?", input.Code)
|
tx = tx.Where("\"Code\" = ?", input.Code)
|
||||||
}
|
}
|
||||||
if err := tx.First(&data).Error; err != nil {
|
fmt.Println(input.Includes)
|
||||||
|
if err := tx.Scopes(gh.Preload(input.Includes)).First(&data).Error; err != nil {
|
||||||
if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
|
if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
|
||||||
return nil, processedErr
|
return nil, processedErr
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user