|
|
@@ -12,6 +12,7 @@ import jakarta.annotation.Resource;
|
|
|
import org.ruoyi.chat.domain.dto.PatientRecordWithQCResultDTO;
|
|
|
import org.ruoyi.chat.domain.dto.RecordDetailItemDTO;
|
|
|
import org.ruoyi.chat.service.chat.PatientRecordService;
|
|
|
+import org.ruoyi.chat.util.XmlUtils;
|
|
|
import org.ruoyi.core.page.PageQuery;
|
|
|
import org.ruoyi.core.page.TableDataInfo;
|
|
|
import org.ruoyi.domain.PatientRecord;
|
|
|
@@ -19,9 +20,12 @@ import org.ruoyi.mapper.MedicalRecordResultMapper;
|
|
|
import org.ruoyi.mapper.PatientRecordMapper;
|
|
|
import org.ruoyi.chat.util.HttpUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+
|
|
|
+import java.sql.SQLOutput;
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.LocalTime;
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -170,9 +174,19 @@ public class PatientRecordServiceImpl implements PatientRecordService {
|
|
|
record.setDischargeDept(getString(data, "dischargeDept"));
|
|
|
record.setAdmissionNote(getString(data, "admissionNote"));
|
|
|
String dischargeSummary = getString(data, "dischargeSummary");
|
|
|
+ String admissionDate = getString(data, "admissionDate");
|
|
|
+ String dischargeDate = getString(data, "dischargeDate");
|
|
|
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
+ LocalDateTime admissionTime = LocalDateTime.parse(admissionDate, formatter);
|
|
|
+ LocalDateTime dischargeTime = LocalDateTime.parse(dischargeDate, formatter);
|
|
|
+ record.setAdmissionDate(admissionTime);
|
|
|
+ record.setDischargeDate(dischargeTime);
|
|
|
record.setDischargeSummary(dischargeSummary != null && !dischargeSummary.isEmpty() ? dischargeSummary : "[]");
|
|
|
- record.setFirstCourseRecord(getString(data, "firstCourseRecord"));
|
|
|
|
|
|
+
|
|
|
+ String firstCourseRecord = getString(data, "firstCourseRecord");
|
|
|
+ String firstCourseRecordStr = XmlUtils.parseMedicalRecordToText(firstCourseRecord);
|
|
|
+ record.setFirstCourseRecord(firstCourseRecordStr);
|
|
|
// 年龄处理:"60岁" -> 60
|
|
|
String ageStr = getString(data, "age");
|
|
|
if (ageStr != null) {
|
|
|
@@ -203,6 +217,9 @@ public class PatientRecordServiceImpl implements PatientRecordService {
|
|
|
serializeListToJson(record, data, "surgeryRecords");
|
|
|
serializeListToJson(record, data, "consentForms");
|
|
|
|
|
|
+// String roundRecords = record.getRoundRecords();
|
|
|
+// String roundRecordsStr = XmlUtils.parseMedicalRecordToText(roundRecords);
|
|
|
+// record.setRoundRecords(roundRecordsStr);
|
|
|
// 其他字段
|
|
|
record.setStatus(1); // 未质控
|
|
|
record.setCreateDate(LocalDateTime.now());
|