diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java index 4c6053d7..5f2f27b8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java @@ -256,25 +256,30 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer surgeryServiceRequest.setEncounterId(encounterId); surgeryServiceRequest.setAuthoredTime(curDate); surgeryServiceRequest.setOrgId(orgId); - // 设置手术相关信息到 note 字段 - StringBuilder noteBuilder = new StringBuilder(); + // 设置手术相关信息到 contentJson 字段 + Map contentMap = new java.util.HashMap<>(); if (surgeryName != null && !surgeryName.isEmpty()) { - noteBuilder.append("手术名称:").append(surgeryName).append("; "); + contentMap.put("surgeryName", surgeryName); } if (surgeryCode != null && !surgeryCode.isEmpty()) { - noteBuilder.append("手术编码:").append(surgeryCode).append("; "); + contentMap.put("surgeryCode", surgeryCode); } if (plannedTime != null && !plannedTime.isEmpty()) { - noteBuilder.append("计划时间:").append(plannedTime).append("; "); + contentMap.put("plannedTime", plannedTime); } if (surgeryIndication != null && !surgeryIndication.isEmpty()) { - noteBuilder.append("手术指征:").append(surgeryIndication).append("; "); + contentMap.put("surgeryIndication", surgeryIndication); } if (preoperativeDiagnosis != null && !preoperativeDiagnosis.isEmpty()) { - noteBuilder.append("术前诊断:").append(preoperativeDiagnosis).append("; "); + contentMap.put("preoperativeDiagnosis", preoperativeDiagnosis); } - if (noteBuilder.length() > 0) { - surgeryServiceRequest.setNote(noteBuilder.toString()); + if (!contentMap.isEmpty()) { + try { + ObjectMapper objectMapper = new ObjectMapper(); + surgeryServiceRequest.setContentJson(objectMapper.writeValueAsString(contentMap)); + } catch (Exception e) { + log.error("序列化手术信息失败", e); + } } iServiceRequestService.save(surgeryServiceRequest);