diff --git a/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java b/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java index cb0d242..be4bdcc 100644 --- a/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java +++ b/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java @@ -5,7 +5,6 @@ import org.springframework.stereotype.Component; -import com.onebridge.ouch.domain.Summary; import com.onebridge.ouch.domain.User; import com.onebridge.ouch.domain.mapping.MedicalRecord; import com.onebridge.ouch.dto.medicalRecord.request.MedicalRecordCreateRequest; @@ -22,7 +21,7 @@ public GetMedicalRecordResponse medicalRecordToGetMedicalRecordResponse(MedicalR return new GetMedicalRecordResponse(medicalRecord.getId(), medicalRecord.getVisitDate().toString(), medicalRecord.getHospital(), medicalRecord.getDepartment(), medicalRecord.getSymptoms(), - medicalRecord.getSummary().getContents_summary()); + medicalRecord.getSummary()); } public List medicalRecordToGetUsersAllMedicalRecordResponse(List medicalRecords) { @@ -34,15 +33,14 @@ public List medicalRecordToGetUsersAllMedicalRecordResponse(Lis return list; } - public MedicalRecord medicalRecordCreateRequestToMedicalRecord(MedicalRecordCreateRequest request, User user, - Summary summary) { + public MedicalRecord medicalRecordCreateRequestToMedicalRecord(MedicalRecordCreateRequest request, User user) { return MedicalRecord.builder() .user(user) .visitDate(request.getVisitDate()) .hospital(request.getVisitingHospital()) .department(request.getMedicalSubject()) .symptoms(request.getSymptoms()) - .summary(summary) + .summary(request.getTreatmentSummary()) .build(); } } diff --git a/src/main/java/com/onebridge/ouch/domain/mapping/MedicalRecord.java b/src/main/java/com/onebridge/ouch/domain/mapping/MedicalRecord.java index c9184a8..d0c3b41 100644 --- a/src/main/java/com/onebridge/ouch/domain/mapping/MedicalRecord.java +++ b/src/main/java/com/onebridge/ouch/domain/mapping/MedicalRecord.java @@ -2,11 +2,9 @@ import java.time.LocalDate; -import com.onebridge.ouch.domain.Summary; import com.onebridge.ouch.domain.User; import com.onebridge.ouch.domain.common.BaseEntity; -import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; @@ -14,7 +12,6 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToOne; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Builder; @@ -44,19 +41,23 @@ public class MedicalRecord extends BaseEntity { private String symptoms; - @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) - @JoinColumn(name = "summary_id") - private Summary summary; + private String summary; + + // @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) + // @JoinColumn(name = "summary_id") + // private Summary summary; public void updateMedicalRecord( LocalDate visitDate, String hospital, String department, - String symptoms + String symptoms, + String summary ) { this.visitDate = visitDate; this.hospital = hospital; this.department = department; this.symptoms = symptoms; + this.summary = summary; } } diff --git a/src/main/java/com/onebridge/ouch/dto/healthStatus/request/HealthStatusCreateRequest.java b/src/main/java/com/onebridge/ouch/dto/healthStatus/request/HealthStatusCreateRequest.java index 98f8f2f..33a1ab8 100644 --- a/src/main/java/com/onebridge/ouch/dto/healthStatus/request/HealthStatusCreateRequest.java +++ b/src/main/java/com/onebridge/ouch/dto/healthStatus/request/HealthStatusCreateRequest.java @@ -7,18 +7,13 @@ @Getter public class HealthStatusCreateRequest { - @NotBlank(message = "Disease is required.") private String disease; - @NotBlank(message = "Allergy is required.") private String allergy; - @NotNull(message = "Blood pressure is required.") private Long bloodPressure; - @NotNull(message = "Blood sugar level is required.") private Long bloodSugar; - @NotBlank(message = "Medical History is required.") private String medicineHistory; } diff --git a/src/main/java/com/onebridge/ouch/dto/healthStatus/request/HealthStatusUpdateRequest.java b/src/main/java/com/onebridge/ouch/dto/healthStatus/request/HealthStatusUpdateRequest.java index 30a3a37..1fdd1a6 100644 --- a/src/main/java/com/onebridge/ouch/dto/healthStatus/request/HealthStatusUpdateRequest.java +++ b/src/main/java/com/onebridge/ouch/dto/healthStatus/request/HealthStatusUpdateRequest.java @@ -7,18 +7,13 @@ @Getter public class HealthStatusUpdateRequest { - @NotBlank(message = "Disease is required.") private String disease; - @NotBlank(message = "Allergy is required.") private String allergy; - @NotNull(message = "Blood pressure is required.") private Long bloodPressure; - @NotNull(message = "Blood sugar level is required.") private Long bloodSugar; - @NotBlank(message = "Medical History is required.") private String medicineHistory; } diff --git a/src/main/java/com/onebridge/ouch/dto/medicalRecord/request/MedicalRecordCreateRequest.java b/src/main/java/com/onebridge/ouch/dto/medicalRecord/request/MedicalRecordCreateRequest.java index b9a0d47..ce2c015 100644 --- a/src/main/java/com/onebridge/ouch/dto/medicalRecord/request/MedicalRecordCreateRequest.java +++ b/src/main/java/com/onebridge/ouch/dto/medicalRecord/request/MedicalRecordCreateRequest.java @@ -9,18 +9,13 @@ @Getter public class MedicalRecordCreateRequest { - @NotNull(message = "Visit date is required.") private LocalDate visitDate; - @NotBlank(message = "Visiting hospital is required.") private String visitingHospital; - @NotBlank(message = "Medical subject is required.") private String medicalSubject; - @NotBlank(message = "Symptoms are required.") private String symptoms; - @NotBlank(message = "Treatment summary is required.") private String treatmentSummary; } diff --git a/src/main/java/com/onebridge/ouch/dto/medicalRecord/request/MedicalRecordUpdateRequest.java b/src/main/java/com/onebridge/ouch/dto/medicalRecord/request/MedicalRecordUpdateRequest.java index 07cce18..da2079a 100644 --- a/src/main/java/com/onebridge/ouch/dto/medicalRecord/request/MedicalRecordUpdateRequest.java +++ b/src/main/java/com/onebridge/ouch/dto/medicalRecord/request/MedicalRecordUpdateRequest.java @@ -9,18 +9,13 @@ @Getter public class MedicalRecordUpdateRequest { - @NotNull(message = "Visit date is required.") private LocalDate visitDate; - @NotBlank(message = "Visiting hospital is required.") private String visitingHospital; - @NotBlank(message = "Medical subject is required.") private String medicalSubject; - @NotBlank(message = "Symptoms are required.") private String symptoms; - @NotBlank(message = "Treatment summary is required.") private String treatmentSummary; } diff --git a/src/main/java/com/onebridge/ouch/dto/selfDiagnosis/request/AddSymptomsToDiagnosisRequest.java b/src/main/java/com/onebridge/ouch/dto/selfDiagnosis/request/AddSymptomsToDiagnosisRequest.java deleted file mode 100644 index 71d1658..0000000 --- a/src/main/java/com/onebridge/ouch/dto/selfDiagnosis/request/AddSymptomsToDiagnosisRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.onebridge.ouch.dto.selfDiagnosis.request; - -import java.util.List; - -import jakarta.validation.constraints.NotNull; -import lombok.Getter; - -@Getter -public class AddSymptomsToDiagnosisRequest { - - @NotNull(message = "Please enter symptoms to add.") - private List symptoms; -} diff --git a/src/main/java/com/onebridge/ouch/service/medicalRecord/MedicalRecordService.java b/src/main/java/com/onebridge/ouch/service/medicalRecord/MedicalRecordService.java index 564122b..1d37892 100644 --- a/src/main/java/com/onebridge/ouch/service/medicalRecord/MedicalRecordService.java +++ b/src/main/java/com/onebridge/ouch/service/medicalRecord/MedicalRecordService.java @@ -9,7 +9,6 @@ import com.onebridge.ouch.apiPayload.code.error.MedicalRecordErrorCode; import com.onebridge.ouch.apiPayload.exception.OuchException; import com.onebridge.ouch.converter.MedicalRecordConverter; -import com.onebridge.ouch.domain.Summary; import com.onebridge.ouch.domain.User; import com.onebridge.ouch.domain.mapping.MedicalRecord; import com.onebridge.ouch.dto.medicalRecord.request.MedicalRecordCreateRequest; @@ -39,12 +38,11 @@ public void createMedicalRecord(MedicalRecordCreateRequest request, Long userId) .orElseThrow(() -> new OuchException(CommonErrorCode.MEMBER_NOT_FOUND)); // Summary 생성 - Summary summary = Summary.builder() - .contents_summary(request.getTreatmentSummary()) - .build(); + // Summary summary = Summary.builder() + // .contents_summary(request.getTreatmentSummary()) + // .build(); - MedicalRecord medicalRecord = medicalRecordConverter.medicalRecordCreateRequestToMedicalRecord(request, user, - summary); + MedicalRecord medicalRecord = medicalRecordConverter.medicalRecordCreateRequestToMedicalRecord(request, user); medicalRecordRepository.save(medicalRecord); } @@ -82,13 +80,14 @@ public void updateMedicalRecord(@Valid MedicalRecordUpdateRequest request, MedicalRecord medicalRecord = medicalRecordRepository.findByIdAndUserId(medicalRecordId, userId) .orElseThrow(() -> new OuchException(MedicalRecordErrorCode.MEDICAL_RECORD_NOT_FOUND)); - medicalRecord.getSummary().updateSummary(request.getTreatmentSummary()); + //medicalRecord.getSummary().updateSummary(request.getTreatmentSummary()); medicalRecord.updateMedicalRecord( request.getVisitDate(), request.getVisitingHospital(), request.getMedicalSubject(), - request.getSymptoms() + request.getSymptoms(), + request.getTreatmentSummary() ); } }