From 7a9784b4fb35c3ea64ceebd26af8f1c35623af89 Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Mon, 1 Dec 2025 14:50:46 +0700 Subject: [PATCH 1/9] add therapy protocol template, not checked yet --- assets/docs/therapy-protocol-1.html | 312 ++++++++++++++++++++++++++++ assets/docs/therapy-protocol-2.html | 217 +++++++++++++++++++ assets/docs/therapy-protocol-3.html | 241 +++++++++++++++++++++ 3 files changed, 770 insertions(+) create mode 100644 assets/docs/therapy-protocol-1.html create mode 100644 assets/docs/therapy-protocol-2.html create mode 100644 assets/docs/therapy-protocol-3.html diff --git a/assets/docs/therapy-protocol-1.html b/assets/docs/therapy-protocol-1.html new file mode 100644 index 00000000..1e3949d8 --- /dev/null +++ b/assets/docs/therapy-protocol-1.html @@ -0,0 +1,312 @@ + + + + + General Consent + + + + + + + + + + +
+ logo + +
+ PEMERINTAH PROVINSI JAWA TIMUR +
+
+ RUMAH SAKIT UMUM DAERAH Dr. SAIFUL ANWAR +
+
+ TERAKREDITASI KARS VERSI 2012 TINGKAT PARIPURNA +
+
+ Jl. Jaksa Agung Suprapto No. 2 MALANG 65111 +
+
Telp. (0341) 362101, Fax. (0341) 362110
+
Email: rsu-drsaifulanwar@jatimprov.go.id
+
Website: www.rsudsaifulanwar.jatimprov.go.id
+ 		+ logo +
+ +
+ +
+

+ Protokol Terapi +

+

Layanan Kedokteran Fisik dan Rehabilitasi +

+
+Terapi Ke

