munawwirul_jamal/simrsx-be
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:dikstub-rssa/simrs-be into fix/anything-moko

Browse Source
This commit is contained in:
dpurbosakti
2025-12-09 13:21:37 +07:00
parent 30fa443e3e 3d61391756
commit a6ab54c1db
17 changed files with 318 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/main-migration/migrations/20251206021053.sql
+26
View File
@@ -0,0 +1,26 @@
-- Create "ProcedureReport" table
CREATE TABLE "public"."ProcedureReport" (
"Id" bigserial NOT NULL,
"CreatedAt" timestamptz NULL,
"UpdatedAt" timestamptz NULL,
"DeletedAt" timestamptz NULL,
"Encounter_Id" bigint NULL,
"Date" timestamptz NOT NULL,
"Doctor_Code" character varying(10) NULL,
"Operator_Name" text NULL,
"Assistant_Name" text NULL,
"Instrumentor_Name" text NULL,
"Diagnose" character varying(1024) NULL,
"Nurse_Name" character varying(10) NULL,
"Anesthesia_Doctor_Code" character varying(10) NULL,
"Anesthesia_Nurse_Name" text NULL,
"ProcedureValue" text NULL,
"ExecutionValue" text NULL,
"Type_Code" text NULL,
PRIMARY KEY ("Id"),
CONSTRAINT "fk_ProcedureReport_Anesthesia_Doctor" FOREIGN KEY ("Anesthesia_Doctor_Code") REFERENCES "public"."Doctor" ("Code") ON UPDATE NO ACTION ON DELETE NO ACTION,
CONSTRAINT "fk_ProcedureReport_Doctor" FOREIGN KEY ("Doctor_Code") REFERENCES "public"."Doctor" ("Code") ON UPDATE NO ACTION ON DELETE NO ACTION,
CONSTRAINT "fk_ProcedureReport_Encounter" FOREIGN KEY ("Encounter_Id") REFERENCES "public"."Encounter" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION
);
-- Drop "ActionReport" table
DROP TABLE "public"."ActionReport";
cmd/main-migration/migrations/20251209030538.sql
+2
View File
@@ -0,0 +1,2 @@
-- Modify "ProcedureReport" table
ALTER TABLE "public"."ProcedureReport" ALTER COLUMN "Nurse_Name" TYPE text;
internal/domain/main-entities/action-report/dto.go
-90
View File
@@ -1,90 +0,0 @@
package actionreport
import (
ecore "simrs-vx/internal/domain/base-entities/core"
ee "simrs-vx/internal/domain/main-entities/encounter"
"time"
pa "simrs-vx/internal/lib/auth"
)
type CreateDto struct {
Encounter_Id uint64 `json:"encounter_id" validate:"required"`
Date *time.Time `json:"date" validate:"required"`
Doctor_Code string `json:"doctor_code" validate:"required"`
Operator_Employe_Id uint `json:"operator_employe_id" validate:"required"`
Assistant_Employe_Id uint `json:"assistant_employe_id" validate:"required"`
Instrumentor_Employe_Id uint `json:"instrumentor_employe_id" validate:"required"`
Diagnose *string `json:"diagnose"`
Nurse_Code string `json:"nurse_code" validate:"required"`
Value string `json:"value" validate:"required"`
pa.AuthInfo
}
type ReadListDto struct {
FilterDto
Includes string `json:"includes"`
Pagination ecore.Pagination
}
type FilterDto struct {
Encounter_Id *uint `json:"encounter-id"`
}
type ReadDetailDto struct {
Id uint16 `json:"id"`
}
type UpdateDto struct {
Id uint16 `json:"id"`
CreateDto
}
type DeleteDto struct {
Id uint16 `json:"id"`
}
type MetaDto struct {
PageNumber int `json:"page_number"`
PageSize int `json:"page_size"`
Count int `json:"count"`
}
type ResponseDto struct {
ecore.Main
Encounter_Id uint64 `json:"encounter_id"`
Encounter *ee.Encounter `json:"encounter,omitempty"`
Date *time.Time `json:"date"`
Doctor_Code string `json:"doctor_code"`
Operator_Employe_Id uint `json:"operator_employe_id"`
Assistant_Employe_Id uint `json:"assistant_employe_id"`
Instrumentor_Employe_Id uint `json:"instrumentor_employe_id"`
Diagnose *string `json:"diagnose"`
Nurse_Code string `json:"nurse_code"`
Value *string `json:"value"`
}
func (d ActionReport) ToResponse() ResponseDto {
resp := ResponseDto{
Encounter_Id: d.Encounter_Id,
Encounter: d.Encounter,
Date: d.Date,
Doctor_Code: d.Doctor_Code,
Operator_Employe_Id: d.Operator_Employe_Id,
Assistant_Employe_Id: d.Assistant_Employe_Id,
Instrumentor_Employe_Id: d.Instrumentor_Employe_Id,
Nurse_Code: d.Nurse_Code,
Value: &d.Value,
}
resp.Main = d.Main
return resp
}
func ToResponseList(data []ActionReport) []ResponseDto {
resp := make([]ResponseDto, len(data))
for i, u := range data {
resp[i] = u.ToResponse()
}
return resp
}
internal/domain/main-entities/action-report/entity.go
-51
View File
@@ -1,51 +0,0 @@
package actionreport
import (
ecore "simrs-vx/internal/domain/base-entities/core"
ed "simrs-vx/internal/domain/main-entities/doctor"
eem "simrs-vx/internal/domain/main-entities/employee"
ee "simrs-vx/internal/domain/main-entities/encounter"
en "simrs-vx/internal/domain/main-entities/nurse"
"time"
)
type ActionReport struct {
ecore.Main // adjust this according to the needs
Encounter_Id uint64 `json:"encounter_id" gorm:"foreignKey"`
Encounter *ee.Encounter `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
Date *time.Time `json:"date" gorm:"not null;size:20"`
Doctor_Code string `json:"doctor_code" gorm:"size:10"`
Doctor *ed.Doctor `json:"doctor,omitempty" gorm:"foreignKey:Doctor_Code;references:Code"`
Operator_Employe_Id uint `json:"operator_employe_id"`
Operator_Employe *eem.Employee `json:"operator_employe,omitempty" gorm:"foreignKey:Operator_Employe_Id;references:Id"`
Assistant_Employe_Id uint `json:"assistant_employe_id"`
Instrumentor_Employe_Id uint `json:"instrumentor_employe_id"`
Instrumentor_Employe *eem.Employee `json:"instrumentor_employe,omitempty" gorm:"foreignKey:Instrumentor_Employe_Id;references:Id"`
Diagnose *string `json:"diagnose" gorm:"size:1024"`
Nurse_Code string `json:"nurse_code" gorm:"size:10"`
Nurse *en.Nurse `json:"nurse,omitempty" gorm:"foreignKey:Nurse_Code;references:Code"`
Value string `json:"value"`
// SurgerySize_Code *string `json:"surgerySize_code" gorm:"size:10"`
// Billing_Code *string `json:"billing_code" gorm:"size:10"`
// SurgerySystem_Code *string `json:"surgerySystem_code" gorm:"size:10"`
// StartAt *string `json:"startAt" gorm:"size:20"`
// EndAt *string `json:"endAt" gorm:"size:20"`
// AnesthesiaStartAt *string `json:"anesthesiaStartAt" gorm:"size:20"`
// AnesthesiaEndAt *string `json:"anesthesiaEndAt" gorm:"size:20"`
// SurgeryType_Code *string `json:"surgeryType_code" gorm:"size:10"`
// SurgeryStage_Code *string `json:"surgeryStage_code" gorm:"size:10"`
// BornMortality_Code *string `json:"bornMortality_code" gorm:"size:10"`
// BornLocation_Code *string `json:"bornLocation_code" gorm:"size:10"`
// Weight *string `json:"weight" gorm:"size:10"`
// BornNotes *string `json:"bornNotes" gorm:"size:1024"`
// Description *string `json:"notes" gorm:"size:1024"`
// BleedingAmount *uint16 `json:"bleedingAmount" gorm:"size:10"`
// BloodInType_Code *string `json:"bloodInType_code" gorm:"size:10"`
// BloodInAmount *uint16 `json:"bloodInAmount" gorm:"size:10"`
// Brand *string `json:"brand" gorm:"size:100"`
// ImplantName *string `json:"implantName" gorm:"size:100"`
// ImplantRegisterNumber *string `json:"implantRegisterNumber" gorm:"size:100"`
// ImplantCompanionName *string `json:"implantCompanionName" gorm:"size:100"`
// SpecimentDest_Code *string `json:"specimentDest" gorm:"size:100"`
// TissueInfo *string `json:"tissueInfo" gorm:"size:100"`
}
internal/domain/main-entities/procedure-report/dto.go
+111
View File
@@ -0,0 +1,111 @@
package procedurereport
import (
ecore "simrs-vx/internal/domain/base-entities/core"
ee "simrs-vx/internal/domain/main-entities/encounter"
"time"
pa "simrs-vx/internal/lib/auth"
)
type CreateDto struct {
Encounter_Id uint64 `json:"encounter_id" validate:"required"`
Date *time.Time `json:"date" validate:"required"`
Doctor_Code string `json:"doctor_code" validate:"required"`
Operator_Name string `json:"operator_name" validate:"required"`
Assistant_Name string `json:"assistant_name" validate:"required"`
Instrumentor_Name string `json:"instrumentor_name" validate:"required"`
Anesthesia_Doctor_Code *string `json:"anesthesia_doctor_code"`
Anesthesia_Nurse_Name *string `json:"anesthesia_nurse_name"`
Diagnose *string `json:"diagnose"`
Nurse_Name string `json:"nurse_name" validate:"required"`
ProcedureValue string `json:"procedure_value" validate:"required"`
ExecutionValue string `json:"execution_value" validate:"required"`
Type_Code string `json:"type_code" validate:"required"`
pa.AuthInfo
// PROPER
// Operator_Employe_Id uint `json:"operator_employe_id" validate:"required"`
// Assistant_Employe_Id uint `json:"assistant_employe_id" validate:"required"`
// Instrumentor_Employe_Id uint `json:"instrumentor_employe_id" validate:"required"`
// Anesthesia_Doctor_Code string `json:"anesthesia_doctor_code" validate:"required"`
// Anesthesia_Nurse_Employe_Id uint `json:"anesthesia_nurse_employe_id" validate:"required"`
// Nurse_Code string `json:"nurse_code" validate:"required"`
}
type ReadListDto struct {
FilterDto
Includes string `json:"includes"`
Pagination ecore.Pagination
}
type FilterDto struct {
Encounter_Id *uint `json:"encounter-id"`
Type_Code string `json:"type-code"`
}
type ReadDetailDto struct {
Id uint16 `json:"id"`
}
type UpdateDto struct {
Id uint16 `json:"id"`
CreateDto
}
type DeleteDto struct {
Id uint16 `json:"id"`
}
type MetaDto struct {
PageNumber int `json:"page_number"`
PageSize int `json:"page_size"`
Count int `json:"count"`
}
type ResponseDto struct {
ecore.Main
Encounter_Id uint64 `json:"encounter_id"`
Encounter *ee.Encounter `json:"encounter,omitempty"`
Date *time.Time `json:"date"`
Doctor_Code string `json:"doctor_code"`
Operator_Name string `json:"operator_name"`
Assistant_Name string `json:"assistant_name"`
Instrumentor_Name string `json:"instrumentor_name"`
Anesthesia_Doctor_Code *string `json:"anesthesia_doctor_code"`
Anesthesia_Nurse_Name *string `json:"anesthesia_nurse_name"`
Diagnose *string `json:"diagnose"`
Nurse_Name string `json:"nurse_name"`
ProcedureValue *string `json:"procedure_value"`
ExecutionValue *string `json:"execution_value"`
Type_Code string `json:"type_code"`
}
func (d ProcedureReport) ToResponse() ResponseDto {
resp := ResponseDto{
Encounter_Id: d.Encounter_Id,
Encounter: d.Encounter,
Date: d.Date,
Doctor_Code: d.Doctor_Code,
Operator_Name: d.Operator_Name,
Assistant_Name: d.Assistant_Name,
Instrumentor_Name: d.Instrumentor_Name,
Anesthesia_Doctor_Code: d.Anesthesia_Doctor_Code,
Anesthesia_Nurse_Name: d.Anesthesia_Nurse_Name,
Nurse_Name: d.Nurse_Name,
ProcedureValue: &d.ProcedureValue,
ExecutionValue: &d.ExecutionValue,
Type_Code: d.Type_Code,
}
resp.Main = d.Main
return resp
}
func ToResponseList(data []ProcedureReport) []ResponseDto {
resp := make([]ResponseDto, len(data))
for i, u := range data {
resp[i] = u.ToResponse()
}
return resp
}
internal/domain/main-entities/procedure-report/entity.go
+67
View File
@@ -0,0 +1,67 @@
package procedurereport
import (
ecore "simrs-vx/internal/domain/base-entities/core"
ed "simrs-vx/internal/domain/main-entities/doctor"
ee "simrs-vx/internal/domain/main-entities/encounter"
"time"
)
type ProcedureReport struct {
ecore.Main // adjust this according to the needs
Encounter_Id uint64 `json:"encounter_id" gorm:"foreignKey"`
Encounter *ee.Encounter `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
Date *time.Time `json:"date" gorm:"not null;size:20"`
Doctor_Code string `json:"doctor_code" gorm:"size:10"`
Doctor *ed.Doctor `json:"doctor,omitempty" gorm:"foreignKey:Doctor_Code;references:Code"`
Operator_Name string `json:"operator_name"`
Assistant_Name string `json:"assistant_name"`
Instrumentor_Name string `json:"instrumentor_name"`
Diagnose *string `json:"diagnose" gorm:"size:1024"`
Nurse_Name string `json:"nurse_name"`
Anesthesia_Doctor_Code *string `json:"anesthesia_doctor_code" gorm:"size:10"`
Anesthesia_Doctor *ed.Doctor `json:"anesthesia,omitempty" gorm:"foreignKey:Anesthesia_Doctor_Code;references:Code"`
Anesthesia_Nurse_Name *string `json:"anesthesia_nurse_name"`
ProcedureValue string `json:"procedure_value"`
ExecutionValue string `json:"execution_value"`
Type_Code string `json:"type_code"`
// SurgerySize_Code *string `json:"surgerySize_code" gorm:"size:10"`
// Billing_Code *string `json:"billing_code" gorm:"size:10"`
// SurgerySystem_Code *string `json:"surgerySystem_code" gorm:"size:10"`
// StartAt *string `json:"startAt" gorm:"size:20"`
// EndAt *string `json:"endAt" gorm:"size:20"`
// AnesthesiaStartAt *string `json:"anesthesiaStartAt" gorm:"size:20"`
// AnesthesiaEndAt *string `json:"anesthesiaEndAt" gorm:"size:20"`
// SurgeryType_Code *string `json:"surgeryType_code" gorm:"size:10"`
// SurgeryStage_Code *string `json:"surgeryStage_code" gorm:"size:10"`
// BornMortality_Code *string `json:"bornMortality_code" gorm:"size:10"`
// BornLocation_Code *string `json:"bornLocation_code" gorm:"size:10"`
// Weight *string `json:"weight" gorm:"size:10"`
// BornNotes *string `json:"bornNotes" gorm:"size:1024"`
// Description *string `json:"notes" gorm:"size:1024"`
// BleedingAmount *uint16 `json:"bleedingAmount" gorm:"size:10"`
// BloodInType_Code *string `json:"bloodInType_code" gorm:"size:10"`
// BloodInAmount *uint16 `json:"bloodInAmount" gorm:"size:10"`
// Brand *string `json:"brand" gorm:"size:100"`
// ImplantName *string `json:"implantName" gorm:"size:100"`
// ImplantRegisterNumber *string `json:"implantRegisterNumber" gorm:"size:100"`
// ImplantCompanionName *string `json:"implantCompanionName" gorm:"size:100"`
// SpecimentDest_Code *string `json:"specimentDest" gorm:"size:100"`
// TissueInfo *string `json:"tissueInfo" gorm:"size:100"`
//PROPER
// Doctor_Code string `json:"doctor_code" gorm:"size:10"`
// Doctor *ed.Doctor `json:"doctor,omitempty" gorm:"foreignKey:Doctor_Code;references:Code"`
// Operator_Employe_Id uint `json:"operator_employe_id"`
// Operator_Employe *eem.Employee `json:"operator_employe,omitempty" gorm:"foreignKey:Operator_Employe_Id;references:Id"`
// Assistant_Employe_Id uint `json:"assistant_employe_id"`
// Instrumentor_Employe_Id uint `json:"instrumentor_employe_id"`
// Instrumentor_Employe *eem.Employee `json:"instrumentor_employe,omitempty" gorm:"foreignKey:Instrumentor_Employe_Id;references:Id"`
// Nurse_Code string `json:"nurse_code" gorm:"size:10"`
// Nurse *en.Nurse `json:"nurse,omitempty" gorm:"foreignKey:Nurse_Code;references:Code"`
// Anesthesia_Doctor_Code string `json:"anesthesia_doctor_code" gorm:"size:10"`
// Anesthesia *eem.Employee `json:"anesthesia,omitempty" gorm:"foreignKey:Anesthesia_Doctor_Code;references:Code"`
// Anesthesia_Nurse_Employe_Id uint `json:"anesthesia_nurse_employe_id"`
// Anesthesia_Nurse *eem.Employee `json:"anesthesia_nurse,omitempty" gorm:"foreignKey:Anesthesia_Nurse_Employe_Id;references:Id"`
}
internal/domain/references/clinical/clinical.go
+34 -27
View File
@@ -30,6 +30,7 @@ type (
BornMortalityCode string
BornLocationCode string
SpecimentDestCode string
ProcedureReportType string
)
const (
@@ -204,37 +205,40 @@ const (
MSCMicroLab McuScopeCode = "micro-lab"
MSCApLab McuScopeCode = "ap-lab"
SSCSmall SurgerySizeCode = ""
SSCMedium SurgerySizeCode = ""
SSCLarge SurgerySizeCode = ""
SSCSpecial SurgerySizeCode = ""
SSCSmall SurgerySizeCode = "small"
SSCMedium SurgerySizeCode = "medium"
SSCLarge SurgerySizeCode = "large"
SSCSpecial SurgerySizeCode = "special"
SSyCCito SurgerySystemCode = ""
SSyCUrgent SurgerySystemCode = ""
SSyCEfective SurgerySystemCode = ""
SSyCSpecial SurgerySystemCode = ""
SSyCCito SurgerySystemCode = "cito"
SSyCUrgent SurgerySystemCode = "urgent"
SSyCEfective SurgerySystemCode = "efective"
SSyCSpecial SurgerySystemCode = "special"
STCClean SurgeryTypeCode = ""
STCCleanCtm SurgeryTypeCode = ""
STCUncleanCtm SurgeryTypeCode = ""
STCUnclean SurgeryTypeCode = ""
STCClean SurgeryTypeCode = "clean"
STCCleanCtm SurgeryTypeCode = "clean-ctm"
STCUncleanCtm SurgeryTypeCode = "unclean-ctm"
STCUnclean SurgeryTypeCode = "unclean"
SStCFirst SurgeryStageCode = ""
SStCRepeat SurgeryStageCode = ""
SStCFirst SurgeryStageCode = "first"
SStCRepeat SurgeryStageCode = "repeat"
BMCAlive BornMortalityCode = ""
BMCDead BornMortalityCode = ""
BMCAlive BornMortalityCode = "alive"
BMCDead BornMortalityCode = "dead"
BLCExtMiw BornLocationCode = ""
BLCExtDoc BornLocationCode = ""
BLCTradMiw BornLocationCode = ""
BLCLocalMed BornLocationCode = ""
BLCExtParamedic BornLocationCode = ""
BLCExtMiw BornLocationCode = "ext-miw"
BLCExtDoc BornLocationCode = "ext-doc"
BLCTradMiw BornLocationCode = "trad-miw"
BLCLocalMed BornLocationCode = "local-med"
BLCExtParamedic BornLocationCode = "ext-paramedic"
SDCAp SpecimentDestCode = ""
SDCMicro SpecimentDestCode = ""
SDCLab SpecimentDestCode = ""
SDCNone SpecimentDestCode = ""
SDCAp SpecimentDestCode = "ap"
SDCMicro SpecimentDestCode = "micro"
SDCLab SpecimentDestCode = "lab"
SDCNone SpecimentDestCode = "none"
PRTProcedure ProcedureReportType = "procedure"
PRTSurgery ProcedureReportType = "surgery"
)
type Soapi struct {
@@ -360,8 +364,11 @@ type HeadToToe struct {
BodyOthers string `json:"body-others,omitempty"`
}
type RecordAction struct {
Procedures []string `json:"procedures"`
type ProcedureRecord struct {
Procedures []CodeWithName `json:"procedures"`
}
type ProcedureExecution struct {
SurgerySize_Code *string `json:"surgerySize_code"`
Billing_Code *string `json:"billing_code"`
SurgerySystem_Code *string `json:"surgerySystem_code"`
internal/interface/main-handler/main-handler.go
+2 -2
View File
@@ -4,7 +4,6 @@ import (
"net/http"
/******************** main / transaction ********************/
actionreport "simrs-vx/internal/interface/main-handler/action-report"
adime "simrs-vx/internal/interface/main-handler/adime"
admemployeehist "simrs-vx/internal/interface/main-handler/adm-employee-hist"
ambulancetransportrequest "simrs-vx/internal/interface/main-handler/ambulance-transport-req"
@@ -34,6 +33,7 @@ import (
practiceschedule "simrs-vx/internal/interface/main-handler/practice-schedule"
prescription "simrs-vx/internal/interface/main-handler/prescription"
prescriptionitem "simrs-vx/internal/interface/main-handler/prescription-item"
procedurereport "simrs-vx/internal/interface/main-handler/procedure-report"
procedureroom "simrs-vx/internal/interface/main-handler/procedure-room"
procedureroomorder "simrs-vx/internal/interface/main-handler/procedure-room-order"
procedureroomorderitem "simrs-vx/internal/interface/main-handler/procedure-room-order-item"
@@ -178,7 +178,7 @@ func SetRoutes() http.Handler {
hc.RegCrud(r, "/v1/sbar", auth.GuardMW, sbar.O)
hc.RegCrud(r, "/v1/prescription-item", prescriptionitem.O)
hc.RegCrud(r, "/v1/device-order-item", deviceorderitem.O)
hc.RegCrud(r, "/v1/action-report", auth.GuardMW, actionreport.O)
hc.RegCrud(r, "/v1/procedure-report", auth.GuardMW, procedurereport.O)
hc.RegCrud(r, "/v1/material-order-item", materialorderitem.O)
hk.GroupRoutes("/v1/encounter", r, auth.GuardMW, hk.MapHandlerFunc{
internal/interface/main-handler/action-report/handler.go → internal/interface/main-handler/procedure-report/handler.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/action-report"
u "simrs-vx/internal/use-case/main-use-case/action-report"
e "simrs-vx/internal/domain/main-entities/procedure-report"
u "simrs-vx/internal/use-case/main-use-case/procedure-report"
pa "simrs-vx/internal/lib/auth"
internal/interface/migration/main-entities.go
+2 -2
View File
@@ -1,7 +1,6 @@
package migration
import (
actionreport "simrs-vx/internal/domain/main-entities/action-report"
adime "simrs-vx/internal/domain/main-entities/adime"
admemployeehist "simrs-vx/internal/domain/main-entities/adm-employee-hist"
ambulancetransportreq "simrs-vx/internal/domain/main-entities/ambulance-transport-req"
@@ -82,6 +81,7 @@ import (
practiceschedule "simrs-vx/internal/domain/main-entities/practice-schedule"
prescription "simrs-vx/internal/domain/main-entities/prescription"
prescriptionitem "simrs-vx/internal/domain/main-entities/prescription-item"
procedurereport "simrs-vx/internal/domain/main-entities/procedure-report"
procedureroom "simrs-vx/internal/domain/main-entities/procedure-room"
procedureroomorder "simrs-vx/internal/domain/main-entities/procedure-room-order"
procedureroomorderitem "simrs-vx/internal/domain/main-entities/procedure-room-order-item"
@@ -234,6 +234,6 @@ func getMainEntities() []any {
&resume.Resume{},
&vclaimreference.VclaimReference{},
&screening.Screening{},
&actionreport.ActionReport{},
&procedurereport.ProcedureReport{},
}
}
internal/use-case/main-use-case/action-report/helper.go
-28
View File
@@ -1,28 +0,0 @@
/*
DESCRIPTION:
Any functions that are used internally by the use-case
*/
package actionreport
import (
e "simrs-vx/internal/domain/main-entities/action-report"
)
func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.ActionReport) {
var inputSrc *e.CreateDto
if inputT, ok := any(input).(*e.CreateDto); ok {
inputSrc = inputT
} else {
inputTemp := any(input).(*e.UpdateDto)
inputSrc = &inputTemp.CreateDto
}
data.Encounter_Id = inputSrc.Encounter_Id
data.Date = inputSrc.Date
data.Doctor_Code = inputSrc.Doctor_Code
data.Operator_Employe_Id = inputSrc.Operator_Employe_Id
data.Assistant_Employe_Id = inputSrc.Assistant_Employe_Id
data.Instrumentor_Employe_Id = inputSrc.Instrumentor_Employe_Id
data.Nurse_Code = inputSrc.Nurse_Code
data.Value = inputSrc.Value
}
internal/use-case/main-use-case/action-report/case.go → internal/use-case/main-use-case/procedure-report/case.go
+9 -9
View File
@@ -1,10 +1,10 @@
package actionreport
package procedurereport
import (
"errors"
"strconv"
e "simrs-vx/internal/domain/main-entities/action-report"
e "simrs-vx/internal/domain/main-entities/procedure-report"
dg "github.com/karincake/apem/db-gorm-pg"
d "github.com/karincake/dodol"
@@ -15,10 +15,10 @@ import (
"gorm.io/gorm"
)
const source = "action-report"
const source = "procedure-report"
func Create(input e.CreateDto) (*d.Data, error) {
data := e.ActionReport{}
data := e.ProcedureReport{}
event := pl.Event{
Feature: "Create",
@@ -85,8 +85,8 @@ func Create(input e.CreateDto) (*d.Data, error) {
}
func ReadList(input e.ReadListDto) (*d.Data, error) {
var data *e.ActionReport
var dataList []e.ActionReport
var data *e.ProcedureReport
var dataList []e.ProcedureReport
var metaList *e.MetaDto
var err error
@@ -138,7 +138,7 @@ func ReadList(input e.ReadListDto) (*d.Data, error) {
}
func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
var data *e.ActionReport
var data *e.ProcedureReport
var err error
event := pl.Event{
@@ -186,7 +186,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
var data *e.ActionReport
var data *e.ProcedureReport
var err error
event := pl.Event{
@@ -242,7 +242,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
var data *e.ActionReport
var data *e.ProcedureReport
var err error
event := pl.Event{
internal/use-case/main-use-case/procedure-report/helper.go
+39
View File
@@ -0,0 +1,39 @@
/*
DESCRIPTION:
Any functions that are used internally by the use-case
*/
package procedurereport
import (
e "simrs-vx/internal/domain/main-entities/procedure-report"
)
func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.ProcedureReport) {
var inputSrc *e.CreateDto
if inputT, ok := any(input).(*e.CreateDto); ok {
inputSrc = inputT
} else {
inputTemp := any(input).(*e.UpdateDto)
inputSrc = &inputTemp.CreateDto
}
data.Encounter_Id = inputSrc.Encounter_Id
data.Date = inputSrc.Date
data.Doctor_Code = inputSrc.Doctor_Code
data.Operator_Name = inputSrc.Operator_Name
data.Assistant_Name = inputSrc.Assistant_Name
data.Instrumentor_Name = inputSrc.Instrumentor_Name
data.Anesthesia_Doctor_Code = inputSrc.Anesthesia_Doctor_Code
data.Anesthesia_Nurse_Name = inputSrc.Anesthesia_Nurse_Name
data.Diagnose = inputSrc.Diagnose
data.Nurse_Name = inputSrc.Nurse_Name
data.ProcedureValue = inputSrc.ProcedureValue
data.ExecutionValue = inputSrc.ExecutionValue
data.Type_Code = inputSrc.Type_Code
//PROPER
// data.Operator_Employe_Id = inputSrc.Operator_Employe_Id
// data.Assistant_Employe_Id = inputSrc.Assistant_Employe_Id
// data.Instrumentor_Employe_Id = inputSrc.Instrumentor_Employe_Id
// data.Nurse_Code = inputSrc.Nurse_Code
}
internal/use-case/main-use-case/action-report/lib.go → internal/use-case/main-use-case/procedure-report/lib.go
+11 -11
View File
@@ -1,7 +1,7 @@
package actionreport
package procedurereport
import (
e "simrs-vx/internal/domain/main-entities/action-report"
e "simrs-vx/internal/domain/main-entities/procedure-report"
plh "simrs-vx/pkg/lib-helper"
pl "simrs-vx/pkg/logger"
@@ -12,10 +12,10 @@ import (
"gorm.io/gorm"
)
func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.ActionReport, error) {
func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.ProcedureReport, error) {
pl.SetLogInfo(event, nil, "started", "DBCreate")
data := e.ActionReport{}
data := e.ProcedureReport{}
setData(&input, &data)
var tx *gorm.DB
@@ -33,9 +33,9 @@ func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.ActionR
return &data, nil
}
func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.ActionReport, *e.MetaDto, error) {
func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.ProcedureReport, *e.MetaDto, error) {
pl.SetLogInfo(event, input, "started", "DBReadList")
data := []e.ActionReport{}
data := []e.ProcedureReport{}
pagination := gh.Pagination{}
count := int64(0)
meta := e.MetaDto{}
@@ -48,7 +48,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ac
}
tx = tx.
Model(&e.ActionReport{}).
Model(&e.ProcedureReport{}).
Scopes(gh.Preload(input.Includes)).
Scopes(gh.Filter(input.FilterDto)).
Count(&count).
@@ -70,9 +70,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ac
return data, &meta, nil
}
func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.ActionReport, error) {
func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.ProcedureReport, error) {
pl.SetLogInfo(event, input, "started", "DBReadDetail")
data := e.ActionReport{}
data := e.ProcedureReport{}
var tx *gorm.DB
if len(dbx) > 0 {
@@ -91,7 +91,7 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
return &data, nil
}
func UpdateData(input e.UpdateDto, data *e.ActionReport, event *pl.Event, dbx ...*gorm.DB) error {
func UpdateData(input e.UpdateDto, data *e.ProcedureReport, event *pl.Event, dbx ...*gorm.DB) error {
pl.SetLogInfo(event, data, "started", "DBUpdate")
setData(&input, data)
@@ -116,7 +116,7 @@ func UpdateData(input e.UpdateDto, data *e.ActionReport, event *pl.Event, dbx ..
return nil
}
func DeleteData(data *e.ActionReport, event *pl.Event, dbx ...*gorm.DB) error {
func DeleteData(data *e.ProcedureReport, event *pl.Event, dbx ...*gorm.DB) error {
pl.SetLogInfo(event, data, "started", "DBDelete")
var tx *gorm.DB
if len(dbx) > 0 {
internal/use-case/main-use-case/action-report/middleware-runner.go → internal/use-case/main-use-case/procedure-report/middleware-runner.go
+7 -7
View File
@@ -1,7 +1,7 @@
package actionreport
package procedurereport
import (
e "simrs-vx/internal/domain/main-entities/action-report"
e "simrs-vx/internal/domain/main-entities/procedure-report"
pl "simrs-vx/pkg/logger"
pu "simrs-vx/pkg/use-case-helper"
@@ -23,7 +23,7 @@ func newMiddlewareRunner(event *pl.Event, tx *gorm.DB) *middlewareRunner {
}
// ExecuteCreateMiddleware executes create middleware
func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.ActionReport) error {
func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.ProcedureReport) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
@@ -38,7 +38,7 @@ func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e
return nil
}
func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.ActionReport) error {
func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.ProcedureReport) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
@@ -53,7 +53,7 @@ func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, inpu
return nil
}
func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ActionReport) error {
func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ProcedureReport) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
@@ -68,7 +68,7 @@ func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw,
return nil
}
func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ActionReport) error {
func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ProcedureReport) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
@@ -83,7 +83,7 @@ func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, inpu
return nil
}
func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ActionReport) error {
func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ProcedureReport) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
internal/use-case/main-use-case/action-report/middleware.go → internal/use-case/main-use-case/procedure-report/middleware.go
+1 -1
View File
@@ -1,4 +1,4 @@
package actionreport
package procedurereport
// example of middleware
// func init() {
internal/use-case/main-use-case/action-report/tycovar.go → internal/use-case/main-use-case/procedure-report/tycovar.go
+5 -5
View File
@@ -6,27 +6,27 @@ In this sample it also provides type and variable regarding the needs of the
middleware to separate from main use-case which has the basic CRUD
functionality. The purpose of this is to make the code more maintainable.
*/
package actionreport
package procedurereport
import (
"gorm.io/gorm"
e "simrs-vx/internal/domain/main-entities/action-report"
e "simrs-vx/internal/domain/main-entities/procedure-report"
)
type createMw struct {
Name string
Func func(input *e.CreateDto, data *e.ActionReport, tx *gorm.DB) error
Func func(input *e.CreateDto, data *e.ProcedureReport, tx *gorm.DB) error
}
type readListMw struct {
Name string
Func func(input *e.ReadListDto, data *e.ActionReport, tx *gorm.DB) error
Func func(input *e.ReadListDto, data *e.ProcedureReport, tx *gorm.DB) error
}
type readDetailMw struct {
Name string
Func func(input *e.ReadDetailDto, data *e.ActionReport, tx *gorm.DB) error
Func func(input *e.ReadDetailDto, data *e.ProcedureReport, tx *gorm.DB) error
}
type UpdateMw = readDetailMw