ryan/satusehat-service
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.rssa.top/meninjar/service-satusehat

Browse Source
This commit is contained in:
ryan
2026-08-05 09:05:58 +07:00
parent 661ab83cdb ccd5a0974d
commit 70ab7e03de
7 changed files with 848 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/api-flat-bodies.md
+786 -131
View File
File diff suppressed because it is too large Load Diff
internal/satusehat/usecase/diagnosticreport/dto.go
+22 -4
View File
@@ -27,15 +27,33 @@ type DiagnosticReportRequest struct {
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"`
ResultObservationIDs string `json:"result_observation_ids,omitempty"`
ResultObservationSystem []string `json:"result_observation_system,omitempty"`
ResultObservationCode []string `json:"result_observation_code,omitempty"`
ResultObservationDisplay []string `json:"result_observation_display,omitempty"`
SpecimenIDs []string `json:"specimen_ids,omitempty"`
SpecimenSystem []string `json:"specimen_system,omitempty"`
SpecimenCode []string `json:"specimen_code,omitempty"`
SpecimenDisplay []string `json:"specimen_display,omitempty"`
BasedOnIDs string `json:"based_on_service_request_ids,omitempty"`
BasedOnSystem []string `json:"based_on_service_request_system,omitempty"`
BasedOnCode []string `json:"based_on_service_request_code,omitempty"`
BasedOnDisplay []string `json:"based_on_service_request_display,omitempty"`
ImagingStudyIDs []string `json:"imaging_study_ids,omitempty"`
ImagingStudySystem []string `json:"imaging_study_system,omitempty"`
ImagingStudyCode []string `json:"imaging_study_code,omitempty"`
ImagingStudyDisplay []string `json:"imaging_study_display,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"`
ObservationID string `json:"observation_id,omitempty"`
ServiceRequestID string `json:"service_request_id,omitempty"`
}
type DiagnosticReportPatchRequest []map[string]interface{}
internal/satusehat/usecase/diagnosticreport/mapper.go
+14 -10
View File
@@ -73,11 +73,9 @@ func MapRequestToFHIR(req DiagnosticReportRequest) satusehat.FHIRPayload {
payload.Set("performer", []map[string]interface{}{perf})
}
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})
}
if req.ResultObservationIDs != "" {
results := make([]map[string]interface{}, 0, 1)
results = append(results, map[string]interface{}{"reference": "Observation/" + req.ResultObservationIDs})
payload.Set("result", results)
}
if len(req.SpecimenIDs) > 0 {
@@ -87,11 +85,9 @@ func MapRequestToFHIR(req DiagnosticReportRequest) satusehat.FHIRPayload {
}
payload.Set("specimen", specs)
}
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})
}
if req.BasedOnIDs != "" {
basedOns := make([]map[string]interface{}, 0, 1)
basedOns = append(basedOns, map[string]interface{}{"reference": "ServiceRequest/" + req.BasedOnIDs})
payload.Set("basedOn", basedOns)
}
if len(req.ImagingStudyIDs) > 0 {
@@ -120,5 +116,13 @@ func MapRequestToFHIR(req DiagnosticReportRequest) satusehat.FHIRPayload {
payload.Set("conclusion", req.Conclusion)
}
if req.ObservationID != "" {
payload.Set("observation", map[string]interface{}{"reference": "Observation/" + req.ObservationID})
}
if req.ServiceRequestID != "" {
payload.Set("serviceRequest", map[string]interface{}{"reference": "ServiceRequest/" + req.ServiceRequestID})
}
return payload
}
internal/satusehat/usecase/observation/dto.go
+7
View File
@@ -55,6 +55,13 @@ type ObservationRequest struct {
ReferenceRangeHighValue *float64 `json:"reference_range_high_value,omitempty"`
ReferenceRangeUnit string `json:"reference_range_unit,omitempty"`
ReferenceRangeText string `json:"reference_range_text,omitempty"`
ServiceRequestID string `json:"service_request_id,omitempty"`
ResultObservationIDs []string `json:"result_observation_ids,omitempty"`
ResultObservationSystem []string `json:"result_observation_system,omitempty"`
ResultObservationCode []string `json:"result_observation_code,omitempty"`
ResultObservationDisplay []string `json:"result_observation_display,omitempty"`
}
type ObservationPatchRequest []map[string]interface{}
internal/satusehat/usecase/observation/mapper.go
+6
View File
@@ -95,6 +95,12 @@ func MapRequestToFHIR(req ObservationRequest) satusehat.FHIRPayload {
payload.Set("bodySite", map[string]interface{}{"coding": []map[string]interface{}{coding}})
}
if req.ServiceRequestID != "" {
payload.Set("basedOn", []map[string]interface{}{
{"reference": "ServiceRequest/" + req.ServiceRequestID},
})
}
switch {
case req.ValueQuantityValue != nil:
sys := req.ValueQuantitySystem
internal/satusehat/usecase/servicerequest/dto.go
+12 -12
View File
@@ -6,18 +6,18 @@ type ServiceRequestRequest struct {
OrganizationID string `json:"organization_id,omitempty"`
ServiceRequestID string `json:"service_request_id,omitempty"`
PatientID string `json:"patient_id,omitempty"`
PatientName string `json:"patient_name,omitempty"`
EncounterID string `json:"encounter_id,omitempty"`
RequesterID string `json:"requester_id,omitempty"`
PerformerID string `json:"performer_id,omitempty"`
RequesterName string `json:"requester_name,omitempty"`
PerformerName string `json:"performer_name,omitempty"`
Status string `json:"status,omitempty" binding:"omitempty,oneof=draft active on-hold revoked completed entered-in-error unknown"`
Intent string `json:"intent,omitempty" binding:"omitempty,oneof=proposal plan directive order original-order reflex-order filler-order instance-order option"`
Code string `json:"code,omitempty"`
System string `json:"system,omitempty"`
Display string `json:"display,omitempty"`
AuthoredOn time.Time `json:"authored_on,omitempty"`
PatientName string `json:"patient_name,omitempty"`
EncounterID string `json:"encounter_id,omitempty"`
RequesterID string `json:"requester_id,omitempty"`
PerformerID string `json:"performer_id,omitempty"`
RequesterName string `json:"requester_name,omitempty"`
PerformerName string `json:"performer_name,omitempty"`
Status string `json:"status,omitempty" binding:"omitempty,oneof=draft active on-hold revoked completed entered-in-error unknown"`
Intent string `json:"intent,omitempty" binding:"omitempty,oneof=proposal plan directive order original-order reflex-order filler-order instance-order option"`
Code []string `json:"code,omitempty"`
System string `json:"system,omitempty"`
Display string `json:"display,omitempty"`
AuthoredOn time.Time `json:"authored_on,omitempty"`
}
type ServiceRequestPatchRequest []map[string]interface{}
internal/satusehat/usecase/servicerequest/mapper.go
+1 -1
View File
@@ -27,7 +27,7 @@ func MapRequestToFHIR(req ServiceRequestRequest) satusehat.FHIRPayload {
payload.Set("intent", req.Intent)
}
if req.Code != "" {
if len(req.Code) > 0 {
system := "http://snomed.info/sct"
if req.System != "" {
system = req.System