Merge branch 'feat/sync-setting' into feat/sync-from-simgos-161

internal/domain/bpjs-entities/vclaim-reference/dto.go

@@ -0,0 +1,73 @@
+package vclaimreference
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	"time"
+)
+
+type CreateDto struct {
+	Encounter_Id *uint      `json:"encounter_id"`
+	Date         *time.Time `json:"date"`
+	SrcCode      *string    `json:"src_code"`
+	SrcName      *string    `json:"src_name"`
+	Number       *string    `json:"number"`
+}
+
+type ReadListDto struct {
+	FilterDto
+	Includes   string `json:"includes"`
+	Sort       string `json:"sort"`
+	Pagination ecore.Pagination
+}
+
+type FilterDto struct {
+	Encounter_Id *uint `json:"encounter-id"`
+}
+
+type ReadDetailDto struct {
+	Id uint `json:"id"`
+}
+
+type UpdateDto struct {
+	Id uint `json:"id"`
+	CreateDto
+}
+
+type DeleteDto struct {
+	Id uint `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 *uint      `json:"encounter_id"`
+	Date         *time.Time `json:"date"`
+	SrcCode      *string    `json:"src_code"`
+	SrcName      *string    `json:"src_name"`
+	Number       *string    `json:"number"`
+}
+
+func (d VclaimReference) ToResponse() ResponseDto {
+	resp := ResponseDto{
+		Encounter_Id: d.Encounter_Id,
+		Date:         d.Date,
+		SrcCode:      d.SrcCode,
+		SrcName:      d.SrcName,
+		Number:       d.Number,
+	}
+	resp.Main = d.Main
+	return resp
+}
+
+func ToResponseList(data []VclaimReference) []ResponseDto {
+	resp := make([]ResponseDto, len(data))
+	for i, u := range data {
+		resp[i] = u.ToResponse()
+	}
+	return resp
+}

internal/domain/bpjs-entities/vclaim-reference/entity.go

@@ -0,0 +1,15 @@
+package vclaimreference
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	"time"
+)
+
+type VclaimReference struct {
+	ecore.Main
+	Encounter_Id *uint      `json:"encounter_id"`
+	Date         *time.Time `json:"date"`
+	SrcCode      *string    `json:"src_code"`
+	SrcName      *string    `json:"src_name"`
+	Number       *string    `json:"number"`
+}

internal/domain/main-entities/antibiotic-in-use/dto.go

@@ -24,9 +24,11 @@ type FilterDto struct {
 	AntibioticSrc_Id *uint              `json:"mcu-src-id"`
 	Result           *string            `json:"result"`
 	Status_Code      erc.DataStatusCode `json:"status-code"`
+	Includes         string             `json:"includes"`
 }
 type ReadDetailDto struct {
-	Id uint `json:"id"`
+	Id       uint   `json:"id"`
+	Includes string `json:"includes"`
 }
 
 type UpdateDto struct {

internal/domain/main-entities/device-order-item/dto.go

@@ -15,6 +15,7 @@ type CreateDto struct {
 type ReadListDto struct {
 	FilterDto
 	Includes   string `json:"includes"`
+	Sort       string `json:"sort"`
 	Pagination ecore.Pagination
 }
 

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

@@ -4,6 +4,7 @@ import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
 	ep "simrs-vx/internal/domain/main-entities/person"
 	eu "simrs-vx/internal/domain/main-entities/user"
+	"time"
 
 	erc "simrs-vx/internal/domain/references/common"
 	erg "simrs-vx/internal/domain/references/organization"
@@ -55,22 +56,26 @@ type MetaDto struct {
 
 type ResponseDto struct {
 	ecore.Main
-	User_Id     *uint                `json:"user_id"`
-	User        *eu.User             `json:"user,omitempty"`
-	Person_Id   *uint                `json:"person_id"`
-	Person      *ep.Person           `json:"person,omitempty"`
-	Number      *string              `json:"number"`
-	Status_Code erc.ActiveStatusCode `json:"status_code"`
+	User_Id              *uint                     `json:"user_id"`
+	User                 *eu.User                  `json:"user,omitempty"`
+	Person_Id            *uint                     `json:"person_id"`
+	Person               *ep.Person                `json:"person,omitempty"`
+	Number               *string                   `json:"number"`
+	Position_Code        *erg.EmployeePositionCode `json:"position_code"`
+	Contract_ExpiredDate *time.Time                `json:"contract_expiredDate"`
+	Status_Code          erc.ActiveStatusCode      `json:"status_code"`
 }
 
 func (d Employee) ToResponse() ResponseDto {
 	resp := ResponseDto{
-		User_Id:     d.User_Id,
-		User:        d.User,
-		Person_Id:   d.Person_Id,
-		Person:      d.Person,
-		Number:      d.Number,
-		Status_Code: d.Status_Code,
+		User_Id:              d.User_Id,
+		User:                 d.User,
+		Person_Id:            d.Person_Id,
+		Person:               d.Person,
+		Number:               d.Number,
+		Position_Code:        d.Position_Code,
+		Contract_ExpiredDate: d.Contract_ExpiredDate,
+		Status_Code:          d.Status_Code,
 	}
 	resp.Main = d.Main
 	return resp

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

@@ -34,27 +34,28 @@ import (
 )
 
 type CreateDto struct {
-	Patient_Id              *uint                  `json:"patient_id"`
-	RegisteredAt            *time.Time             `json:"registeredAt"`
-	Class_Code              ere.EncounterClassCode `json:"class_code" validate:"maxLength=10"`
-	SubClass_Code           *string                `json:"subClass_code" validate:"maxLength=10"` // for sub
-	Infra_Code              *string                `json:"infra_code"`                            // for inpatient
-	Unit_Code               *string                `json:"unit_code"`
-	Specialist_Code         *string                `json:"specialist_code"`
-	Subspecialist_Code      *string                `json:"subspecialist_code"`
-	VisitDate               time.Time              `json:"visitDate"`
-	PaymentMethod_Code      erc.PaymentMethodCode  `json:"paymentMethod_code" gorm:"size:10"`
-	InsuranceCompany_Code   *string                `json:"insuranceCompany_code"`
-	Member_Number           *string                `json:"member_number" validate:"maxLength=20"`
-	Ref_Number              *string                `json:"ref_number" validate:"maxLength=20"`
-	Trx_Number              *string                `json:"trx_number" validate:"maxLength=20"`
-	Appointment_Doctor_Code *string                `json:"appointment_doctor_code"`
-	Adm_Employee_Id         *uint                  `json:"-"`
-	Responsible_Doctor_Code *string                `json:"responsible_doctor_code"`
-	RefSource_Name          *string                `json:"refSource_name" validate:"maxLength=100"`
-	Appointment_Id          *uint                  `json:"appointment_id"`
-	RefTypeCode             ere.RefTypeCode        `json:"refTypeCode"`
-	NewStatus               bool                   `json:"newStatus"`
+	Patient_Id              *uint                    `json:"patient_id"`
+	RegisteredAt            *time.Time               `json:"registeredAt"`
+	Class_Code              ere.EncounterClassCode   `json:"class_code" validate:"maxLength=10"`
+	SubClass_Code           *string                  `json:"subClass_code" validate:"maxLength=10"` // for sub
+	Infra_Code              *string                  `json:"infra_code"`                            // for inpatient
+	Unit_Code               *string                  `json:"unit_code"`
+	Specialist_Code         *string                  `json:"specialist_code"`
+	Subspecialist_Code      *string                  `json:"subspecialist_code"`
+	VisitDate               time.Time                `json:"visitDate"`
+	PaymentMethod_Code      ere.AllPaymentMethodCode `json:"paymentMethod_code" gorm:"size:10"`
+	InsuranceCompany_Code   *string                  `json:"insuranceCompany_code"`
+	Member_Number           *string                  `json:"member_number" validate:"maxLength=20"`
+	Ref_Number              *string                  `json:"ref_number" validate:"maxLength=20"`
+	Trx_Number              *string                  `json:"trx_number" validate:"maxLength=20"`
+	Appointment_Doctor_Code *string                  `json:"appointment_doctor_code"`
+	Adm_Employee_Id         *uint                    `json:"-"`
+	Responsible_Doctor_Code *string                  `json:"responsible_doctor_code"`
+	RefSource_Name          *string                  `json:"refSource_name" validate:"maxLength=100"`
+	Appointment_Id          *uint                    `json:"appointment_id"`
+	RefTypeCode             ere.RefTypeCode          `json:"refTypeCode"`
+	NewStatus               bool                     `json:"newStatus"`
+	VclaimReference         *TRujukan                `json:"vclaimReference"`
 
 	Id                 uint              `json:"-"`
 	RecentEncounterAdm *Encounter        `json:"-"` // if subClass_Code is rehab
@@ -63,6 +64,18 @@ type CreateDto struct {
 	pa.AuthInfo
 }
 
+type TRujukan struct {
+	NoSep        string `json:"noSep"`
+	TglRujukan   string `json:"tglRujukan"`
+	PpkDirujuk   string `json:"ppkDirujuk"`
+	JnsPelayanan string `json:"jnsPelayanan"`
+	Catatan      string `json:"catatan"`
+	DiagRujukan  string `json:"diagRujukan"`
+	TipeRujukan  string `json:"tipeRujukan"`
+	PoliRujukan  string `json:"poliRujukan"`
+	User         string `json:"user"`
+}
+
 type ReadListDto struct {
 	FilterDto
 	Includes   string `json:"includes"`
@@ -127,6 +140,8 @@ type DischargeDto struct {
 	AdmDischargeEducation     *string                  `json:"admDischargeEducation"`
 	DischargeReason           *string                  `json:"dischargeReason"`
 	DeathCause                *string                  `json:"deathCause"`
+
+	pa.AuthInfo
 }
 
 type CheckinDto struct {
@@ -135,6 +150,8 @@ type CheckinDto struct {
 	Adm_Employee_Id         *uint      `json:"adm_employee_id"`
 	StartedAt               *time.Time `json:"startedAt"`
 	FinishedAt              *time.Time `json:"finishedAt"`
+
+	pa.AuthInfo
 }
 
 type SwitchUnitDto struct {
@@ -161,7 +178,7 @@ type ResponseDto struct {
 	Subspecialist             *ess.Subspecialist       `json:"subspecialist,omitempty"`
 	Unit                      *eu.Unit                 `json:"unit,omitempty"`
 	VisitDate                 time.Time                `json:"visitDate"`
-	PaymentMethod_Code        erc.PaymentMethodCode    `json:"paymentMethod_code"`
+	PaymentMethod_Code        ere.AllPaymentMethodCode `json:"paymentMethod_code"`
 	InsuranceCompany_Code     *string                  `json:"insuranceCompany_code"`
 	Member_Number             *string                  `json:"member_number"`
 	Ref_Number                *string                  `json:"ref_number"`

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

@@ -1,7 +1,13 @@
 package encounter
 
 import (
+	"time"
+
+	erc "simrs-vx/internal/domain/references/common"
+	ere "simrs-vx/internal/domain/references/encounter"
+
 	ecore "simrs-vx/internal/domain/base-entities/core"
+	evr "simrs-vx/internal/domain/bpjs-entities/vclaim-reference"
 	evs "simrs-vx/internal/domain/bpjs-entities/vclaim-sep"
 	eam "simrs-vx/internal/domain/main-entities/ambulatory"
 	ea "simrs-vx/internal/domain/main-entities/appointment"
@@ -19,10 +25,6 @@ import (
 	es "simrs-vx/internal/domain/main-entities/specialist"
 	ess "simrs-vx/internal/domain/main-entities/subspecialist"
 	eu "simrs-vx/internal/domain/main-entities/unit"
-
-	erc "simrs-vx/internal/domain/references/common"
-	ere "simrs-vx/internal/domain/references/encounter"
-	"time"
 )
 
 type Encounter struct {
@@ -40,7 +42,7 @@ type Encounter struct {
 	VisitDate                 time.Time                `json:"visitDate"`
 	StartedAt                 *time.Time               `json:"startedAt"`
 	FinishedAt                *time.Time               `json:"finishedAt"`
-	PaymentMethod_Code        erc.PaymentMethodCode    `json:"paymentMethod_code" gorm:"size:10"`
+	PaymentMethod_Code        ere.AllPaymentMethodCode `json:"paymentMethod_code" gorm:"size:10"`
 	InsuranceCompany_Code     *string                  `json:"insuranceCompany_code"`
 	InsuranceCompany          *ei.InsuranceCompany     `json:"insuranceCompany,omitempty" gorm:"foreignKey:InsuranceCompany_Code;references:Code"`
 	Member_Number             *string                  `json:"memberNumber" gorm:"unique;size:20"`
@@ -74,6 +76,7 @@ type Encounter struct {
 	RehabChildren             *[]er.Basic              `json:"rehabChildren,omitempty" gorm:"foreignKey:Parent_Encounter_Id;references:Id"`
 	EncounterDocuments        *[]eed.EncounterDocument `json:"encounterDocuments,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
 	GeneralConsents           *[]egc.GeneralConsent    `json:"generalConsents,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
+	VclaimReference           *evr.VclaimReference     `json:"vclaimReference,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
 }
 
 func (d Encounter) IsDone() bool {

internal/domain/main-entities/mcu-order-item/base/entity.go

@@ -0,0 +1,20 @@
+package mcuorderitem
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	ems "simrs-vx/internal/domain/main-entities/mcu-src"
+	"time"
+
+	erc "simrs-vx/internal/domain/references/common"
+)
+
+type McuOrderItem struct {
+	ecore.Main                         // adjust this according to the needs
+	McuOrder_Id     *uint              `json:"mcuOrder_id" gorm:"uniqueIndex:idx_order_src"`
+	McuSrc_Code     *string            `json:"mcuSrc_code" gorm:"uniqueIndex:idx_order_src"`
+	McuSrc          *ems.McuSrc        `json:"mcuSrc,omitempty" gorm:"foreignKey:McuSrc_Code;references:Code"`
+	ExaminationDate *time.Time         `json:"examinationDate"`
+	Note            *string            `json:"note" gorm:"size:1024"`
+	Result          *string            `json:"result"`
+	Status_Code     erc.DataStatusCode `json:"status_code"`
+}