+{{ .Repalcable }} +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ No RM + {{ .Repalcable }}
+ Nama Pasien + {{ .Repalcable }}
+ Tanggal Lahir + {{ .Repalcable }}
+ Diagnosa + {{ .Repalcable }}
+ Permintaan Terapi + {{ .Repalcable }}
+ Frekuensi Terapi + + 2 x Per Minggu       + Evaluasi: 1 Bulan +
+ Target Terapi + {{ .Repalcable }}
+ Waktu Mencapai Target + {{ .Repalcable }}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ NO + + Tanggal + + Dokter + + Fisioterapi + + Terapi Wicara + + Okupansi Terapi + + Ortotik Prostetik + + PSM + + TTD Pasien +
+ 1 + {{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}
+ 2 + {{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}
+ 3 + {{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}
+ 4 + {{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}
+ 5 + {{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}
+ 6 + {{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}
+ 7 + {{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}
+ 8 + {{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}{{ .Repalcable }}
+ + + + + + + + + + + +
+ Evaluasi + {{ .Repalcable }}
+ Rencana Selanjutnya + {{ .Repalcable }}
+ + + + + + + + + + + +
+ Malang,
+ Cap dan TTD Dr. SpKFR +
+ (........................................................) +
+ +
+ + + \ No newline at end of file diff --git a/assets/docs/therapy-protocol-2.html b/assets/docs/therapy-protocol-2.html new file mode 100644 index 00000000..b468bd43 --- /dev/null +++ b/assets/docs/therapy-protocol-2.html @@ -0,0 +1,217 @@ + + + + + General Consent + + + + + + + + + +
+ logo + +
+ PEMERINTAH PROVINSI JAWA TIMUR +
+
+ RUMAH SAKIT UMUM DAERAH Dr. SAIFUL ANWAR +
+
+ TERAKREDITASI KARS VERSI 2012 TINGKAT PARIPURNA +
+
+ Jl. Jaksa Agung Suprapto No. 2 MALANG 65111 +
+
Telp. (0341) 362101, Fax. (0341) 362110
+
Email: rsu-drsaifulanwar@jatimprov.go.id
+
Website: www.rsudsaifulanwar.jatimprov.go.id
+
+ +
+ + + + + + + + + + + + + + + + + + + +
+ No RM: + {{ .Repalcable }}
+ Nama Pasien + {{ .Repalcable }}
+ Diagnosa + {{ .Repalcable }}
+ Permintaan Terapi + {{ .Repalcable }}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ PELAKSANAAN PROGRAM + + Tanggal + + TTD +
+ PASIEN + + DOKTER + + TERAPIS +
1. {{ .Repalcable }}{{ .Repalcable }}
2. {{ .Repalcable }}{{ .Repalcable }}
3. {{ .Repalcable }}{{ .Repalcable }}
4. {{ .Repalcable }}{{ .Repalcable }}
5. {{ .Repalcable }}{{ .Repalcable }}
6. {{ .Repalcable }}{{ .Repalcable }}
7. {{ .Repalcable }}{{ .Repalcable }}
8. {{ .Repalcable }}{{ .Repalcable }}
9. {{ .Repalcable }}{{ .Repalcable }}
10. {{ .Repalcable }}{{ .Repalcable }}
11. {{ .Repalcable }}{{ .Repalcable }}
12. {{ .Repalcable }}{{ .Repalcable }}
13. {{ .Repalcable }}{{ .Repalcable }}
14. {{ .Repalcable }}{{ .Repalcable }}
15. {{ .Repalcable }}{{ .Repalcable }}
16. {{ .Repalcable }}{{ .Repalcable }}
17. {{ .Repalcable }}{{ .Repalcable }}
18. {{ .Repalcable }}{{ .Repalcable }}
19. {{ .Repalcable }}{{ .Repalcable }}
20. {{ .Repalcable }}{{ .Repalcable }}
+ + + + + + + + + + + + + +
+ Tempat & Tanggal
+ Cap dan TTD Dr. SpKFR +
+ (.................................................) +
+ +
+ + + \ No newline at end of file diff --git a/assets/docs/therapy-protocol-3.html b/assets/docs/therapy-protocol-3.html new file mode 100644 index 00000000..6623fb9e --- /dev/null +++ b/assets/docs/therapy-protocol-3.html @@ -0,0 +1,241 @@ + + + + + General Consent + + + + + + + + + +
+ logo + +
+ PEMERINTAH PROVINSI JAWA TIMUR +
+
+ RUMAH SAKIT UMUM DAERAH Dr. SAIFUL ANWAR +
+
+ TERAKREDITASI KARS VERSI 2012 TINGKAT PARIPURNA +
+
+ Jl. Jaksa Agung Suprapto No. 2 MALANG 65111 +
+
Telp. (0341) 362101, Fax. (0341) 362110
+
Email: rsu-drsaifulanwar@jatimprov.go.id
+
Website: www.rsudsaifulanwar.jatimprov.go.id
+
+ +
+ +
+

+ Lembar Formulir Rawat Jalan
Layanan Kedokteran Fisik dan Rehabilitasi +

+
+ +
+ + + + + + + +
I. Identitas PasienNo. RM: {{ .Repalcable }}
+ + + + + + + + + + + + + + + + + + + + + + + +
+ Nama Pasien + : {{ .Repalcable }}
+ Tanggal Lahir + : {{ .Repalcable }}
+ Aalamat + : {{ .Repalcable }}
+ Telp / HP + : {{ .Repalcable }}
+ Hubungan dengan Tertanggung + : + ☑ Suami / Istri +    + ▢ Anak +
+
+ + +
+ + + + +
II. Diisi oleh Dokter SpKFR
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Tanggal Pelayanan + : {{ .Repalcable }}
+ Anamnesa + : {{ .Repalcable }}
+ Pemeriksaan Fisik dan Uji Fungsi + : {{ .Repalcable }}
+ Diagnosis Medis (ICD-10) + : {{ .Repalcable }}
+ Diagnosis Fungsi (ICD-10) + : {{ .Repalcable }}
+ Pemeriksaan Penunjang + : {{ .Repalcable }}
+ Tata Laksana KFR (ICD 9 CM) + : {{ .Repalcable }}
+ Anjuran + : {{ .Repalcable }}
+ Evaluasi + : {{ .Repalcable }}
+ Suspek Penyakit Akibat Kerja + : + ☑ Ya   ( {{ .Repalcable }} ) + +
+ ▢ Tidak +
+
+ + + + + + + + + + + +
+ TTD Pasien + + Tempat & Tanggal
+ Cap dan TTD Dr. SpKFR +
+ (........................................................) + + (........................................................) +
+ +
+ + + \ No newline at end of file From f8f6a88ff6172f3c9e7ebf6b9910a9de3feb9a3e Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Mon, 1 Dec 2025 15:36:59 +0700 Subject: [PATCH 2/9] feat (screening): wip --- .../interface/main-handler/main-handler.go | 5 +- .../main-handler/screening/handler.go | 80 +++++ .../use-case/main-use-case/screening/case.go | 307 ++++++++++++++++++ .../main-use-case/screening/helper.go | 24 ++ .../use-case/main-use-case/screening/lib.go | 140 ++++++++ .../screening/middleware-runner.go | 103 ++++++ .../main-use-case/screening/middleware.go | 9 + .../main-use-case/screening/tycovar.go | 44 +++ 8 files changed, 711 insertions(+), 1 deletion(-) create mode 100644 internal/interface/main-handler/screening/handler.go create mode 100644 internal/use-case/main-use-case/screening/case.go create mode 100644 internal/use-case/main-use-case/screening/helper.go create mode 100644 internal/use-case/main-use-case/screening/lib.go create mode 100644 internal/use-case/main-use-case/screening/middleware-runner.go create mode 100644 internal/use-case/main-use-case/screening/middleware.go create mode 100644 internal/use-case/main-use-case/screening/tycovar.go diff --git a/internal/interface/main-handler/main-handler.go b/internal/interface/main-handler/main-handler.go index 646bf053..93b645ad 100644 --- a/internal/interface/main-handler/main-handler.go +++ b/internal/interface/main-handler/main-handler.go @@ -36,6 +36,7 @@ import ( responsibledoctorhist "simrs-vx/internal/interface/main-handler/responsible-doctor-hist" resume "simrs-vx/internal/interface/main-handler/resume" sbar "simrs-vx/internal/interface/main-handler/sbar" + screening "simrs-vx/internal/interface/main-handler/screening" soapi "simrs-vx/internal/interface/main-handler/soapi" uploadfile "simrs-vx/internal/interface/main-handler/upload-file" @@ -310,7 +311,9 @@ func SetRoutes() http.Handler { "PATCH /{id}/verify": resume.Verify, "PATCH /{id}/validate": resume.Validate, }) - + hk.GroupRoutes("/v1/screening", r, auth.GuardMW, hk.MapHandlerFunc{ + "POST /": screening.O.Create, + }) /******************** actor ********************/ hc.RegCrud(r, "/v1/person", person.O) hc.RegCrud(r, "/v1/person-address", personaddress.O) diff --git a/internal/interface/main-handler/screening/handler.go b/internal/interface/main-handler/screening/handler.go new file mode 100644 index 00000000..28ca7027 --- /dev/null +++ b/internal/interface/main-handler/screening/handler.go @@ -0,0 +1,80 @@ +package screening + +import ( + "net/http" + + rw "github.com/karincake/risoles" + sf "github.com/karincake/semprit" + + // ua "github.com/karincake/tumpeng/auth/svc" + + e "simrs-vx/internal/domain/main-entities/screening" + u "simrs-vx/internal/use-case/main-use-case/screening" + + pa "simrs-vx/internal/lib/auth" + + d "github.com/karincake/dodol" +) + +type myBase struct{} + +var O myBase + +func (obj myBase) Create(w http.ResponseWriter, r *http.Request) { + authInfo, err := pa.GetAuthInfo(r) + if err != nil { + rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil) + } + dto := e.CreateDto{} + if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + return + } + dto.AuthInfo = *authInfo + res, err := u.Create(dto) + rw.DataResponse(w, res, err) +} + +func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) { + dto := e.ReadListDto{} + sf.UrlQueryParam(&dto, *r.URL) + res, err := u.ReadList(dto) + rw.DataResponse(w, res, err) +} + +func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) { + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + dto := e.ReadDetailDto{} + dto.Id = uint16(id) + res, err := u.ReadDetail(dto) + rw.DataResponse(w, res, err) +} + +func (obj myBase) Update(w http.ResponseWriter, r *http.Request) { + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + + dto := e.UpdateDto{} + if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + return + } + dto.Id = uint16(id) + res, err := u.Update(dto) + rw.DataResponse(w, res, err) +} + +func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) { + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + + dto := e.DeleteDto{} + dto.Id = uint16(id) + res, err := u.Delete(dto) + rw.DataResponse(w, res, err) +} diff --git a/internal/use-case/main-use-case/screening/case.go b/internal/use-case/main-use-case/screening/case.go new file mode 100644 index 00000000..84ae4727 --- /dev/null +++ b/internal/use-case/main-use-case/screening/case.go @@ -0,0 +1,307 @@ +package screening + +import ( + "errors" + "strconv" + + e "simrs-vx/internal/domain/main-entities/screening" + + erc "simrs-vx/internal/domain/references/clinical" + + dg "github.com/karincake/apem/db-gorm-pg" + d "github.com/karincake/dodol" + + pl "simrs-vx/pkg/logger" + pu "simrs-vx/pkg/use-case-helper" + + "gorm.io/gorm" +) + +const source = "screening" + +func Create(input e.CreateDto) (*d.Data, error) { + data := e.Screening{} + + event := pl.Event{ + Feature: "Create", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "create") + + err := dg.I.Transaction(func(tx *gorm.DB) error { + mwRunner := newMiddlewareRunner(&event, tx) + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunCreateMiddleware(createPreMw, &input, &data); err != nil { + return err + } + + if !input.AuthInfo.IsDoctor() && !input.AuthInfo.IsNurse() { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "auth-forbidden", + Detail: "user position is not allowed", + Raw: errors.New("authentication failed"), + } + return pl.SetLogError(&event, input) + } + + if input.AuthInfo.Employee_Id != nil { + v := uint(*input.AuthInfo.Employee_Id) + input.Employee_Id = &v + } else { + input.Employee_Id = nil + } + + if input.Type == erc.SFTCB { + s, _, err := ReadListData(e.ReadListDto{FilterDto: e.FilterDto{Type: erc.SFTCA}}, &event, tx) + if err != nil { + return err + } + if len(s) != 0 { + return errors.New("screening form type A is not created yet, please create it first") + } + } + + if resData, err := CreateData(input, &event, tx); err != nil { + return err + } else { + data = *resData + } + + mwRunner.setMwType(pu.MWTPost) + // Run post-middleware + if err := mwRunner.RunCreateMiddleware(createPostMw, &input, &data); err != nil { + return err + } + + pl.SetLogInfo(&event, nil, "complete") + + return nil + }) + + if err != nil { + return nil, err + } + + return &d.Data{ + Meta: d.II{ + "source": source, + "structure": "single-data", + "status": "created", + }, + Data: data.ToResponse(), + }, nil +} + +func ReadList(input e.ReadListDto) (*d.Data, error) { + var data *e.Screening + var dataList []e.Screening + var metaList *e.MetaDto + var err error + + event := pl.Event{ + Feature: "ReadList", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "readList") + + err = dg.I.Transaction(func(tx *gorm.DB) error { + mwRunner := newMiddlewareRunner(&event, tx) + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunReadListMiddleware(readListPreMw, &input, data); err != nil { + return err + } + + if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { + return err + } + + mwRunner.setMwType(pu.MWTPost) + // Run post-middleware + if err := mwRunner.RunReadListMiddleware(readListPostMw, &input, data); err != nil { + return err + } + + return nil + }) + + if err != nil { + return nil, err + } + + return &d.Data{ + Meta: d.IS{ + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), + }, + Data: e.ToResponseList(dataList), + }, nil +} + +func ReadDetail(input e.ReadDetailDto) (*d.Data, error) { + var data *e.Screening + var err error + + event := pl.Event{ + Feature: "ReadDetail", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "readDetail") + + err = dg.I.Transaction(func(tx *gorm.DB) error { + mwRunner := newMiddlewareRunner(&event, tx) + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunReadDetailMiddleware(readDetailPreMw, &input, data); err != nil { + return err + } + + if data, err = ReadDetailData(input, &event, tx); err != nil { + return err + } + + mwRunner.setMwType(pu.MWTPost) + // Run post-middleware + if err := mwRunner.RunReadDetailMiddleware(readDetailPostMw, &input, data); err != nil { + return err + } + + return nil + }) + + if err != nil { + return nil, err + } + + return &d.Data{ + Meta: d.IS{ + "source": source, + "structure": "single-data", + "status": "fetched", + }, + Data: data.ToResponse(), + }, nil +} + +func Update(input e.UpdateDto) (*d.Data, error) { + rdDto := e.ReadDetailDto{Id: input.Id} + var data *e.Screening + var err error + + event := pl.Event{ + Feature: "Update", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "update") + + err = dg.I.Transaction(func(tx *gorm.DB) error { + pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail") + if data, err = ReadDetailData(rdDto, &event, tx); err != nil { + return err + } + + mwRunner := newMiddlewareRunner(&event, tx) + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunUpdateMiddleware(readDetailPreMw, &rdDto, data); err != nil { + return err + } + + if err := UpdateData(input, data, &event, tx); err != nil { + return err + } + + pl.SetLogInfo(&event, nil, "complete") + + mwRunner.setMwType(pu.MWTPost) + // Run post-middleware + if err := mwRunner.RunUpdateMiddleware(readDetailPostMw, &rdDto, data); err != nil { + return err + } + + return nil + }) + + if err != nil { + return nil, err + } + + return &d.Data{ + Meta: d.IS{ + "source": source, + "structure": "single-data", + "status": "updated", + }, + Data: data.ToResponse(), + }, nil + +} + +func Delete(input e.DeleteDto) (*d.Data, error) { + rdDto := e.ReadDetailDto{Id: input.Id} + var data *e.Screening + var err error + + event := pl.Event{ + Feature: "Delete", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "delete") + + err = dg.I.Transaction(func(tx *gorm.DB) error { + pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail") + if data, err = ReadDetailData(rdDto, &event, tx); err != nil { + return err + } + + mwRunner := newMiddlewareRunner(&event, tx) + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunDeleteMiddleware(readDetailPreMw, &rdDto, data); err != nil { + return err + } + + if err := DeleteData(data, &event, tx); err != nil { + return err + } + + mwRunner.setMwType(pu.MWTPost) + // Run post-middleware + if err := mwRunner.RunDeleteMiddleware(readDetailPostMw, &rdDto, data); err != nil { + return err + } + + return nil + }) + + if err != nil { + return nil, err + } + + return &d.Data{ + Meta: d.IS{ + "source": source, + "structure": "single-data", + "status": "deleted", + }, + Data: data.ToResponse(), + }, nil + +} diff --git a/internal/use-case/main-use-case/screening/helper.go b/internal/use-case/main-use-case/screening/helper.go new file mode 100644 index 00000000..5174d753 --- /dev/null +++ b/internal/use-case/main-use-case/screening/helper.go @@ -0,0 +1,24 @@ +/* +DESCRIPTION: +Any functions that are used internally by the use-case +*/ +package screening + +import ( + e "simrs-vx/internal/domain/main-entities/screening" +) + +func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Screening) { + 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.Employee_Id = inputSrc.Employee_Id + data.Type = inputSrc.Type + data.Value = inputSrc.Value +} diff --git a/internal/use-case/main-use-case/screening/lib.go b/internal/use-case/main-use-case/screening/lib.go new file mode 100644 index 00000000..413e84d2 --- /dev/null +++ b/internal/use-case/main-use-case/screening/lib.go @@ -0,0 +1,140 @@ +package screening + +import ( + e "simrs-vx/internal/domain/main-entities/screening" + + plh "simrs-vx/pkg/lib-helper" + pl "simrs-vx/pkg/logger" + pu "simrs-vx/pkg/use-case-helper" + + dg "github.com/karincake/apem/db-gorm-pg" + gh "github.com/karincake/getuk" + "gorm.io/gorm" +) + +func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.Screening, error) { + pl.SetLogInfo(event, nil, "started", "DBCreate") + + data := e.Screening{} + setData(&input, &data) + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + if err := tx.Create(&data).Error; err != nil { + return nil, plh.HandleCreateError(input, event, err) + } + + pl.SetLogInfo(event, nil, "complete") + return &data, nil +} + +func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Screening, *e.MetaDto, error) { + pl.SetLogInfo(event, input, "started", "DBReadList") + data := []e.Screening{} + pagination := gh.Pagination{} + count := int64(0) + meta := e.MetaDto{} + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + tx = tx. + Model(&e.Screening{}). + Scopes(gh.Preload(input.Includes)). + Scopes(gh.Filter(input.FilterDto)). + Count(&count). + Scopes(gh.Paginate(input, &pagination)). + Order("\"CreatedAt\" DESC") + + if err := tx.Find(&data).Error; err != nil { + if err == gorm.ErrRecordNotFound { + return nil, &meta, nil + } + return nil, nil, plh.HandleListError(input, event, err) + } + + meta.Count = int(count) + meta.PageNumber = pagination.PageNumber + meta.PageSize = pagination.PageSize + + pl.SetLogInfo(event, nil, "complete") + return data, &meta, nil +} + +func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.Screening, error) { + pl.SetLogInfo(event, input, "started", "DBReadDetail") + data := e.Screening{} + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + if err := tx.First(&data, input.Id).Error; err != nil { + if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil { + return nil, processedErr + } + } + + pl.SetLogInfo(event, nil, "complete") + return &data, nil +} + +func UpdateData(input e.UpdateDto, data *e.Screening, event *pl.Event, dbx ...*gorm.DB) error { + pl.SetLogInfo(event, data, "started", "DBUpdate") + setData(&input, data) + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + if err := tx.Save(&data).Error; err != nil { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "data-update-fail", + Detail: "Database update failed", + Raw: err, + } + return pl.SetLogError(event, input) + } + + pl.SetLogInfo(event, nil, "complete") + return nil +} + +func DeleteData(data *e.Screening, event *pl.Event, dbx ...*gorm.DB) error { + pl.SetLogInfo(event, data, "started", "DBDelete") + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + if err := tx.Delete(&data).Error; err != nil { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "data-delete-fail", + Detail: "Database delete failed", + Raw: err, + } + return pl.SetLogError(event, data) + } + + pl.SetLogInfo(event, nil, "complete") + return nil +} diff --git a/internal/use-case/main-use-case/screening/middleware-runner.go b/internal/use-case/main-use-case/screening/middleware-runner.go new file mode 100644 index 00000000..9eb1b4a2 --- /dev/null +++ b/internal/use-case/main-use-case/screening/middleware-runner.go @@ -0,0 +1,103 @@ +package screening + +import ( + e "simrs-vx/internal/domain/main-entities/screening" + pl "simrs-vx/pkg/logger" + pu "simrs-vx/pkg/use-case-helper" + + "gorm.io/gorm" +) + +type middlewareRunner struct { + Event *pl.Event + Tx *gorm.DB + MwType pu.MWType +} + +// NewMiddlewareExecutor creates a new middleware executor +func newMiddlewareRunner(event *pl.Event, tx *gorm.DB) *middlewareRunner { + return &middlewareRunner{ + Event: event, + Tx: tx, + } +} + +// ExecuteCreateMiddleware executes create middleware +func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.Screening) error { + for _, middleware := range middlewares { + logData := pu.GetLogData(input, data) + + pl.SetLogInfo(me.Event, logData, "started", middleware.Name) + + if err := middleware.Func(input, data, me.Tx); err != nil { + return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) + } + + pl.SetLogInfo(me.Event, nil, "complete") + } + return nil +} + +func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.Screening) error { + for _, middleware := range middlewares { + logData := pu.GetLogData(input, data) + + pl.SetLogInfo(me.Event, logData, "started", middleware.Name) + + if err := middleware.Func(input, data, me.Tx); err != nil { + return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) + } + + pl.SetLogInfo(me.Event, nil, "complete") + } + return nil +} + +func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Screening) error { + for _, middleware := range middlewares { + logData := pu.GetLogData(input, data) + + pl.SetLogInfo(me.Event, logData, "started", middleware.Name) + + if err := middleware.Func(input, data, me.Tx); err != nil { + return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) + } + + pl.SetLogInfo(me.Event, nil, "complete") + } + return nil +} + +func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Screening) error { + for _, middleware := range middlewares { + logData := pu.GetLogData(input, data) + + pl.SetLogInfo(me.Event, logData, "started", middleware.Name) + + if err := middleware.Func(input, data, me.Tx); err != nil { + return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) + } + + pl.SetLogInfo(me.Event, nil, "complete") + } + return nil +} + +func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Screening) error { + for _, middleware := range middlewares { + logData := pu.GetLogData(input, data) + + pl.SetLogInfo(me.Event, logData, "started", middleware.Name) + + if err := middleware.Func(input, data, me.Tx); err != nil { + return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) + } + + pl.SetLogInfo(me.Event, nil, "complete") + } + return nil +} + +func (me *middlewareRunner) setMwType(mwType pu.MWType) { + me.MwType = mwType +} diff --git a/internal/use-case/main-use-case/screening/middleware.go b/internal/use-case/main-use-case/screening/middleware.go new file mode 100644 index 00000000..6ec8140c --- /dev/null +++ b/internal/use-case/main-use-case/screening/middleware.go @@ -0,0 +1,9 @@ +package screening + +// example of middleware +// func init() { +// createPreMw = append(createPreMw, +// CreateMw{Name: "modif-input", Func: pm.ModifInput}, +// CreateMw{Name: "check-data", Func: pm.CheckData}, +// ) +// } diff --git a/internal/use-case/main-use-case/screening/tycovar.go b/internal/use-case/main-use-case/screening/tycovar.go new file mode 100644 index 00000000..481f3d3e --- /dev/null +++ b/internal/use-case/main-use-case/screening/tycovar.go @@ -0,0 +1,44 @@ +/* +DESCRIPTION: +A sample, part of the package that contains type, constants, and/or variables. + +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 screening + +import ( + "gorm.io/gorm" + + e "simrs-vx/internal/domain/main-entities/screening" +) + +type createMw struct { + Name string + Func func(input *e.CreateDto, data *e.Screening, tx *gorm.DB) error +} + +type readListMw struct { + Name string + Func func(input *e.ReadListDto, data *e.Screening, tx *gorm.DB) error +} + +type readDetailMw struct { + Name string + Func func(input *e.ReadDetailDto, data *e.Screening, tx *gorm.DB) error +} + +type UpdateMw = readDetailMw +type DeleteMw = readDetailMw + +var createPreMw []createMw // preprocess middleware +var createPostMw []createMw // postprocess middleware +var readListPreMw []readListMw // .. +var readListPostMw []readListMw // .. +var readDetailPreMw []readDetailMw +var readDetailPostMw []readDetailMw +var updatePreMw []readDetailMw +var updatePostMw []readDetailMw +var deletePreMw []readDetailMw +var deletePostMw []readDetailMw From 7e454b0a2d72b55a6aba982f71401a8d66f5fb5e Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Tue, 2 Dec 2025 10:17:06 +0700 Subject: [PATCH 3/9] feat (user): add screening role --- internal/use-case/main-use-case/user/case.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/use-case/main-use-case/user/case.go b/internal/use-case/main-use-case/user/case.go index 50b676af..f6faec22 100644 --- a/internal/use-case/main-use-case/user/case.go +++ b/internal/use-case/main-use-case/user/case.go @@ -166,7 +166,7 @@ func Create(input e.CreateDto) (*d.Data, error) { if _, err := umw.CreateData(createMidWife, &event, tx); err != nil { return err } - case ero.EPCReg: + case ero.EPCReg, ero.EPCScr: // do nothing default: return errors.New("invalid employee position") @@ -523,6 +523,8 @@ func Update(input e.UpdateDto) (*d.Data, error) { if _, err := umw.CreateData(createMidWife, &event, tx); err != nil { return err } + case ero.EPCReg, ero.EPCScr: + // do nothing default: return errors.New("invalid employee position") } From 5adb4e566699ce02177d08f9e227cbcea250c81f Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Tue, 2 Dec 2025 13:37:26 +0700 Subject: [PATCH 4/9] wip --- assets/docs/screening-form-a.html | 131 ++++++++++++++++++ assets/docs/screening-form-b.html | 127 +++++++++++++++++ .../domain/main-entities/screening/dto.go | 36 +++++ .../domain/main-entities/screening/entity.go | 2 + .../main-handler/screening/handler.go | 80 +++++------ internal/lib/auth/tycovar.go | 7 + .../use-case/main-use-case/screening/case.go | 19 ++- .../main-use-case/screening/helper.go | 2 + 8 files changed, 361 insertions(+), 43 deletions(-) create mode 100644 assets/docs/screening-form-a.html create mode 100644 assets/docs/screening-form-b.html diff --git a/assets/docs/screening-form-a.html b/assets/docs/screening-form-a.html new file mode 100644 index 00000000..768eb183 --- /dev/null +++ b/assets/docs/screening-form-a.html @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Tanggal Terbit + : {{ .Repalcable }}
+ No. RM + : {{ .Repalcable }}
+ Nama + : {{ .Repalcable }}
+ Tanggal Lahir + : {{ .Repalcable }}
+ +
+

+ FORM A +

+ +
+

Kajian Awal Medis:

+ + + + + + + +
+ ☑ Kasus Dengan Penyakit Kronis, Katastropik (memerlukan Pembiayaan Tinggi), Terminal +
+ ▢ Status Fungsional Rendah, Kebutuhan Bantuan ADL(Activity Daily Living) Yang Tinggi +
+
+ +
+

ASSESMEN:

+ + +
+
+ +
+

IDENTIFIKASI MASALAH:

+ + +
+
+ +
+

PERENCANAAN:

+ + +
+
+ + + + + + + + + + +
+ 2025-10-08 16:06:22 +
+ GATOT SUBROTO,AMd.Kep +
+ +
+ + + \ No newline at end of file diff --git a/assets/docs/screening-form-b.html b/assets/docs/screening-form-b.html new file mode 100644 index 00000000..1ae8a07c --- /dev/null +++ b/assets/docs/screening-form-b.html @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Tanggal Terbit + : {{ .Repalcable }}
+ No. RM + : {{ .Repalcable }}
+ Nama + : {{ .Repalcable }}
+ Tanggal Lahir + : {{ .Repalcable }}
+ +
+

+ FORM B +

+ + + + + + + + + + + + + + +
+ NO + + Tanggal/jam + + Implementasi, Monitoring, Fasilitasi, koordinasi, komunikasi dan kolaborasi, advokasi, hasil pelayanan, + Terminasi + + MPP +
+ 1 + + 2025-10-08 16:08:18 + +
    +
  • Implementasi: Pemantauan harian terhadap penggunaan alat medis (oksigen dan alat bantu + jalan) serta kepatuhan terapi.
    • +
  • Monitoring: Observasi respon pasien terhadap terapi dan edukasi keluarga untuk perawatan + mandiri di rumah.
    • +
  • Fasilitasi: Menyediakan alat bantu sesuai kebutuhan dan menghubungkan pasien dengan + layanan rehabilitasi medik.
    • +
  • Koordinasi: Melibatkan dokter penanggung jawab, perawat, dan keluarga dalam penyusunan + rencana tindak lanjut.
    • +
  • Komunikasi dan Kolaborasi: Diskusi rutin antar profesi untuk evaluasi perkembangan + pasien.
    • +
  • Advokasi: Memberikan dukungan informasi dan hak pasien terkait rencana pulang dan + kesinambungan terapi.
    • +
  • Hasil Pelayanan: Pasien menunjukkan perbaikan fungsi mobilitas, tingkat kepatuhan terapi + meningkat.
    • +
+ 		+ GATOT SUBROTO,AMd.Kep +
+ +
+ + + \ No newline at end of file diff --git a/internal/domain/main-entities/screening/dto.go b/internal/domain/main-entities/screening/dto.go index 5dfed2c7..cdcc96dc 100644 --- a/internal/domain/main-entities/screening/dto.go +++ b/internal/domain/main-entities/screening/dto.go @@ -84,3 +84,39 @@ func ToResponseList(data []Screening) []ResponseDto { } return resp } + +type FormA struct { + AgeAtRisk bool `json:"ageAtRisk"` // Usia Dengan Risiko + LowCognitiveFunction bool `json:"lowCognitiveFunction"` // Pasien Dengan Fungsi Kognitif Rendah + HighRiskPatient bool `json:"highRiskPatient"` // Pasien Dengan Risiko Tinggi + HighComplaintPotential bool `json:"highComplaintPotential"` // Potensi Komplain Tinggi (Medik dan Non Medik) + ChronicOrCatastrophicOrTerminal bool `json:"chronicOrCatastrophicOrTerminal"` // Kasus Dengan Penyakit Kronis, Katastropik, Terminal + LowFunctionalStatus bool `json:"lowFunctionalStatus"` // Status Fungsional Rendah, Kebutuhan Bantuan ADL Tinggi + HistoryOfMedicalDeviceUse bool `json:"historyOfMedicalDeviceUse"` // Pasien Dengan Riwayat Penggunaan Peralatan Medis Masa Lalu + MentalOrSocialIssues bool `json:"mentalOrSocialIssues"` // Riwayat Gangguan Mental, Bunuh Diri, Krisis Keluarga, Isu Sosial + FrequentERVisitsOrReadmission bool `json:"frequentERVisitsOrReadmission"` // Sering Masuk IGD, Readmisi RS + HighCareCostEstimate bool `json:"highCareCostEstimate"` // Perkiraan Asuhan Dengan Biaya Tinggi + ComplexFinancingSystem bool `json:"complexFinancingSystem"` // Kemungkinan Sistem Pembiayaan Yang Kompleks + AboveAverageLengthOfStay bool `json:"aboveAverageLengthOfStay"` // Kasus Yang Melebihi Rata-Rata Lama Dirawat + ImportantOrHighRiskDischargePlanning bool `json:"importantOrHighRiskDischargePlanning"` // Rencana Pemulangan Penting / Kontinuitas Pelayanan + Stagnation bool `json:"stagnation"` // Stagnasi +} + +type ProblemIdentification struct { + CareNotFollowingGuidelines bool `json:"careNotFollowingGuidelines"` // Tingkat Asuhan Tidak Sesuai Panduan/ Norma + OverUtilization bool `json:"overUtilization"` // Over Utilization Pelayanan + UnderUtilization bool `json:"underUtilization"` // Under Utilization Pelayanan + PatientNonCompliance bool `json:"patientNonCompliance"` // Ketidakpatuhan Pasien + InadequateEducation bool `json:"inadequateEducation"` // Edukasi Kurang Memadai + LackOfFamilySupport bool `json:"lackOfFamilySupport"` // Kurang Dukungan Keluarga + DecreasedDetermination bool `json:"decreasedDetermination"` // Penurunan Determinasi Ketika Komplikasi Meningkat + FinancialDifficultyDuringComplications bool `json:"financialDifficultyDuringComplications"` // Kendala Keuangan Ketika Komplikasi Meningkat + DischargeCriteriaNotMetOrDelayed bool `json:"dischargeCriteriaNotMetOrDelayed"` // Pemulangan/ Rujukan Belum Memenuhi Kriteria/ Ditunda +} + +type AssessmentForm struct { + Screening Screening `json:"screening"` + AssessmentDetail string `json:"assessmentDetail"` // Masukkan detail assesmen + ProblemIdentification ProblemIdentification `json:"problemIdentification"` + PlanningDetail string `json:"planningDetail"` // Masukkan detail perencanaan +} diff --git a/internal/domain/main-entities/screening/entity.go b/internal/domain/main-entities/screening/entity.go index a6284c16..fa650165 100644 --- a/internal/domain/main-entities/screening/entity.go +++ b/internal/domain/main-entities/screening/entity.go @@ -18,3 +18,5 @@ type Screening struct { Value *string `json:"value"` FileUrl *string `json:"fileUrl" gorm:"size:1024"` } + +// func (d Screening) UnMarshal(data []byte) (error {} diff --git a/internal/interface/main-handler/screening/handler.go b/internal/interface/main-handler/screening/handler.go index 28ca7027..29ea5c73 100644 --- a/internal/interface/main-handler/screening/handler.go +++ b/internal/interface/main-handler/screening/handler.go @@ -4,7 +4,7 @@ import ( "net/http" rw "github.com/karincake/risoles" - sf "github.com/karincake/semprit" + // sf "github.com/karincake/semprit" // ua "github.com/karincake/tumpeng/auth/svc" @@ -34,47 +34,47 @@ func (obj myBase) Create(w http.ResponseWriter, r *http.Request) { rw.DataResponse(w, res, err) } -func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) { - dto := e.ReadListDto{} - sf.UrlQueryParam(&dto, *r.URL) - res, err := u.ReadList(dto) - rw.DataResponse(w, res, err) -} +// func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) { +// dto := e.ReadListDto{} +// sf.UrlQueryParam(&dto, *r.URL) +// res, err := u.ReadList(dto) +// rw.DataResponse(w, res, err) +// } -func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) { - id := rw.ValidateInt(w, "id", r.PathValue("id")) - if id <= 0 { - return - } - dto := e.ReadDetailDto{} - dto.Id = uint16(id) - res, err := u.ReadDetail(dto) - rw.DataResponse(w, res, err) -} +// func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) { +// id := rw.ValidateInt(w, "id", r.PathValue("id")) +// if id <= 0 { +// return +// } +// dto := e.ReadDetailDto{} +// dto.Id = uint16(id) +// res, err := u.ReadDetail(dto) +// rw.DataResponse(w, res, err) +// } -func (obj myBase) Update(w http.ResponseWriter, r *http.Request) { - id := rw.ValidateInt(w, "id", r.PathValue("id")) - if id <= 0 { - return - } +// func (obj myBase) Update(w http.ResponseWriter, r *http.Request) { +// id := rw.ValidateInt(w, "id", r.PathValue("id")) +// if id <= 0 { +// return +// } - dto := e.UpdateDto{} - if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { - return - } - dto.Id = uint16(id) - res, err := u.Update(dto) - rw.DataResponse(w, res, err) -} +// dto := e.UpdateDto{} +// if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { +// return +// } +// dto.Id = uint16(id) +// res, err := u.Update(dto) +// rw.DataResponse(w, res, err) +// } -func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) { - id := rw.ValidateInt(w, "id", r.PathValue("id")) - if id <= 0 { - return - } +// func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) { +// id := rw.ValidateInt(w, "id", r.PathValue("id")) +// if id <= 0 { +// return +// } - dto := e.DeleteDto{} - dto.Id = uint16(id) - res, err := u.Delete(dto) - rw.DataResponse(w, res, err) -} +// dto := e.DeleteDto{} +// dto.Id = uint16(id) +// res, err := u.Delete(dto) +// rw.DataResponse(w, res, err) +// } diff --git a/internal/lib/auth/tycovar.go b/internal/lib/auth/tycovar.go index 117d0c73..c673eb04 100644 --- a/internal/lib/auth/tycovar.go +++ b/internal/lib/auth/tycovar.go @@ -65,6 +65,13 @@ func (a AuthInfo) IsPharmacist() bool { return *a.Employee_Position_Code == string(ero.EPCPha) } +func (a AuthInfo) IsScreener() bool { // MPP, petugas skrining + if a.Employee_Position_Code == nil { + return false + } + return *a.Employee_Position_Code == string(ero.EPCScr) +} + // func (a AuthInfo) IsPayment() bool { // if a.Employee_Position_Code == nil { // return false diff --git a/internal/use-case/main-use-case/screening/case.go b/internal/use-case/main-use-case/screening/case.go index 84ae4727..f6673450 100644 --- a/internal/use-case/main-use-case/screening/case.go +++ b/internal/use-case/main-use-case/screening/case.go @@ -38,7 +38,11 @@ func Create(input e.CreateDto) (*d.Data, error) { return err } - if !input.AuthInfo.IsDoctor() && !input.AuthInfo.IsNurse() { + if !pu.Contains([]erc.ScreeningFormTypeCode{erc.SFTCB, erc.SFTCA}, input.Type) { + return errors.New("invalid screening form type") + } + + if !input.AuthInfo.IsScreener() { event.Status = "failed" event.ErrInfo = pl.ErrorInfo{ Code: "auth-forbidden", @@ -55,12 +59,21 @@ func Create(input e.CreateDto) (*d.Data, error) { input.Employee_Id = nil } - if input.Type == erc.SFTCB { + switch input.Type { + case erc.SFTCA: s, _, err := ReadListData(e.ReadListDto{FilterDto: e.FilterDto{Type: erc.SFTCA}}, &event, tx) if err != nil { return err } - if len(s) != 0 { + if len(s) > 0 { + return errors.New("screening form type A is already created for this encounter") + } + case erc.SFTCB: + s, _, err := ReadListData(e.ReadListDto{FilterDto: e.FilterDto{Type: erc.SFTCA}}, &event, tx) + if err != nil { + return err + } + if len(s) < 1 { return errors.New("screening form type A is not created yet, please create it first") } } diff --git a/internal/use-case/main-use-case/screening/helper.go b/internal/use-case/main-use-case/screening/helper.go index 5174d753..94692281 100644 --- a/internal/use-case/main-use-case/screening/helper.go +++ b/internal/use-case/main-use-case/screening/helper.go @@ -6,12 +6,14 @@ package screening import ( e "simrs-vx/internal/domain/main-entities/screening" + erc "simrs-vx/internal/domain/references/common" ) func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Screening) { var inputSrc *e.CreateDto if inputT, ok := any(input).(*e.CreateDto); ok { inputSrc = inputT + data.Status = erc.DVCValidated } else { inputTemp := any(input).(*e.UpdateDto) inputSrc = &inputTemp.CreateDto From 821c99833eb78c3cc687a486553f33cd905172f4 Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Tue, 2 Dec 2025 16:12:13 +0700 Subject: [PATCH 5/9] fix template screening form a --- assets/docs/screening-form-a.html | 110 ++++++++++++------ .../domain/main-entities/screening/dto.go | 89 +++++++++++++- .../main-use-case/generate-file/helper.go | 40 +++++++ .../main-use-case/generate-file/tycovar.go | 15 +++ 4 files changed, 214 insertions(+), 40 deletions(-) diff --git a/assets/docs/screening-form-a.html b/assets/docs/screening-form-a.html index 768eb183..a838c111 100644 --- a/assets/docs/screening-form-a.html +++ b/assets/docs/screening-form-a.html @@ -32,34 +32,43 @@ - + +
+ Tanggal Terbit : {{ .IssuedDate }} +
+ + +
- - - + + + - - - + + + - - - - - - - - + + +
- Tanggal Terbit - : {{ .Repalcable }}No. RM:{{ .MedicalRecord }}
- No. RM - : {{ .Repalcable }}Nama:{{ .Name }}
- Nama - : {{ .Repalcable }}
- Tanggal Lahir - : {{ .Repalcable }}Tanggal Lahir:{{ .BirthDate }}
@@ -69,58 +78,85 @@ font-weight: bold; font-size: 1rem; margin: 0; - "> + "> FORM A

Kajian Awal Medis:

+ + {{ if gt (len .EarlyMedic) 0 }} + {{ range .EarlyMedic }} + {{ end }} + {{ else }} - + -
- ☑ Kasus Dengan Penyakit Kronis, Katastropik (memerlukan Pembiayaan Tinggi), Terminal + ☑ {{ . }}
- ▢ Status Fungsional Rendah, Kebutuhan Bantuan ADL(Activity Daily Living) Yang Tinggi -
+ {{ end }} + +

ASSESMEN:

- + + +
+ {{ .Assessment }} +

IDENTIFIKASI MASALAH:

- -
+ {{ if gt (len .ProblemIdentification) 0 }} + {{ range .ProblemIdentification }} + + + ☑ {{ . }} + + + {{ end }} + {{ else }} + + + + {{ end }} + +

PERENCANAAN:

- + + +
+ {{ .Planning }} +
- + -
- 2025-10-08 16:06:22 + + {{ .Date }}
- GATOT SUBROTO,AMd.Kep + + ({{ .Employee_Name }})
diff --git a/internal/domain/main-entities/screening/dto.go b/internal/domain/main-entities/screening/dto.go index cdcc96dc..b001af39 100644 --- a/internal/domain/main-entities/screening/dto.go +++ b/internal/domain/main-entities/screening/dto.go @@ -85,7 +85,7 @@ func ToResponseList(data []Screening) []ResponseDto { return resp } -type FormA struct { +type ScreeningEntry struct { AgeAtRisk bool `json:"ageAtRisk"` // Usia Dengan Risiko LowCognitiveFunction bool `json:"lowCognitiveFunction"` // Pasien Dengan Fungsi Kognitif Rendah HighRiskPatient bool `json:"highRiskPatient"` // Pasien Dengan Risiko Tinggi @@ -114,9 +114,92 @@ type ProblemIdentification struct { DischargeCriteriaNotMetOrDelayed bool `json:"dischargeCriteriaNotMetOrDelayed"` // Pemulangan/ Rujukan Belum Memenuhi Kriteria/ Ditunda } -type AssessmentForm struct { - Screening Screening `json:"screening"` +type FormA struct { + Screening ScreeningEntry `json:"screening"` AssessmentDetail string `json:"assessmentDetail"` // Masukkan detail assesmen ProblemIdentification ProblemIdentification `json:"problemIdentification"` PlanningDetail string `json:"planningDetail"` // Masukkan detail perencanaan } + +func (s ScreeningEntry) SelectedScreeningLabels() []string { + result := []string{} + + if s.AgeAtRisk { + result = append(result, "Usia Dengan Risiko") + } + if s.LowCognitiveFunction { + result = append(result, "Pasien Dengan Fungsi Kognitif Rendah") + } + if s.HighRiskPatient { + result = append(result, "Pasien Dengan Risiko Tinggi") + } + if s.HighComplaintPotential { + result = append(result, "Potensi Komplain Tinggi (Medik dan Non Medik)") + } + if s.ChronicOrCatastrophicOrTerminal { + result = append(result, "Kasus Dengan Penyakit Kronis, Katastropik, Terminal") + } + if s.LowFunctionalStatus { + result = append(result, "Status Fungsional Rendah, Kebutuhan Bantuan ADL Tinggi") + } + if s.HistoryOfMedicalDeviceUse { + result = append(result, "Pasien Dengan Riwayat Penggunaan Peralatan Medis Masa Lalu") + } + if s.MentalOrSocialIssues { + result = append(result, "Riwayat Gangguan Mental, Bunuh Diri, Krisis Keluarga, Isu Sosial") + } + if s.FrequentERVisitsOrReadmission { + result = append(result, "Sering Masuk IGD, Readmisi RS") + } + if s.HighCareCostEstimate { + result = append(result, "Perkiraan Asuhan Dengan Biaya Tinggi") + } + if s.ComplexFinancingSystem { + result = append(result, "Kemungkinan Sistem Pembiayaan Yang Kompleks") + } + if s.AboveAverageLengthOfStay { + result = append(result, "Kasus Yang Melebihi Rata-Rata Lama Dirawat") + } + if s.ImportantOrHighRiskDischargePlanning { + result = append(result, "Rencana Pemulangan Penting / Kontinuitas Pelayanan") + } + if s.Stagnation { + result = append(result, "Stagnasi") + } + + return result +} + +func (p ProblemIdentification) SelectedProblemLabels() []string { + result := []string{} + + if p.CareNotFollowingGuidelines { + result = append(result, "Tingkat Asuhan Tidak Sesuai Panduan/ Norma") + } + if p.OverUtilization { + result = append(result, "Over Utilization Pelayanan") + } + if p.UnderUtilization { + result = append(result, "Under Utilization Pelayanan") + } + if p.PatientNonCompliance { + result = append(result, "Ketidakpatuhan Pasien") + } + if p.InadequateEducation { + result = append(result, "Edukasi Kurang Memadai") + } + if p.LackOfFamilySupport { + result = append(result, "Kurang Dukungan Keluarga") + } + if p.DecreasedDetermination { + result = append(result, "Penurunan Determinasi Ketika Komplikasi Meningkat") + } + if p.FinancialDifficultyDuringComplications { + result = append(result, "Kendala Keuangan Ketika Komplikasi Meningkat") + } + if p.DischargeCriteriaNotMetOrDelayed { + result = append(result, "Pemulangan/ Rujukan Belum Memenuhi Kriteria/ Ditunda") + } + + return result +} diff --git a/internal/use-case/main-use-case/generate-file/helper.go b/internal/use-case/main-use-case/generate-file/helper.go index 6edd34d8..76e4f5ee 100644 --- a/internal/use-case/main-use-case/generate-file/helper.go +++ b/internal/use-case/main-use-case/generate-file/helper.go @@ -13,6 +13,7 @@ import ( ee "simrs-vx/internal/domain/main-entities/encounter" egc "simrs-vx/internal/domain/main-entities/general-consent" er "simrs-vx/internal/domain/main-entities/resume" + es "simrs-vx/internal/domain/main-entities/screening" uvs "simrs-vx/internal/use-case/bpjs-use-case/vclaim-sep" uvscl "simrs-vx/internal/use-case/bpjs-use-case/vclaim-sep-control-letter" @@ -339,3 +340,42 @@ func generateResumeTemplateData(resume er.Resume, event pl.Event, tx *gorm.DB) ( return &templateData, nil } + +func generateScreeningFormATemplateData(screening es.Screening, event pl.Event, tx *gorm.DB) (*ScreeningPDF, error) { + // get encounter + includes := "Patient,Patient.Person" + encounter, err := ue.ReadDetailData(ee.ReadDetailDto{Id: *screening.Encounter_Id, Includes: includes}, &event) + if err != nil { + return nil, err + } + + // map template data + sData := es.FormA{} + if screening.Value != nil { + err := json.Unmarshal([]byte(*screening.Value), &sData) + if err != nil { + event.ErrInfo = pl.ErrorInfo{ + Code: "data-unmarshal-fail", + Detail: err.Error(), + Raw: err, + } + return nil, err + } + } else { + return nil, errors.New("there is no data to be used") + } + + templateData := ScreeningPDF{} + templateData.IssuedDate = pu.GetTimeNow().Format("2006-01-02 15:04:05") + templateData.MedicalRecord = *encounter.Patient.Number + templateData.Name = encounter.Patient.Person.FullName() + templateData.BirthDate = encounter.Patient.Person.BirthDate.Format("2006-01-02 15:04:05") + templateData.Employee_Name = screening.Employee.Person.FullName() + templateData.EarlyMedic = sData.Screening.SelectedScreeningLabels() + templateData.Assessment = sData.AssessmentDetail + templateData.ProblemIdentification = sData.ProblemIdentification.SelectedProblemLabels() + templateData.Planning = sData.PlanningDetail + templateData.Date = screening.CreatedAt.Format("2006-01-02 15:04:05") + + return &templateData, nil +} diff --git a/internal/use-case/main-use-case/generate-file/tycovar.go b/internal/use-case/main-use-case/generate-file/tycovar.go index a242f476..d5a7220e 100644 --- a/internal/use-case/main-use-case/generate-file/tycovar.go +++ b/internal/use-case/main-use-case/generate-file/tycovar.go @@ -72,6 +72,19 @@ type ResumePDF struct { Date string } +type ScreeningPDF struct { + IssuedDate string + Date string + MedicalRecord string + Name string + BirthDate string + Employee_Name string + EarlyMedic []string + Assessment string + ProblemIdentification []string + Planning string +} + type GenerateDto struct { EntityType_Code ere.EntityTypeCode `json:"entityType_code" validate:"required"` Ref_Id *string `json:"ref_id" validate:"required"` @@ -124,6 +137,8 @@ const ( TDNGC TemplateDocsName = "general-consent.html" TDNCL TemplateDocsName = "control-letter.html" TDNR TemplateDocsName = "resume.html" + TDNSA TemplateDocsName = "screening-form-a.html" + TDNSB TemplateDocsName = "screening-form-b.html" ) func (v VclaimControlLetter) generateTemplateData() ControlLetterPDF { From 5975721daf1defff62cbb93efce8b23025a27c7d Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Wed, 3 Dec 2025 16:10:23 +0700 Subject: [PATCH 6/9] feat (generate-file): screening form a tested and ok, form b not fully tested --- assets/docs/screening-form-a.html | 8 +- assets/docs/screening-form-b.html | 142 ++++++++---------- .../domain/main-entities/screening/dto.go | 8 +- .../domain/main-entities/screening/entity.go | 4 +- .../interface/main-handler/main-handler.go | 4 +- .../main-handler/screening/handler.go | 34 ++--- .../main-use-case/generate-file/case.go | 6 + .../main-use-case/generate-file/helper.go | 139 ++++++++++++++--- .../main-use-case/generate-file/tycovar.go | 8 + .../use-case/main-use-case/screening/lib.go | 4 +- pkg/pdf-helper/pdf-helper.go | 3 + 11 files changed, 228 insertions(+), 132 deletions(-) diff --git a/assets/docs/screening-form-a.html b/assets/docs/screening-form-a.html index a838c111..4f34b876 100644 --- a/assets/docs/screening-form-a.html +++ b/assets/docs/screening-form-a.html @@ -56,17 +56,17 @@ " > - No. RM + No. RM : - {{ .MedicalRecord }} + {{ .MedicalRecord }} - Nama + Nama : {{ .Name }} - Tanggal Lahir + Tanggal Lahir : {{ .BirthDate }} diff --git a/assets/docs/screening-form-b.html b/assets/docs/screening-form-b.html index 1ae8a07c..9abc94ce 100644 --- a/assets/docs/screening-form-b.html +++ b/assets/docs/screening-form-b.html @@ -33,94 +33,76 @@ - - - - - - - - - - - - - - - - - - - - - -
- Tanggal Terbit - : {{ .Repalcable }}
- No. RM - : {{ .Repalcable }}
- Nama - : {{ .Repalcable }}
- Tanggal Lahir - : {{ .Repalcable }}
- -
-

- FORM B -

+ Tanggal Terbit : {{ .IssuedDate }} + - + +
- - - - + + + - - - - + + + + + + + +
- NO - - Tanggal/jam - - Implementasi, Monitoring, Fasilitasi, koordinasi, komunikasi dan kolaborasi, advokasi, hasil pelayanan, - Terminasi - - MPP - No. RM:{{ .MedicalRecord }}
- 1 - - 2025-10-08 16:08:18 - -
    -
  • Implementasi: Pemantauan harian terhadap penggunaan alat medis (oksigen dan alat bantu - jalan) serta kepatuhan terapi.
    • -
  • Monitoring: Observasi respon pasien terhadap terapi dan edukasi keluarga untuk perawatan - mandiri di rumah.
    • -
  • Fasilitasi: Menyediakan alat bantu sesuai kebutuhan dan menghubungkan pasien dengan - layanan rehabilitasi medik.
    • -
  • Koordinasi: Melibatkan dokter penanggung jawab, perawat, dan keluarga dalam penyusunan - rencana tindak lanjut.
    • -
  • Komunikasi dan Kolaborasi: Diskusi rutin antar profesi untuk evaluasi perkembangan - pasien.
    • -
  • Advokasi: Memberikan dukungan informasi dan hak pasien terkait rencana pulang dan - kesinambungan terapi.
    • -
  • Hasil Pelayanan: Pasien menunjukkan perbaikan fungsi mobilitas, tingkat kepatuhan terapi - meningkat.
    • -
- 		- GATOT SUBROTO,AMd.Kep - Nama:{{ .Name }}
Tanggal Lahir:{{ .BirthDate }}
+ + + + + + + + + + {{ range .FormB }} + + + + + + + + + {{ end }} + +
NOTanggal/jam + Implementasi, Monitoring, Fasilitasi, koordinasi, komunikasi dan kolaborasi, + advokasi, hasil pelayanan, Terminasi + MPP
{{ .Number }}{{ .Date }} + {{ .Value }} + + {{ .Employee_Name }} +
+
diff --git a/internal/domain/main-entities/screening/dto.go b/internal/domain/main-entities/screening/dto.go index b001af39..0c4310ed 100644 --- a/internal/domain/main-entities/screening/dto.go +++ b/internal/domain/main-entities/screening/dto.go @@ -27,6 +27,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } @@ -38,16 +39,17 @@ type FilterDto struct { } type ReadDetailDto struct { - Id uint16 `json:"id"` + Id uint `json:"id"` + Includes string `json:"includes"` } type UpdateDto struct { - Id uint16 `json:"id"` + Id uint `json:"id"` CreateDto } type DeleteDto struct { - Id uint16 `json:"id"` + Id uint `json:"id"` } type MetaDto struct { diff --git a/internal/domain/main-entities/screening/entity.go b/internal/domain/main-entities/screening/entity.go index fa650165..007573c4 100644 --- a/internal/domain/main-entities/screening/entity.go +++ b/internal/domain/main-entities/screening/entity.go @@ -19,4 +19,6 @@ type Screening struct { FileUrl *string `json:"fileUrl" gorm:"size:1024"` } -// func (d Screening) UnMarshal(data []byte) (error {} +func (d Screening) IsFormA() bool { + return d.Type == erc.SFTCA +} diff --git a/internal/interface/main-handler/main-handler.go b/internal/interface/main-handler/main-handler.go index 8864fcbb..55342b0f 100644 --- a/internal/interface/main-handler/main-handler.go +++ b/internal/interface/main-handler/main-handler.go @@ -316,7 +316,9 @@ func SetRoutes() http.Handler { "PATCH /{id}/validate": resume.Validate, }) hk.GroupRoutes("/v1/screening", r, auth.GuardMW, hk.MapHandlerFunc{ - "POST /": screening.O.Create, + "POST /": screening.O.Create, + "GET /": screening.O.GetList, + "GET /{id}": screening.O.GetDetail, }) /******************** actor ********************/ hc.RegCrud(r, "/v1/person", person.O) diff --git a/internal/interface/main-handler/screening/handler.go b/internal/interface/main-handler/screening/handler.go index 29ea5c73..a6866cc9 100644 --- a/internal/interface/main-handler/screening/handler.go +++ b/internal/interface/main-handler/screening/handler.go @@ -4,7 +4,7 @@ import ( "net/http" rw "github.com/karincake/risoles" - // sf "github.com/karincake/semprit" + sf "github.com/karincake/semprit" // ua "github.com/karincake/tumpeng/auth/svc" @@ -34,23 +34,23 @@ func (obj myBase) Create(w http.ResponseWriter, r *http.Request) { rw.DataResponse(w, res, err) } -// func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) { -// dto := e.ReadListDto{} -// sf.UrlQueryParam(&dto, *r.URL) -// res, err := u.ReadList(dto) -// rw.DataResponse(w, res, err) -// } +func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) { + dto := e.ReadListDto{} + sf.UrlQueryParam(&dto, *r.URL) + res, err := u.ReadList(dto) + rw.DataResponse(w, res, err) +} -// func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) { -// id := rw.ValidateInt(w, "id", r.PathValue("id")) -// if id <= 0 { -// return -// } -// dto := e.ReadDetailDto{} -// dto.Id = uint16(id) -// res, err := u.ReadDetail(dto) -// rw.DataResponse(w, res, err) -// } +func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) { + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + dto := e.ReadDetailDto{} + dto.Id = uint(id) + res, err := u.ReadDetail(dto) + rw.DataResponse(w, res, err) +} // func (obj myBase) Update(w http.ResponseWriter, r *http.Request) { // id := rw.ValidateInt(w, "id", r.PathValue("id")) diff --git a/internal/use-case/main-use-case/generate-file/case.go b/internal/use-case/main-use-case/generate-file/case.go index 7c657640..b5103746 100644 --- a/internal/use-case/main-use-case/generate-file/case.go +++ b/internal/use-case/main-use-case/generate-file/case.go @@ -51,6 +51,12 @@ func Generate(input GenerateDto) (*d.Data, error) { return err } + // screening + case ere.DTCScreening: + response, err = generateScreening(input, event, tx) + if err != nil { + return err + } default: return errors.New("invalid type code") } diff --git a/internal/use-case/main-use-case/generate-file/helper.go b/internal/use-case/main-use-case/generate-file/helper.go index 76e4f5ee..a0e7c1e2 100644 --- a/internal/use-case/main-use-case/generate-file/helper.go +++ b/internal/use-case/main-use-case/generate-file/helper.go @@ -20,7 +20,9 @@ import ( ue "simrs-vx/internal/use-case/main-use-case/encounter" ugc "simrs-vx/internal/use-case/main-use-case/general-consent" ur "simrs-vx/internal/use-case/main-use-case/resume" + us "simrs-vx/internal/use-case/main-use-case/screening" + ercl "simrs-vx/internal/domain/references/clinical" erc "simrs-vx/internal/domain/references/common" docscfg "simrs-vx/internal/infra/docs-cfg" @@ -341,41 +343,130 @@ func generateResumeTemplateData(resume er.Resume, event pl.Event, tx *gorm.DB) ( return &templateData, nil } -func generateScreeningFormATemplateData(screening es.Screening, event pl.Event, tx *gorm.DB) (*ScreeningPDF, error) { +func generateScreeningTemplateData(screenings []es.Screening, event pl.Event, tx *gorm.DB) (*ScreeningPDF, error) { // get encounter includes := "Patient,Patient.Person" - encounter, err := ue.ReadDetailData(ee.ReadDetailDto{Id: *screening.Encounter_Id, Includes: includes}, &event) + encounter, err := ue.ReadDetailData(ee.ReadDetailDto{Id: *screenings[0].Encounter_Id, Includes: includes}, &event) if err != nil { return nil, err } - // map template data - sData := es.FormA{} - if screening.Value != nil { - err := json.Unmarshal([]byte(*screening.Value), &sData) - if err != nil { - event.ErrInfo = pl.ErrorInfo{ - Code: "data-unmarshal-fail", - Detail: err.Error(), - Raw: err, + switch screenings[0].Type { + case ercl.SFTCA: + // map template data + sData := es.FormA{} + if screenings[0].Value != nil { + err := json.Unmarshal([]byte(*screenings[0].Value), &sData) + if err != nil { + event.ErrInfo = pl.ErrorInfo{ + Code: "data-unmarshal-fail", + Detail: err.Error(), + Raw: err, + } + return nil, err } + } else { + return nil, errors.New("there is no data to be used") + } + + templateData := ScreeningPDF{} + templateData.IssuedDate = pu.GetTimeNow().Format("2006-01-02 15:04:05") + templateData.MedicalRecord = *encounter.Patient.Number + templateData.Name = encounter.Patient.Person.FullName() + templateData.BirthDate = encounter.Patient.Person.BirthDate.Format("2006-01-02 15:04:05") + templateData.Employee_Name = screenings[0].Employee.Person.FullName() + templateData.EarlyMedic = sData.Screening.SelectedScreeningLabels() + templateData.Assessment = sData.AssessmentDetail + templateData.ProblemIdentification = sData.ProblemIdentification.SelectedProblemLabels() + templateData.Planning = sData.PlanningDetail + templateData.Date = screenings[0].CreatedAt.Format("2006-01-02 15:04:05") + + return &templateData, nil + case ercl.SFTCB: + // map template data + templateData := ScreeningPDF{} + templateData.IssuedDate = pu.GetTimeNow().Format("2006-01-02 15:04:05") + templateData.MedicalRecord = *encounter.Patient.Number + templateData.Name = encounter.Patient.Person.FullName() + templateData.BirthDate = encounter.Patient.Person.BirthDate.Format("2006-01-02 15:04:05") + for k, v := range screenings { + templateData.FormB = append(templateData.FormB, ScreeningFormBPDF{ + Number: k + 1, + Date: v.CreatedAt.Format("2006-01-02 15:04:05"), + Employee_Name: v.Employee.Person.FullName(), + Value: *v.Value, + }) + } + + return &templateData, nil + } + return nil, errors.New("invalid screening type") +} + +func generateScreening(input GenerateDto, event pl.Event, tx *gorm.DB) (*ResponseDto, error) { + // get value from resume by ref_id + includes := "Employee.Person" + s, err := us.ReadDetailData(es.ReadDetailDto{Id: uint(*pc.StringToUint64(*input.Ref_Id)), Includes: includes}, &event) + if err != nil { + return nil, err + } + + var screenings []es.Screening + var templateData *ScreeningPDF + if s.IsFormA() { + if s.FileUrl != nil { + if err := removeFile(string(input.EntityType_Code), *s.FileUrl); err != nil { + return nil, err + } + } + screenings = append(screenings, *s) + input.FormatType = erc.DFTCPDF + input.TemplateName = TDNSA + input.Encounter_Id = s.Encounter_Id + templateData, err = generateScreeningTemplateData(screenings, event, tx) + if err != nil { return nil, err } } else { - return nil, errors.New("there is no data to be used") + includes := "Employee.Person" + sort := "CreatedAt:ASC" + ss, _, err := us.ReadListData(es.ReadListDto{FilterDto: es.FilterDto{Encounter_Id: s.Encounter_Id, Type: ercl.SFTCB}, Includes: includes, Sort: sort}, &event, tx) + if err != nil { + return nil, err + } + screenings = append(screenings, ss...) + input.FormatType = erc.DFTCPDF + input.TemplateName = TDNSB + input.Encounter_Id = s.Encounter_Id + templateData, err = generateScreeningTemplateData(screenings, event, tx) + if err != nil { + return nil, err + } } - templateData := ScreeningPDF{} - templateData.IssuedDate = pu.GetTimeNow().Format("2006-01-02 15:04:05") - templateData.MedicalRecord = *encounter.Patient.Number - templateData.Name = encounter.Patient.Person.FullName() - templateData.BirthDate = encounter.Patient.Person.BirthDate.Format("2006-01-02 15:04:05") - templateData.Employee_Name = screening.Employee.Person.FullName() - templateData.EarlyMedic = sData.Screening.SelectedScreeningLabels() - templateData.Assessment = sData.AssessmentDetail - templateData.ProblemIdentification = sData.ProblemIdentification.SelectedProblemLabels() - templateData.Planning = sData.PlanningDetail - templateData.Date = screening.CreatedAt.Format("2006-01-02 15:04:05") + // generate file + urlPub, err := generateFile(input, templateData) + if err != nil { + return nil, err + } - return &templateData, nil + if len(screenings) > 1 { + for i := range screenings { + screenings[i].FileUrl = &urlPub + } + if err := tx.Save(&screenings).Error; err != nil { + return nil, err + } + } else { + s.FileUrl = &urlPub + if err := tx.Save(&s).Error; err != nil { + return nil, err + } + } + + response := ResponseDto{ + FileUrl: urlPub, + } + + return &response, nil } diff --git a/internal/use-case/main-use-case/generate-file/tycovar.go b/internal/use-case/main-use-case/generate-file/tycovar.go index d5a7220e..a8fd5ef5 100644 --- a/internal/use-case/main-use-case/generate-file/tycovar.go +++ b/internal/use-case/main-use-case/generate-file/tycovar.go @@ -83,6 +83,14 @@ type ScreeningPDF struct { Assessment string ProblemIdentification []string Planning string + FormB []ScreeningFormBPDF +} + +type ScreeningFormBPDF struct { + Number int + Date string + Employee_Name string + Value string } type GenerateDto struct { diff --git a/internal/use-case/main-use-case/screening/lib.go b/internal/use-case/main-use-case/screening/lib.go index 413e84d2..31ed6ee1 100644 --- a/internal/use-case/main-use-case/screening/lib.go +++ b/internal/use-case/main-use-case/screening/lib.go @@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Sc Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). - Order("\"CreatedAt\" DESC") + Scopes(gh.Sort(input.Sort)) if err := tx.Find(&data).Error; err != nil { if err == gorm.ErrRecordNotFound { @@ -81,7 +81,7 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e tx = dg.I } - if err := tx.First(&data, input.Id).Error; err != nil { + if err := tx.Scopes(gh.Preload(input.Includes)).First(&data, input.Id).Error; err != nil { if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil { return nil, processedErr } diff --git a/pkg/pdf-helper/pdf-helper.go b/pkg/pdf-helper/pdf-helper.go index 9878ecbd..9b1dc129 100644 --- a/pkg/pdf-helper/pdf-helper.go +++ b/pkg/pdf-helper/pdf-helper.go @@ -33,6 +33,9 @@ func (r *RequestPdf) ParseTemplate(templatePath string, data interface{}) error "nl2br": func(text string) template.HTML { return template.HTML(strings.Replace(template.HTMLEscapeString(text), "\n", "
", -1)) }, + "safeHTML": func(text string) template.HTML { + return template.HTML(text) + }, } t, err := template.New(fileName).Funcs(funcs).ParseFiles(templatePath) if err != nil { From 935cc8aef5a3cde6f107be73d70a84fa685338da Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Fri, 5 Dec 2025 14:04:56 +0700 Subject: [PATCH 7/9] feat (encounter): add more filter for list --- .../domain/main-entities/encounter/dto.go | 14 +++++----- .../use-case/main-use-case/encounter/lib.go | 26 ++++++++++++++++--- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/internal/domain/main-entities/encounter/dto.go b/internal/domain/main-entities/encounter/dto.go index c039fc0c..9b007097 100644 --- a/internal/domain/main-entities/encounter/dto.go +++ b/internal/domain/main-entities/encounter/dto.go @@ -78,11 +78,14 @@ type TRujukan struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Pagination ecore.Pagination - Person_Name *string `json:"person-name"` - StartDate *string `json:"start-date"` - EndDate *string `json:"end-date"` + Includes string `json:"includes"` + Pagination ecore.Pagination + Patient_Identifier *string `json:"patient-identifier"` + StartDate *string `json:"start-date"` + EndDate *string `json:"end-date"` + PaymentMethod_Code *string `json:"paymentMethod-code"` + Status_Code *string `json:"status-code"` + Unit_Code *string `json:"unit-code"` pa.AuthInfo } @@ -92,7 +95,6 @@ type FilterDto struct { Patient *ep.Patient `json:"patient,omitempty"` RegisteredAt *time.Time `json:"registeredAt"` Class_Code ere.EncounterClassCode `json:"class-code" validate:"maxLength=10"` - Unit_Code *string `json:"unit-code"` Specialist_Code *string `json:"specialist-code"` Subspecialist_Code *string `json:"subspecialist-code"` VisitDate time.Time `json:"visitDate"` diff --git a/internal/use-case/main-use-case/encounter/lib.go b/internal/use-case/main-use-case/encounter/lib.go index a9a5a307..3baec23a 100644 --- a/internal/use-case/main-use-case/encounter/lib.go +++ b/internal/use-case/main-use-case/encounter/lib.go @@ -73,17 +73,35 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.En ) } - if input.Person_Name != nil { + if input.Patient_Identifier != nil { tx = tx.Joins("JOIN \"Patient\" ON \"Patient\".\"Id\" = \"Encounter\".\"Patient_Id\""). - Joins("JOIN \"Person\" ON \"Person\".\"Id\" = \"Patient\".\"Person_Id\"").Where("\"Person\".\"Name\" ILIKE ?", "%"+*input.Person_Name+"%") + Joins("JOIN \"Person\" ON \"Person\".\"Id\" = \"Patient\".\"Person_Id\"").Where("\"Person\".\"Name\" ILIKE ? OR \"Patient\".\"Number\" = ?", "%"+*input.Patient_Identifier+"%", *input.Patient_Identifier) } - tx = tx.Debug().Scopes(gh.Preload(input.Includes)). - Scopes(gh.Filter(input.FilterDto)). + // TODO: getuk lib need to be updated to support this + if input.Status_Code != nil { + tx = tx.Where("\"Encounter\".\"Status_Code\" = ?", *input.Status_Code) + } + + if input.Unit_Code != nil { + tx = tx.Where("\"Encounter\".\"Unit_Code\" = ?", *input.Unit_Code) + } + + if input.PaymentMethod_Code != nil { + tx = tx.Where("\"Encounter\".\"PaymentMethod_Code\" = ?", *input.PaymentMethod_Code) + } + + tx = tx.Scopes(gh.Preload(input.Includes)). Count(&count). Scopes(gh.Paginate(input, &pagination)). Order("\"CreatedAt\" DESC") + // tx.Debug().Scopes(gh.Preload(input.Includes)). + // Scopes(gh.Filter(input.FilterDto)). + // Count(&count). + // Scopes(gh.Paginate(input, &pagination)). + // Order("\"CreatedAt\" DESC") + if err := tx.Find(&data).Error; err != nil { if err == gorm.ErrRecordNotFound { return nil, &meta, nil From 6c13b1ad517447c95bc1cf8cf9381749c224b8a2 Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Fri, 5 Dec 2025 14:18:39 +0700 Subject: [PATCH 8/9] feat (item): fix get-detail by code --- internal/domain/main-entities/item/dto.go | 2 +- internal/use-case/main-use-case/item/lib.go | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/internal/domain/main-entities/item/dto.go b/internal/domain/main-entities/item/dto.go index 686a5c17..53e3c763 100644 --- a/internal/domain/main-entities/item/dto.go +++ b/internal/domain/main-entities/item/dto.go @@ -33,7 +33,7 @@ type FilterDto struct { } type ReadDetailDto struct { - Id *uint16 `json:"id"` + Id *uint `json:"id"` Code *string `json:"code"` } diff --git a/internal/use-case/main-use-case/item/lib.go b/internal/use-case/main-use-case/item/lib.go index 56c4c915..a58a956b 100644 --- a/internal/use-case/main-use-case/item/lib.go +++ b/internal/use-case/main-use-case/item/lib.go @@ -81,7 +81,15 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e tx = dg.I } - if err := tx.First(&data, input.Id).Error; err != nil { + if input.Code != nil { + tx = tx.Where("\"Code\" = ?", *input.Code) + } + + if input.Id != nil { + tx = tx.Where("\"Id\" = ?", input.Id) + } + + if err := tx.First(&data).Error; err != nil { if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil { return nil, processedErr } From 5bc3c8783ee012e5999ba0cd7a2ba01104a758b9 Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Fri, 5 Dec 2025 16:08:22 +0700 Subject: [PATCH 9/9] feat (item): update handle buying price and selling price --- internal/domain/main-entities/item/dto.go | 2 ++ internal/use-case/main-use-case/item/helper.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/internal/domain/main-entities/item/dto.go b/internal/domain/main-entities/item/dto.go index 53e3c763..a25c5a7a 100644 --- a/internal/domain/main-entities/item/dto.go +++ b/internal/domain/main-entities/item/dto.go @@ -13,6 +13,8 @@ type CreateDto struct { Uom_Code *string `json:"uom_code" validate:"maxLength=10"` Infra_Code *string `json:"infra_code"` Stock *int `json:"stock"` + BuyingPrice *float64 `json:"buyingPrice"` + SellingPrice *float64 `json:"sellingPrice"` } type ReadListDto struct { diff --git a/internal/use-case/main-use-case/item/helper.go b/internal/use-case/main-use-case/item/helper.go index 6f7e0c57..2de4c1bd 100644 --- a/internal/use-case/main-use-case/item/helper.go +++ b/internal/use-case/main-use-case/item/helper.go @@ -23,4 +23,6 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Item) { data.Uom_Code = inputSrc.Uom_Code data.Infra_Code = inputSrc.Infra_Code data.Stock = inputSrc.Stock + data.BuyingPrice = inputSrc.BuyingPrice + data.SellingPrice = inputSrc.SellingPrice }