Merge pull request #178 from dikstub-rssa/fix/anything-moko

Fix/anything moko

cmd/main-migration/migrations/20251201113804.sql

@@ -0,0 +1,2 @@
+-- Modify "ActionReport" table
+ALTER TABLE "public"."ActionReport" DROP COLUMN "Date", DROP COLUMN "Procedures";

cmd/main-migration/migrations/20251201113858.sql

@@ -0,0 +1,2 @@
+-- Modify "ActionReport" table
+ALTER TABLE "public"."ActionReport" ADD COLUMN "Date" timestamptz NOT NULL;

cmd/main-migration/migrations/20251201114751.sql

@@ -0,0 +1,2 @@
+-- Modify "ActionReport" table
+ALTER TABLE "public"."ActionReport" ADD CONSTRAINT "fk_ActionReport_Instrumentor_Employe" FOREIGN KEY ("Instrumentor_Employe_Id") REFERENCES "public"."Employee" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION, ADD CONSTRAINT "fk_ActionReport_Nurse" FOREIGN KEY ("Nurse_Code") REFERENCES "public"."Nurse" ("Code") ON UPDATE NO ACTION ON DELETE NO ACTION, ADD CONSTRAINT "fk_ActionReport_Operator_Employe" FOREIGN KEY ("Operator_Employe_Id") REFERENCES "public"."Employee" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION;

cmd/main-migration/migrations/20251201114913.sql

@@ -0,0 +1,2 @@
+-- Modify "ActionReport" table
+ALTER TABLE "public"."ActionReport" ADD CONSTRAINT "fk_ActionReport_Doctor" FOREIGN KEY ("Doctor_Code") REFERENCES "public"."Doctor" ("Code") ON UPDATE NO ACTION ON DELETE NO ACTION;

cmd/main-migration/migrations/20251202030445.sql

@@ -0,0 +1,2 @@
+-- Modify "Screening" table
+ALTER TABLE "public"."Screening" ADD COLUMN "Status" text NULL, ADD COLUMN "FileUrl" character varying(1024) NULL;

cmd/main-migration/migrations/20251202044430.sql

@@ -0,0 +1,2 @@
+-- Modify "Item" table
+ALTER TABLE "public"."Item" ADD COLUMN "BuyingPrice" numeric NULL, ADD COLUMN "SellingPrice" numeric NULL;

cmd/main-migration/migrations/20251202064000.sql

@@ -0,0 +1,2 @@
+-- Modify "Soapi" table
+ALTER TABLE "public"."Soapi" ALTER COLUMN "TypeCode" TYPE character varying(15);

cmd/main-migration/migrations/atlas.sum

@@ -1,4 +1,4 @@
-h1:NUsCmkoiBso9yZsv4HWrn3+woqMcFRFtgXKln5rY4pQ=
+h1:uY633gN3JQVVq1z4wKVtoTt3D/bOrBmBqSgjzNxIY7U=
 20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k=
 20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0=
 20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI=
@@ -133,3 +133,10 @@ h1:NUsCmkoiBso9yZsv4HWrn3+woqMcFRFtgXKln5rY4pQ=
 20251126064057.sql h1:vAdhz5Nn/gGJy0UKZAEldeXv8HpHtJU/t8ygDVIbTsU=
 20251201081333.sql h1:PoC8ADRdwDuohDTB74yW/DaB42igdYa4B6humbrEJBk=
 20251201104439.sql h1:tpqdrOf9d2aGwZshqm62nG6SXnfVaO/g6A7z0efPS14=
+20251201113804.sql h1:kIEmVoETJXBkab2Q+b3y/pP84eF8W2BdQ47amHCnc+c=
+20251201113858.sql h1:KLXKZO5XTQPoEU0YLHE8Fhg9WPKpSN3wNgYPJ+RGFcg=
+20251201114751.sql h1:HM17diiPknfSHAmP+kJGP6GzToaPU9/NT+KQBpf3Jq0=
+20251201114913.sql h1:gqucFgHFFLA6n/Rdz486cZH5xkaJuwefESLJMJLDue8=
+20251202030445.sql h1:QWBVfTepT7DaXP5E0BYoxNM0JwKIQ2qIMXzI4kbz/qE=
+20251202044430.sql h1:4QZH9lz0GrQ9rzP1AJ+hJgGalNpp+8FCRckNK7xaTbU=
+20251202064000.sql h1:CcrTalr9bg48srSwCzcswS/erCTD93y72+cINyrHp2o=

internal/domain/main-entities/action-report/dto.go