internal/domain/main-entities/mcu-order-item/entity.go

@@ -1,23 +1,15 @@
 package mcuorderitem
 
 import (
-	ecore "simrs-vx/internal/domain/base-entities/core"
 	emo "simrs-vx/internal/domain/main-entities/mcu-order"
-	ems "simrs-vx/internal/domain/main-entities/mcu-src"
-	"time"
+	emoib "simrs-vx/internal/domain/main-entities/mcu-order-item/base"
 
 	erc "simrs-vx/internal/domain/references/common"
 )
 
 type McuOrderItem struct {
-	ecore.Main                         // adjust this according to the needs
-	McuOrder_Id     *uint              `json:"mcuOrder_id" gorm:"uniqueIndex:idx_order_src"`
-	McuOrder        *emo.McuOrder      `json:"mcuOrder,omitempty" gorm:"foreignKey:McuOrder_Id;references:Id"`
-	McuSrc_Code     *string            `json:"mcuSrc_code" gorm:"uniqueIndex:idx_order_src"`
-	McuSrc          *ems.McuSrc        `json:"mcuSrc,omitempty" gorm:"foreignKey:McuSrc_Code;references:Code"`
-	ExaminationDate *time.Time         `json:"examinationDate"`
-	Result          *string            `json:"result"`
-	Status_Code     erc.DataStatusCode `json:"status_code"`
+	emoib.McuOrderItem
+	McuOrder *emo.McuOrder `json:"mcuOrder,omitempty" gorm:"foreignKey:McuOrder_Id;references:Id"`
 }
 
 func (d McuOrderItem) IsCompleted() bool {

internal/domain/main-entities/mcu-order/dto.go

@@ -17,6 +17,7 @@ import (
 	// internal - domain - main-entities
 	ed "simrs-vx/internal/domain/main-entities/doctor"
 	ee "simrs-vx/internal/domain/main-entities/encounter"
+	emoib "simrs-vx/internal/domain/main-entities/mcu-order-item/base"
 )
 
 type CreateDto struct {
@@ -85,7 +86,8 @@ type ResponseDto struct {
 	ExaminationDate   *time.Time               `json:"examinationDate"`
 	Number            uint8                    `json:"number"`
 	Temperature       float64                  `json:"temperature"`
-	UrgencyLevel_Code ercl.McuUrgencyLevelCode `json:"urgencyLevel_code""`
+	UrgencyLevel_Code ercl.McuUrgencyLevelCode `json:"urgencyLevel_code"`
+	Items             []*emoib.McuOrderItem    `json:"items"`
 }
 
 func (d McuOrder) ToResponse() ResponseDto {
@@ -100,6 +102,7 @@ func (d McuOrder) ToResponse() ResponseDto {
 		Number:            d.Number,
 		Temperature:       d.Temperature,
 		UrgencyLevel_Code: d.UrgencyLevel_Code,
+		Items:             d.Items,
 	}
 	resp.Main = d.Main
 	return resp

internal/domain/main-entities/mcu-order/entity.go

@@ -4,6 +4,7 @@ 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"
+	emoib "simrs-vx/internal/domain/main-entities/mcu-order-item/base"
 	"time"
 
 	ercl "simrs-vx/internal/domain/references/clinical"
@@ -23,6 +24,11 @@ type McuOrder struct {
 	Temperature       float64                  `json:"temperature"`
 	UrgencyLevel_Code ercl.McuUrgencyLevelCode `json:"urgencyLevel_code" gorm:"not null;size:15"`
 	Scope_Code        ercl.McuScopeCode        `json:"scope_code" gorm:"index;size:10"`
+	Items             []*emoib.McuOrderItem    `json:"items" gorm:"foreignKey:McuOrder_Id;references:Id"`
+}
+
+func (d McuOrder) IsNotNew() bool {
+	return d.Status_Code != erc.DSCNew
 }
 
 func (d McuOrder) IsCompleted() bool {

internal/domain/main-entities/person-address/base/entity.go

@@ -0,0 +1,22 @@
+package personaddress
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	epr "simrs-vx/internal/domain/main-entities/postal-region"
+	ev "simrs-vx/internal/domain/main-entities/village"
+
+	erp "simrs-vx/internal/domain/references/person"
+)
+
+type PersonAddress struct {
+	ecore.Main                                    // adjust this according to the needs
+	Person_Id         uint                        `json:"person_id"`
+	Address           string                      `json:"address" gorm:"size:150"`
+	LocationType_Code erp.AddressLocationTypeCode `json:"locationType_code" gorm:"size:10"`
+	Rt                string                      `json:"rt" gorm:"size:2"`
+	Rw                string                      `json:"rw" gorm:"size:2"`
+	PostalRegion_Code *string                     `json:"postalRegion_code" gorm:"size:6"`
+	PostalRegion      *epr.PostalRegion           `json:"postalRegion,omitempty" gorm:"foreignKey:PostalRegion_Code;references:Code"`
+	Village_Code      *string                     `json:"village_code" gorm:"size:10"`
+	Village           *ev.Village                 `json:"village,omitempty" gorm:"foreignKey:Village_Code;references:Code"`
+}

internal/domain/main-entities/person-address/entity.go

@@ -1,22 +1,9 @@
 package personaddress
 
 import (
-	ecore "simrs-vx/internal/domain/base-entities/core"
-	epr "simrs-vx/internal/domain/main-entities/postal-region"
-	ev "simrs-vx/internal/domain/main-entities/village"
-
-	erp "simrs-vx/internal/domain/references/person"
+	eb "simrs-vx/internal/domain/main-entities/person-address/base"
 )
 
 type PersonAddress struct {
-	ecore.Main                                    // adjust this according to the needs
-	Person_Id         uint                        `json:"person_id"`
-	Address           string                      `json:"address" gorm:"size:150"`
-	LocationType_Code erp.AddressLocationTypeCode `json:"locationType_code" gorm:"size:10"`
-	Rt                string                      `json:"rt" gorm:"size:2"`
-	Rw                string                      `json:"rw" gorm:"size:2"`
-	PostalRegion_Code *string                     `json:"postalRegion_code" gorm:"size:6"`
-	PostalRegion      *epr.PostalRegion           `json:"postalRegion,omitempty" gorm:"foreignKey:PostalRegion_Code;references:Code"`
-	Village_Code      *string                     `json:"village_code" gorm:"size:10"`
-	Village           *ev.Village                 `json:"village,omitempty" gorm:"foreignKey:Village_Code;references:Code"`
+	eb.PersonAddress
 }

internal/domain/main-entities/person-contact/base/entity.go

@@ -0,0 +1,13 @@
+package personcontact
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	erp "simrs-vx/internal/domain/references/person"
+)
+
+type PersonContact struct {
+	ecore.Main                     // adjust this according to the needs
+	Person_Id  uint                `json:"person_id"`
+	Type_Code  erp.ContactTypeCode `json:"type_code" gorm:"size:15"`
+	Value      string              `json:"value" gorm:"size:100"`
+}

internal/domain/main-entities/person-contact/entity.go

@@ -1,13 +1,9 @@
 package personcontact
 
 import (
-	ecore "simrs-vx/internal/domain/base-entities/core"
-	erp "simrs-vx/internal/domain/references/person"
+	eb "simrs-vx/internal/domain/main-entities/person-contact/base"
 )
 
 type PersonContact struct {
-	ecore.Main                     // adjust this according to the needs
-	Person_Id  uint                `json:"person_id"`
-	Type_Code  erp.ContactTypeCode `json:"type_code" gorm:"size:15"`
-	Value      string              `json:"value" gorm:"size:100"`
+	eb.PersonContact
 }

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

@@ -0,0 +1,64 @@
+package resume
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+)
+
+type CreateDto struct {
+	Encounter_Id *uint   `json:"encounter_id"`
+	Value        *string `json:"value"`
+}
+
+type ReadListDto struct {
+	FilterDto
+	Includes   string `json:"includes"`
+	Pagination ecore.Pagination
+}
+
+type FilterDto struct {
+	Encounter_Id *uint `json:"encounter-id"`
+}
+
+type ReadDetailDto struct {
+	Id uint `json:"id"`
+}
+
+type UpdateDto struct {
+	Id uint `json:"id"`
+	CreateDto
+}
+
+type DeleteDto struct {
+	Id uint `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 *uint   `json:"encounter_id"`
+	Value        *string `json:"value"`
+	FileUrl      *string `json:"fileUrl"`
+}
+
+func (d Resume) ToResponse() ResponseDto {
+	resp := ResponseDto{
+		Encounter_Id: d.Encounter_Id,
+		Value:        d.Value,
+		FileUrl:      d.FileUrl,
+	}
+	resp.Main = d.Main
+	return resp
+}
+
+func ToResponseList(data []Resume) []ResponseDto {
+	resp := make([]ResponseDto, len(data))
+	for i, u := range data {
+		resp[i] = u.ToResponse()
+	}
+	return resp
+}

internal/domain/main-entities/resume/entity.go

@@ -0,0 +1,18 @@
+package resume
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	ed "simrs-vx/internal/domain/main-entities/doctor"
+
+	erc "simrs-vx/internal/domain/references/common"
+)
+
+type Resume struct {
+	ecore.Main
+	Encounter_Id *uint                `json:"encounter_id" gorm:"not null"`
+	Doctor_Code  *string              `json:"doctor_code" gorm:"size:10"`
+	Doctor       *ed.Doctor           `json:"doctor,omitempty" gorm:"foreignKey:Doctor_Code;references:Code"`
+	Value        *string              `json:"value"`
+	FileUrl      *string              `json:"fileUrl" gorm:"size:1024"`
+	Status_Code  erc.DataVerifiedCode `json:"status_code" gorm:"not null;size:10"`
+}

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

@@ -32,7 +32,7 @@ type FilterDto struct {
 	Encounter_Id *uint             `json:"encounter-id"`
 	Employee_Id  *uint             `json:"employee-id"`
 	Time         *time.Time        `json:"time"`
-	TypeCode     erc.SoapiTypeCode `json:"typeCode"`
+	TypeCode     erc.SoapiTypeCode `json:"type-code"`
 	Value        *string           `json:"value"`
 }
 
@@ -62,7 +62,7 @@ type ResponseDto struct {
 	Employee_Id  *uint             `json:"employee_id"`
 	Employee     *eem.Employee     `json:"employee,omitempty"`
 	Time         *time.Time        `json:"time"`
-	TypeCode     erc.SoapiTypeCode `json:"typeCode"`
+	TypeCode     erc.SoapiTypeCode `json:"type-code"`
 	Value        *string           `json:"value"`
 }
 

internal/domain/references/clinical/clinical.go

@@ -117,12 +117,14 @@ const (
 	MULCPF      McuUrgencyLevelCode = "priority-form" // Form Prioritas
 	MULCRT      McuUrgencyLevelCode = "routine"       // Pemeriksaan Rutin
 
-	//STCEarlyNurse  SoapiTypeCode = "early-nurse" // Kajian Awal Medis
-	STCEEarlyMedic SoapiTypeCode = "early-medic" // Kajian Awal Rehab Medis
-	STCEarlyRehab  SoapiTypeCode = "early-rehab" // Kajian Awal Rehab Medik
-	STCFunc        SoapiTypeCode = "function"    // Assessment Fungsi
-	STCProgress    SoapiTypeCode = "progress"    // CPPT
-	STCDevRecord   SoapiTypeCode = "dev-record"  // Catatan Perkembangan
+	STCEarlyNurse  SoapiTypeCode = "early-nursery" // Kajian Awal Keperawatan
+	STCEEarlyMedic SoapiTypeCode = "early-medic"   // Kajian Awal Rehab Medis
+	STCEarlyRehab  SoapiTypeCode = "early-rehab"   // Kajian Awal Rehab Medik
+	STCFunc        SoapiTypeCode = "function"      // Assessment Fungsi
+	STCProgress    SoapiTypeCode = "progress"      // CPPT
+	STCDevRecord   SoapiTypeCode = "dev-record"    // Catatan Perkembangan
+	STCKfrAdm      SoapiTypeCode = "kfr-adm"       // soapi untuk kfr
+	STCKfrSeries   SoapiTypeCode = "kfr-series"    // soapi untuk kfr
 
 	MATCChemo      MedicalActionTypeCode = "chemo"
 	MATCHemo       MedicalActionTypeCode = "hemo"

internal/domain/references/common/common.go

@@ -72,9 +72,11 @@ const (
 	DACAvailable   DataAvailabilityCode = "available"   // Tersedia
 	DACUnavailable DataAvailabilityCode = "unavailable" // Tidak Tersedia
 
-	DVCNew      DataVerifiedCode = "new"      // Baru
-	DVCVerified DataVerifiedCode = "verified" // Terverifikasi
-	DVCRejected DataVerifiedCode = "rejected" // Ditolak
+	DVCNew       DataVerifiedCode = "new"       // Baru
+	DVCVerified  DataVerifiedCode = "verified"  // Terverifikasi
+	DVCValidated DataVerifiedCode = "validated" // Tervalidasi
+	DVCCancelled DataVerifiedCode = "cancelled" // Dibatalkan
+	DVCRejected  DataVerifiedCode = "rejected"  // Ditolak
 
 	USCNew       UserStatusCode = "new"       // Baru
 	USCActive    UserStatusCode = "active"    // Aktif

internal/domain/references/encounter/encounter.go

@@ -99,6 +99,7 @@ const (
 	APMCJkmm AllPaymentMethodCode = "jkmm" // JKMM
 	APMCSpm  AllPaymentMethodCode = "spm"  // SPM
 	APMCPks  AllPaymentMethodCode = "pks"  // PKS
+	APMCUmum AllPaymentMethodCode = "umum"
 
 	SRTCInternal SEPRefTypeCode = "internal" // Rujukan Internal
 	SRTCExternal SEPRefTypeCode = "external" // Faskes Lain
@@ -121,6 +122,7 @@ const (
 	DTCSIPP      DocTypeCode = "vclaim-sipp" // SIPP
 	DTCGC        DocTypeCode = "general-consent"
 	DTCVSCL      DocTypeCode = "vclaim-control-letter" // vclaim control letter
+	DTCResume    DocTypeCode = "resume"                // Resume
 
 	ETCPerson    EntityTypeCode = "person"
 	ETCEncounter EntityTypeCode = "encounter"

internal/domain/references/organization/organization.go

@@ -18,14 +18,16 @@ const (
 	EPCReg EmployeePositionCode = "reg" // Admisi/Pendaftaran
 	EPCNur EmployeePositionCode = "nur" // Perawat
 	EPCDoc EmployeePositionCode = "doc" // Dokter
-	EPCNut EmployeePositionCode = "nut" // Ahli gizi
 	EPCMwi EmployeePositionCode = "miw" // Bidan
+	EPCThr EmployeePositionCode = "thr" // Terapis
+	EPCNut EmployeePositionCode = "nut" // Ahli gizi
 	EPCLab EmployeePositionCode = "lab" // Laboran
 	EPCPha EmployeePositionCode = "pha" // Farmasi
-	EPCPay EmployeePositionCode = "pay" // Pembayaran
-	EPCHur EmployeePositionCode = "hue" // Sumber Daya Manusia
-	EPCGea EmployeePositionCode = "gea" // Bagian Umum
-	EPCMan EmployeePositionCode = "man" // Manajemen
+	EPCNom EmployeePositionCode = "nom" // Non Medic
+	// EPCPay EmployeePositionCode = "pay" // Pembayaran
+	// EPCHur EmployeePositionCode = "hue" // Sumber Daya Manusia
+	// EPCGea EmployeePositionCode = "gea" // Bagian Umum
+	// EPCMan EmployeePositionCode = "man" // Manajemen
 
 	IPCSpecialist = "specialist-intern"
 	IPCNurse      = "nurse-intern"

internal/domain/references/person/person.go

@@ -112,6 +112,9 @@ const (
 	RCNephew   RelationshipCode = "nephew"    // Keponakan
 	RCGdChild  RelationshipCode = "gd-child"  // Cucu
 	RCOther    RelationshipCode = "other"     // Lainnya
+	RCFriend   RelationshipCode = "friend"    // Teman
+	RCSpouse   RelationshipCode = "spouse"    // Pasangan (Suami / Istri)
+	RCSelf     RelationshipCode = "self"      // Diri Sendiri
 
 	ALTCIdn AddressLocationTypeCode = "identity" // Sesuai Identitas
 	ALTCDom AddressLocationTypeCode = "domicile" // Sesuai Domisili

internal/domain/simgos-entities/m-instalasi/entity.go

@@ -1,4 +1,4 @@
-package installation
+package m_instalasi
 
 type MInstalasi struct {
 	No_Instalasi      uint   `json:"no_instalasi" gorm:"primaryKey;autoIncrement;column:no_instalasi"`

internal/domain/simgos-entities/m-pasien/entity.go

@@ -1,4 +1,4 @@
-package patient
+package m_pasien
 
 import "time"
 
@@ -65,7 +65,7 @@ type MPasien struct {
 	NamaIbu                 string     `json:"nama_ibu" gorm:"column:nama_ibu"`
 	PendidikanAyah          string     `json:"pendidikan_ayah" gorm:"column:pendidikan_ayah"`
 	PendidikanIbu           string     `json:"pendidikan_ibu" gorm:"column:pendidikan_ibu"`
-	StIdentitasOrtu         string     `json:"st_identitas_ortu" gorm:"column:st_identitas_ortu"`
+	StIdentitasOrtu         uint       `json:"st_identitas_ortu" gorm:"column:st_identitas_ortu"`
 	NomrBaru                *string    `json:"nomr_baru" gorm:"column:nomr_baru"`
 	KtpFile                 *string    `json:"ktp_file" gorm:"column:ktp_file"`
 	KkFile                  *string    `json:"kk_file" gorm:"column:kk_file"`

internal/domain/simgos-entities/m-poly/entity.go

@@ -1,11 +1,11 @@
-package unit
+package m_poly
 
-type MPloy struct {
+type MPoly struct {
 	Kode      uint   `json:"kode" gorm:"primaryKey;autoIncrement;column:kode"`
 	Nama      string `json:"nama" gorm:"column:nama"`
 	Jenispoly uint   `json:"jenispoly" gorm:"column:jenispoly"`
 }
 
-func (MPloy) TableName() string {
+func (MPoly) TableName() string {
 	return "m_poly"
 }

internal/domain/simgos-entities/m-unit/entity.go

@@ -1,4 +1,4 @@
-package division
+package m_unit
 
 type MUnit struct {
 	KodeUnit          uint    `json:"kode_unit" gorm:"primaryKey;autoIncrement;column:kode_unit"`

internal/domain/simgos-entities/t-pemeriksaan-hist/entity.go

@@ -0,0 +1,27 @@
+package t_pemeriksaan_hist
+
+import "time"
+
+type TPemeriksaanHist struct {
+	IdPemeriksaanHist uint       `json:"id_pemeriksaanhist" gorm:"primaryKey;column:id_pemeriksaanhist"`
+	Idxdaftar         *uint      `json:"idxdaftar" gorm:"column:idxdaftar"`
+	Kdpoly            *uint      `json:"kdpoly" gorm:"column:kdpoly"`
+	DokterPengonsul   *uint      `json:"dokter_pengonsul" gorm:"column:dokter_pengonsul"`
+	DokterPenerima    *uint      `json:"dokter_penerima" gorm:"column:dokter_penerima"`
+	StartKonsul       *time.Time `json:"start_konsul" gorm:"column:start_konsul"`
+	EndKonsul         *time.Time `json:"end_konsul" gorm:"column:end_konsul"`
+	UserKonsul        *string    `json:"user_konsul" gorm:"column:user_konsul;size:100"`
+	TglEntriKonsul    *time.Time `json:"tgl_entri_konsul" gorm:"column:tgl_entri_konsul"`
+	IP                *string    `json:"ip" gorm:"column:ip;size:50"`
+	UserPenerima      *string    `json:"user_penerima" gorm:"column:user_penerima;size:100"`
+	MasukPoly         *time.Time `json:"masuk_poly" gorm:"column:masuk_poly"`
+	PerawatPenerima   *uint      `json:"perawat_penerima" gorm:"column:perawat_penerima"`
+	StAktif           *uint16    `json:"st_aktif" gorm:"column:st_aktif"`
+	UserBatal         *string    `json:"user_batal" gorm:"column:user_batal;size:100"`
+	TglBatal          *time.Time `json:"tgl_batal" gorm:"column:tgl_batal"`
+	IdxBillRajal      *uint      `json:"idxbillrajal" gorm:"column:idxbillrajal"`
+}
+
+func (TPemeriksaanHist) TableName() string {
+	return "t_pemeriksaan_hist"
+}

internal/domain/simgos-entities/t-pendaftaran/entity.go

@@ -1,4 +1,4 @@
-package encounter
+package t_pendaftaran
 
 import "time"
 
@@ -16,7 +16,7 @@ type TPendaftaran struct {
 	KeteranganStatus        *uint      `json:"keterangan_status" gorm:"column:keterangan_status"`
 	Pasienbaru              uint       `json:"pasienbaru" gorm:"column:pasienbaru"`
 	Nip                     string     `json:"nip" gorm:"column:nip"`
-	Idxdaftar               uint       `json:"idxdaftar" gorm:"column:idxdaftar"`
+	Idxdaftar               uint       `json:"idxdaftar" gorm:"primaryKey;autoIncrement;column:idxdaftar"`
 	Masukpoly               *time.Time `json:"masukpoly" gorm:"column:masukpoly"`
 	Keluarpoly              *time.Time `json:"keluarpoly" gorm:"column:keluarpoly"`
 	Ketrujuk                string     `json:"ketrujuk" gorm:"column:ketrujuk"`

internal/domain/sync-entities/authentication/authentication.go

@@ -0,0 +1,9 @@
+package authentication
+
+type SyncKey struct{}
+
+type CredentialDto struct {
+	Source    string `json:"X-Sync-Source"`
+	SecretKey string `json:"X-Sync-SecretKey"`
+	UserName  string `json:"X-Sync-UserName"`
+}