update All feture and service

This commit is contained in:
meninjar
2026-06-03 02:54:26 +00:00
parent af32d9cfdd
commit ce0fa1a291
98 changed files with 272469 additions and 1606 deletions

No files matched your search

@@ -2,27 +2,40 @@ package diagnosticreport
import (
"time"
"service/internal/satusehat/common"
)
type DiagnosticReportRequest struct {
OrganizationID string `json:"organization_id,omitempty"`
DiagnosticID string `json:"diagnostic_id,omitempty"` // e.g. "5234342"
Status string `json:"status" binding:"required,oneof=registered partial preliminary final amended corrected appended cancelled entered-in-error unknown"`
Category []*common.CodeableConceptDTO `json:"category,omitempty"`
Code *common.CodeableConceptDTO `json:"code" binding:"required"`
PatientID string `json:"patient_id" binding:"required"`
EncounterID string `json:"encounter_id" binding:"required"`
EffectiveDateTime *time.Time `json:"effective_datetime,omitempty"`
Issued *time.Time `json:"issued,omitempty"`
Performer []common.ReferenceDTO `json:"performer,omitempty"`
Result []common.ReferenceDTO `json:"result,omitempty"`
Specimen []common.ReferenceDTO `json:"specimen,omitempty"`
BasedOn []common.ReferenceDTO `json:"based_on,omitempty"`
ImagingStudy []common.ReferenceDTO `json:"imaging_study,omitempty"`
ConclusionCode []*common.CodeableConceptDTO `json:"conclusion_code,omitempty"`
Conclusion string `json:"conclusion,omitempty"`
OrganizationID string `json:"organization_id,omitempty"`
DiagnosticID string `json:"diagnostic_id,omitempty"`
Status string `json:"status" binding:"required,oneof=registered partial preliminary final amended corrected appended cancelled entered-in-error unknown"`
CategorySystem string `json:"category_system,omitempty"`
CategoryCode string `json:"category_code,omitempty"`
CategoryDisplay string `json:"category_display,omitempty"`
CodeSystem string `json:"code_system,omitempty"`
Code string `json:"code" binding:"required"`
CodeDisplay string `json:"code_display,omitempty"`
PatientID string `json:"patient_id" binding:"required"`
EncounterID string `json:"encounter_id" binding:"required"`
EffectiveDateTime *time.Time `json:"effective_datetime,omitempty"`
Issued *time.Time `json:"issued,omitempty"`
PerformerID string `json:"performer_id,omitempty"`
PerformerName string `json:"performer_name,omitempty"`
ResultObservationIDs []string `json:"result_observation_ids,omitempty"`
SpecimenIDs []string `json:"specimen_ids,omitempty"`
BasedOnIDs []string `json:"based_on_service_request_ids,omitempty"`
ImagingStudyIDs []string `json:"imaging_study_ids,omitempty"`
ConclusionCodeSystem string `json:"conclusion_code_system,omitempty"`
ConclusionCode string `json:"conclusion_code,omitempty"`
ConclusionCodeDisplay string `json:"conclusion_code_display,omitempty"`
Conclusion string `json:"conclusion,omitempty"`
}
type DiagnosticReportPatchRequest []map[string]interface{}
@@ -1,7 +1,6 @@
package diagnosticreport
import (
"os"
"time"
"service/internal/interfaces/satusehat"
@@ -10,15 +9,10 @@ import (
func MapRequestToFHIR(req DiagnosticReportRequest) satusehat.FHIRPayload {
payload := satusehat.NewFHIRPayload("DiagnosticReport")
orgID := os.Getenv("SATUSEHAT_ORG_ID")
if orgID == "" {
orgID = req.OrganizationID
}
if orgID != "" && req.DiagnosticID != "" {
if req.OrganizationID != "" && req.DiagnosticID != "" {
payload.Set("identifier", []map[string]interface{}{
{
"system": "http://sys-ids.kemkes.go.id/diagnostic/" + orgID + "/lab",
"system": "http://sys-ids.kemkes.go.id/diagnostic/" + req.OrganizationID + "/lab",
"use": "official",
"value": req.DiagnosticID,
},
@@ -29,136 +23,97 @@ func MapRequestToFHIR(req DiagnosticReportRequest) satusehat.FHIRPayload {
payload.Set("status", req.Status)
}
if len(req.Category) > 0 {
var categories []map[string]interface{}
for _, c := range req.Category {
if c != nil {
sys := c.System
if sys == "" {
sys = "http://terminology.hl7.org/CodeSystem/v2-0074"
}
coding := map[string]interface{}{"system": sys, "code": c.Code}
if c.Display != "" {
coding["display"] = c.Display
}
categories = append(categories, map[string]interface{}{"coding": []map[string]interface{}{coding}})
}
if req.CategoryCode != "" {
sys := req.CategorySystem
if sys == "" {
sys = "http://terminology.hl7.org/CodeSystem/v2-0074"
}
payload.Set("category", categories)
coding := map[string]interface{}{"system": sys, "code": req.CategoryCode}
if req.CategoryDisplay != "" {
coding["display"] = req.CategoryDisplay
}
payload.Set("category", []map[string]interface{}{
{"coding": []map[string]interface{}{coding}},
})
}
if req.Code != nil {
sys := req.Code.System
if req.Code != "" {
sys := req.CodeSystem
if sys == "" {
sys = "http://loinc.org"
}
coding := map[string]interface{}{"system": sys, "code": req.Code.Code}
if req.Code.Display != "" {
coding["display"] = req.Code.Display
coding := map[string]interface{}{"system": sys, "code": req.Code}
if req.CodeDisplay != "" {
coding["display"] = req.CodeDisplay
}
codeConcept := map[string]interface{}{"coding": []map[string]interface{}{coding}}
if req.Code.Text != "" {
codeConcept["text"] = req.Code.Text
}
payload.Set("code", codeConcept)
payload.Set("code", map[string]interface{}{
"coding": []map[string]interface{}{coding},
})
}
if req.PatientID != "" {
payload.Set("subject", map[string]interface{}{
"reference": "Patient/" + req.PatientID,
})
payload.Set("subject", map[string]interface{}{"reference": "Patient/" + req.PatientID})
}
if req.EncounterID != "" {
payload.Set("encounter", map[string]interface{}{
"reference": "Encounter/" + req.EncounterID,
})
payload.Set("encounter", map[string]interface{}{"reference": "Encounter/" + req.EncounterID})
}
if req.EffectiveDateTime != nil && !req.EffectiveDateTime.IsZero() {
payload.Set("effectiveDateTime", req.EffectiveDateTime.Format(time.RFC3339))
}
if req.Issued != nil && !req.Issued.IsZero() {
payload.Set("issued", req.Issued.Format(time.RFC3339))
}
if len(req.Performer) > 0 {
var performers []map[string]interface{}
for _, p := range req.Performer {
perf := map[string]interface{}{"reference": p.Reference}
if p.Display != "" {
perf["display"] = p.Display
}
performers = append(performers, perf)
if req.PerformerID != "" {
perf := map[string]interface{}{"reference": "Practitioner/" + req.PerformerID}
if req.PerformerName != "" {
perf["display"] = req.PerformerName
}
payload.Set("performer", performers)
payload.Set("performer", []map[string]interface{}{perf})
}
if len(req.Result) > 0 {
var results []map[string]interface{}
for _, r := range req.Result {
res := map[string]interface{}{"reference": r.Reference}
if r.Display != "" {
res["display"] = r.Display
}
results = append(results, res)
if len(req.ResultObservationIDs) > 0 {
results := make([]map[string]interface{}, 0, len(req.ResultObservationIDs))
for _, id := range req.ResultObservationIDs {
results = append(results, map[string]interface{}{"reference": "Observation/" + id})
}
payload.Set("result", results)
}
if len(req.Specimen) > 0 {
var specimens []map[string]interface{}
for _, s := range req.Specimen {
spec := map[string]interface{}{"reference": s.Reference}
if s.Display != "" {
spec["display"] = s.Display
}
specimens = append(specimens, spec)
if len(req.SpecimenIDs) > 0 {
specs := make([]map[string]interface{}, 0, len(req.SpecimenIDs))
for _, id := range req.SpecimenIDs {
specs = append(specs, map[string]interface{}{"reference": "Specimen/" + id})
}
payload.Set("specimen", specimens)
payload.Set("specimen", specs)
}
if len(req.BasedOn) > 0 {
var basedOns []map[string]interface{}
for _, b := range req.BasedOn {
bo := map[string]interface{}{"reference": b.Reference}
if b.Display != "" {
bo["display"] = b.Display
}
basedOns = append(basedOns, bo)
if len(req.BasedOnIDs) > 0 {
basedOns := make([]map[string]interface{}, 0, len(req.BasedOnIDs))
for _, id := range req.BasedOnIDs {
basedOns = append(basedOns, map[string]interface{}{"reference": "ServiceRequest/" + id})
}
payload.Set("basedOn", basedOns)
}
if len(req.ImagingStudy) > 0 {
var imagingStudies []map[string]interface{}
for _, i := range req.ImagingStudy {
is := map[string]interface{}{"reference": i.Reference}
if i.Display != "" {
is["display"] = i.Display
}
imagingStudies = append(imagingStudies, is)
if len(req.ImagingStudyIDs) > 0 {
studies := make([]map[string]interface{}, 0, len(req.ImagingStudyIDs))
for _, id := range req.ImagingStudyIDs {
studies = append(studies, map[string]interface{}{"reference": "ImagingStudy/" + id})
}
payload.Set("imagingStudy", imagingStudies)
payload.Set("imagingStudy", studies)
}
if len(req.ConclusionCode) > 0 {
var concCodes []map[string]interface{}
for _, c := range req.ConclusionCode {
if c != nil {
sys := c.System
if sys == "" {
sys = "http://snomed.info/sct"
}
coding := map[string]interface{}{"system": sys, "code": c.Code}
if c.Display != "" {
coding["display"] = c.Display
}
concCodes = append(concCodes, map[string]interface{}{"coding": []map[string]interface{}{coding}})
}
if req.ConclusionCode != "" {
sys := req.ConclusionCodeSystem
if sys == "" {
sys = "http://snomed.info/sct"
}
payload.Set("conclusionCode", concCodes)
coding := map[string]interface{}{"system": sys, "code": req.ConclusionCode}
if req.ConclusionCodeDisplay != "" {
coding["display"] = req.ConclusionCodeDisplay
}
payload.Set("conclusionCode", []map[string]interface{}{
{"coding": []map[string]interface{}{coding}},
})
}
if req.Conclusion != "" {
@@ -20,12 +20,8 @@ type repository struct{ client satusehat.SatuSehatClient }
func NewRepository(client satusehat.SatuSehatClient) Repository { return &repository{client: client} }
type hiddenCtx struct {
context.Context
}
func (r *repository) executeRequest(ctx context.Context, method, endpoint string, req interface{}) (*satusehat.FHIRResponse, error) {
resp, err := r.client.DoRequest(hiddenCtx{ctx}, method, endpoint, req)
resp, err := r.client.DoRequest(ctx, method, endpoint, req)
if err != nil {
return nil, errors.InternalError().Message("Failed to execute request to SatuSehat").Cause(err).Build()
}
@@ -14,16 +14,27 @@ type Service interface {
GetByID(ctx context.Context, id string) (*satusehat.FHIRResponse, error)
Search(ctx context.Context, queryParams url.Values) (*satusehat.FHIRResponse, error)
}
type service struct{ repo Repository }
type service struct {
repo Repository
orgID string
}
func NewService(repo Repository) Service { return &service{repo: repo} }
func NewService(repo Repository, orgID string) Service {
return &service{repo: repo, orgID: orgID}
}
func (s *service) Create(ctx context.Context, req DiagnosticReportRequest) (*satusehat.FHIRResponse, error) {
if req.OrganizationID == "" {
req.OrganizationID = s.orgID
}
return s.repo.Create(ctx, MapRequestToFHIR(req))
}
func (s *service) Update(ctx context.Context, id string, req DiagnosticReportRequest) (*satusehat.FHIRResponse, error) {
if id == "" {
return nil, errors.NewValidationError().Message("ID is required").Build()
}
if req.OrganizationID == "" {
req.OrganizationID = s.orgID
}
payload := MapRequestToFHIR(req)
payload.Set("id", id)
return s.repo.Update(ctx, id, payload)