@@ -3,20 +3,21 @@ 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"`
+	Encounter_Id            uint64     `json:"encounter_id" validate:"required"`
-	Date                    string  `json:"date"`
+	Date                    *time.Time `json:"date" validate:"required"`
-	Doctor_Code             string  `json:"doctor_code"`
+	Doctor_Code             string     `json:"doctor_code" validate:"required"`
-	Operator_Employe_Id     *uint   `json:"operator_employe_id"`
+	Operator_Employe_Id     uint       `json:"operator_employe_id" validate:"required"`
-	Assistant_Employe_Id    *uint   `json:"assistant_employe_id"`
+	Assistant_Employe_Id    uint       `json:"assistant_employe_id" validate:"required"`
-	Instrumentor_Employe_Id *uint   `json:"instrumentor_employe_id"`
+	Instrumentor_Employe_Id uint       `json:"instrumentor_employe_id" validate:"required"`
-	Diagnose                *string `json:"diagnose"`
+	Diagnose                *string    `json:"diagnose"`
-	Nurse_Code              *string `json:"nurse_code"`
+	Nurse_Code              string     `json:"nurse_code" validate:"required"`
-	Value                   string  `json:"value"`
+	Value                   string     `json:"value" validate:"required"`
 
 	pa.AuthInfo
 }
@@ -54,13 +55,13 @@ type ResponseDto struct {
 	ecore.Main
 	Encounter_Id            uint64        `json:"encounter_id"`
 	Encounter               *ee.Encounter `json:"encounter,omitempty"`
-	Date                    string        `json:"date"`
+	Date                    *time.Time    `json:"date"`
 	Doctor_Code             string        `json:"doctor_code"`
-	Operator_Employe_Id     *uint         `json:"operator_employe_id"`
+	Operator_Employe_Id     uint          `json:"operator_employe_id"`
-	Assistant_Employe_Id    *uint         `json:"assistant_employe_id"`
+	Assistant_Employe_Id    uint          `json:"assistant_employe_id"`
-	Instrumentor_Employe_Id *uint         `json:"instrumentor_employe_id"`
+	Instrumentor_Employe_Id uint          `json:"instrumentor_employe_id"`
 	Diagnose                *string       `json:"diagnose"`
-	Nurse_Code              *string       `json:"nurse_code"`
+	Nurse_Code              string        `json:"nurse_code"`
 	Value                   *string       `json:"value"`
 }
 

internal/domain/main-entities/action-report/entity.go

@@ -2,23 +2,29 @@ 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:"doctor,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
+	Encounter               *ee.Encounter `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
-	Date                    string        `json:"date" gorm:"not null;size:20"`
+	Date                    *time.Time    `json:"date" gorm:"not null;size:20"`
 	Doctor_Code             string        `json:"doctor_code" gorm:"size:10"`
-	Operator_Employe_Id     *uint         `json:"operator_employe_id"`
+	Doctor                  *ed.Doctor    `json:"doctor,omitempty" gorm:"foreignKey:Doctor_Code;references:Code"`
-	Assistant_Employe_Id    *uint         `json:"assistant_employe_id"`
+	Operator_Employe_Id     uint          `json:"operator_employe_id"`
-	Instrumentor_Employe_Id *uint         `json:"instrumentor_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"`
-	Procedures              *string       `json:"procedures" gorm:"size:10240"`
+	Nurse_Code              string        `json:"nurse_code" gorm:"size:10"`
-	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"`
-	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"`

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

