Skip to content

[FIX] 의료기록, 건강상태 로직 수정 #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
99hyuk merged 2 commits into from
Jun 3, 2025
Merged

[FIX] 의료기록, 건강상태 로직 수정 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65f6879
[FIX] 의료기록과 건강상태 생성, 수정 시 필드에 null 허용하도록 수정
99hyuk Jun 3, 2025
6c65c87
[FIX] 의료기록 생성, 수정 로직에서 요약 엔티티를 사용하지 않고, String 그대로 입력 받도록 수정
99hyuk Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<DateAndHospital> medicalRecordToGetUsersAllMedicalRecordResponse(List<MedicalRecord> medicalRecords) {
Expand All @@ -34,15 +33,14 @@ public List<DateAndHospital> 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();
}
}
15 changes: 8 additions & 7 deletions src/main/java/com/onebridge/ouch/domain/mapping/MedicalRecord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,16 @@

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;
import jakarta.persistence.GenerationType;
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;
Expand Down Expand Up @@ -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;
}
}
5 changes: 0 additions & 5 deletions src/main/java/com/onebridge/ouch/dto/healthStatus/request/HealthStatusCreateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
5 changes: 0 additions & 5 deletions src/main/java/com/onebridge/ouch/dto/healthStatus/request/HealthStatusUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
5 changes: 0 additions & 5 deletions src/main/java/com/onebridge/ouch/dto/medicalRecord/request/MedicalRecordCreateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
5 changes: 0 additions & 5 deletions src/main/java/com/onebridge/ouch/dto/medicalRecord/request/MedicalRecordUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
13 changes: 0 additions & 13 deletions ...main/java/com/onebridge/ouch/dto/selfDiagnosis/request/AddSymptomsToDiagnosisRequest.java
View file
Open in desktop

This file was deleted.

15 changes: 7 additions & 8 deletions src/main/java/com/onebridge/ouch/service/medicalRecord/MedicalRecordService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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()
);
}
}