Changeset f626fb6

Timestamp:

05/23/26 11:58:13 (4 months ago)

Author:

MBK <marija.karapandzova@…>

Branches:

master

Children:

0e894d2

Parents:

bc882d2

Message:

Implement controllers and add functionalities for storing procedures in medical record

Location:

backend/src/main/java/medora

Files:

• controller/AppointmentController.java (added)
• controller/BillingController.java (added)
• controller/DiagnosisController.java (added)
• controller/DoctorController.java (added)
• controller/LabController.java (added)
• controller/MedicalRecordController.java (added)
• controller/MedicalReportController.java (added)
• controller/PatientController.java (added)
• controller/PrescriptionController.java (added)
• controller/ProcedureController.java (added)
• controller/ReferralController.java (added)
• repository/MedicalRecordProcedureResultRepository.java (added)
• repository/ProcedureResultRepository.java (added)
• service/ProcedureService.java (modified) (10 diffs)

backend/src/main/java/medora/service/ProcedureService.java

@@ -1 +1 @@
 package medora.service;
 
-import jakarta.persistence.EntityManager;
 import medora.dto.SimpleProcedureDTO;
 import medora.models.domain.*;
@@ -10 +9 @@
 import org.springframework.transaction.annotation.Transactional;
 
+import jakarta.persistence.EntityManager;
 import java.time.LocalDate;
 import java.util.List;
@@ -26 +26 @@
     private final MedicalRecordRepository medicalRecordRepository;
     private final MedicalRecordProcedureRepository medicalRecordProcedureRepository;
-
+    private final ProcedureResultRepository procedureResultRepository;
+    private final MedicalRecordProcedureResultRepository medicalRecordProcedureResultRepository;
     private final EntityManager entityManager;
 
@@ -36 +37 @@
                             MedicalRecordRepository medicalRecordRepository,
                             MedicalRecordProcedureRepository medicalRecordProcedureRepository,
-
+                            ProcedureResultRepository procedureResultRepository,
+                            MedicalRecordProcedureResultRepository medicalRecordProcedureResultRepository,
                             EntityManager entityManager) {
 
@@ -46 +48 @@
         this.medicalRecordRepository = medicalRecordRepository;
         this.medicalRecordProcedureRepository = medicalRecordProcedureRepository;
-
+        this.procedureResultRepository = procedureResultRepository;
+        this.medicalRecordProcedureResultRepository = medicalRecordProcedureResultRepository;
         this.entityManager = entityManager;
     }
 
-    //REQUEST PROCEDURE
+    // ================= REQUEST PROCEDURE (NEW) =================
     @Transactional
     public PerformedProcedures requestProcedureForPatient(Long patientId,
@@ -97 +100 @@
     }
 
-    // UC016
+    // ================= UC016 =================
     @Transactional
     public PerformedProcedures recordProcedure(Long procedureId,
@@ -142 +145 @@
     }
 
-    // UC017
+    // ================= UC017 =================
     @Transactional
     public PerformedProcedures recordProcedureOutcome(Long performedProcedureId, String notes) {
@@ -160 +163 @@
     }
 
-    //  LINK TO MEDICAL RECORD
+    // ================= LINK TO MEDICAL RECORD =================
     @Transactional
     public MedicalRecordProcedures linkProcedureToMedicalRecord(Long medicalRecordId,
@@ -189 +192 @@
     }
 
-
+    // ================= READ METHODS =================
     @Transactional(readOnly = true)
     public List<PerformedProcedures> getProcedureRequestsForPatient(Long patientId) {
@@ -259 +262 @@
     }
 
-    }
+    // ================= STORE PROCEDURE RESULT (UC017 Enhanced) =================
+    @Transactional
+    public ProcedureResults storeProcedureResult(Long medicalRecordId,
+                                                 Long procedureId,
+                                                 String resultDescription,
+                                                 LocalDate resultDate) {
+
+        if (medicalRecordId == null || medicalRecordId <= 0)
+            throw new IllegalArgumentException("Medical record ID must be valid");
+
+        if (procedureId == null || procedureId <= 0)
+            throw new IllegalArgumentException("Procedure ID must be valid");
+
+        if (resultDate == null)
+            throw new IllegalArgumentException("Result date is required");
+
+        MedicalRecord record = medicalRecordRepository.findById(medicalRecordId)
+                .orElseThrow(() -> new RuntimeException("Medical record not found"));
+
+        Procedure procedure = procedureRepository.findById(procedureId)
+                .orElseThrow(() -> new RuntimeException("Procedure not found"));
+
+        ProcedureResults result = new ProcedureResults();
+        result.setProcedure(procedure);
+        result.setResultDescription(resultDescription);
+        result.setResultDate(resultDate);
+
+        ProcedureResults savedResult = procedureResultRepository.save(result);
+
+        // Link to medical record
+        MedicalRecordProcedureResults link = new MedicalRecordProcedureResults(record, savedResult);
+        medicalRecordProcedureResultRepository.save(link);
+
+        logger.info("Stored procedure result {} for medical record {}", savedResult.getResultId(), medicalRecordId);
+        return savedResult;
+    }
+
+    @Transactional(readOnly = true)
+    public List<ProcedureResults> getProcedureResultsForMedicalRecord(Long medicalRecordId) {
+
+        if (medicalRecordId == null || medicalRecordId <= 0)
+            throw new IllegalArgumentException("Medical record ID must be valid");
+
+        if (!medicalRecordRepository.existsById(medicalRecordId))
+            throw new RuntimeException("Medical record not found");
+
+        return procedureResultRepository.findByMedicalRecordId(medicalRecordId);
+    }
+}