@@ -62,6 +62,8 @@ type ResponseDto struct {
 	Uom            *eu.Uom           `json:"uom,omitempty"`
 	Infra_Code     *string           `json:"infra_code"`
 	Stock          *int              `json:"stock"`
+	BuyingPrice    *float64          `json:"buyingPrice"`
+	SellingPrice   *float64          `json:"sellingPrice"`
 }
 
 func (d Item) ToResponse() ResponseDto {
@@ -73,6 +75,8 @@ func (d Item) ToResponse() ResponseDto {
 		Uom:            d.Uom,
 		Infra_Code:     d.Infra_Code,
 		Stock:          d.Stock,
+		BuyingPrice:    d.BuyingPrice,
+		SellingPrice:   d.SellingPrice,
 	}
 	resp.Main = d.Main
 	return resp

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

@@ -16,4 +16,6 @@ type Item struct {
 	Uom            *eu.Uom           `json:"uom,omitempty" gorm:"foreignKey:Uom_Code;references:Code"`
 	Infra_Code     *string           `json:"infra_code" gorm:"size:10"`
 	Stock          *int              `json:"stock"`
+	BuyingPrice    *float64          `json:"buyingPrice"`
+	SellingPrice   *float64          `json:"settlingPrice"`
 }

internal/domain/main-entities/mcu-src-category/dto.go

@@ -1,4 +1,4 @@
-package division
+package mcusrccategory
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
@@ -20,10 +20,10 @@ type ReadListDto struct {
 }
 
 type FilterDto struct {
-	Code       string            `json:"code"`
+	Code       *string `json:"code"`
-	Name       string            `json:"name"`
+	Name       *string `json:"name"`
-	Scope_Code *erc.McuScopeCode `json:"scope-code"`
+	Scope_Code *string `json:"scope-code"`
-	Search     string            `json:"search" gormhelper:"searchColumns=Code,Name"`
+	Search     string  `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/mcu-src-category/entity.go

@@ -1,4 +1,4 @@
-package division
+package mcusrccategory
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"

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

@@ -5,6 +5,7 @@ import (
 	eem "simrs-vx/internal/domain/main-entities/employee"
 
 	erc "simrs-vx/internal/domain/references/clinical"
+	erco "simrs-vx/internal/domain/references/common"
 )
 
 type Screening struct {
@@ -13,5 +14,7 @@ type Screening struct {
 	Employee_Id  *uint                     `json:"employee_id"`
 	Employee     *eem.Employee             `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
 	Type         erc.ScreeningFormTypeCode `json:"type"`
+	Status       erco.DataVerifiedCode     `json:"status"`
 	Value        *string                   `json:"value"`
+	FileUrl      *string                   `json:"fileUrl" gorm:"size:1024"`
 }

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

@@ -17,6 +17,6 @@ type Soapi struct {
 	Employee_Id  *uint             `json:"employee_id"`
 	Employee     *eem.Employee     `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
 	Time         *time.Time        `json:"time"`
-	TypeCode     erc.SoapiTypeCode `json:"type_code" gorm:"size:11"`
+	TypeCode     erc.SoapiTypeCode `json:"type_code" gorm:"size:15"`
 	Value        *string           `json:"value"`
 }

internal/domain/references/clinical/clinical.go

@@ -133,6 +133,7 @@ const (
 	STCDevRecord   SoapiTypeCode = "dev-record"    // Catatan Perkembangan
 	STCKfrAdm      SoapiTypeCode = "kfr-adm"       // soapi untuk kfr
 	STCKfrSeries   SoapiTypeCode = "kfr-series"    // soapi untuk kfr
+	STCAmbResume   SoapiTypeCode = "amb-resume"    // Rajal resume
 
 	MATCChemo      MedicalActionTypeCode = "chemo"
 	MATCHemo       MedicalActionTypeCode = "hemo"
@@ -196,8 +197,12 @@ const (
 	TSCTeam   TranslatorSrcCode = "team"   // Tim Penerjemah
 	TSCFamily TranslatorSrcCode = "family" // Keluarga
 
-	SFTCA ScreeningFormTypeCode = "form-a" // Formu A
+	SFTCA        ScreeningFormTypeCode = "form-a" // Formu A
-	SFTCB ScreeningFormTypeCode = "form-b" // Formu B
+	SFTCB        ScreeningFormTypeCode = "form-b" // Formu B
+	MSCRadiology McuScopeCode          = "radiology"
+	MSCCpLab     McuScopeCode          = "cp-lab"
+	MSCMicroLab  McuScopeCode          = "micro-lab"
+	MSCApLab     McuScopeCode          = "ap-lab"
 
 	SSCSmall   SurgerySizeCode = ""
 	SSCMedium  SurgerySizeCode = ""

internal/domain/references/organization/organization.go

@@ -25,6 +25,7 @@ const (
 	EPCLab EmployeePositionCode = "lab" // Laboran
 	EPCPha EmployeePositionCode = "pha" // Farmasi
 	EPCNom EmployeePositionCode = "nom" // Non Medic
+	EPCScr EmployeePositionCode = "scr" // Screening MPP
 	// EPCPay EmployeePositionCode = "pay" // Pembayaran
 	// EPCHur EmployeePositionCode = "hue" // Sumber Daya Manusia
 	// EPCGea EmployeePositionCode = "gea" // Bagian Umum

internal/infra/sync-consumer-cfg/tycovar.go

@@ -0,0 +1,11 @@
+package synccfg
+
+var O SyncConsumerUrlCfg = SyncConsumerUrlCfg{} // old
+
+type SyncConsumerUrlCfg struct {
+	Prefix     string `yaml:"prefix"`
+	TargetHost string `yaml:"targetHost"`
+	Enable     bool   `yaml:"enable"`
+	Source     string `yaml:"source"`
+	SecretKey  string `yaml:"secretKey"`
+}