From acc59ab87c1b954c1e47c02e0c08d76cbc40f715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= Date: Thu, 23 Apr 2026 09:12:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Bug=20#407=20=E9=97=A8=E8=AF=8A=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E7=AB=99=EF=BC=9A=E6=A3=80=E6=9F=A5=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8C=BB=E5=98=B1=E5=88=86=E7=B1=BB=E9=94=99=E8=AF=AF=E8=87=B4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ExamApplyController创建ServiceRequest时缺少categoryEnum字段设置 - 在两处ServiceRequest创建位置添加setCategoryEnum(EncounterClass.AMB.getValue()) - 添加EncounterClass导入 - 解决数据库category_enum字段NOT NULL约束报错 --- .../com/openhis/web/check/controller/ExamApplyController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/ExamApplyController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/ExamApplyController.java index 15d130b9..a58f9bfd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/ExamApplyController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/ExamApplyController.java @@ -18,6 +18,7 @@ import com.openhis.common.enums.AssignSeqEnum; import com.openhis.common.enums.ChargeItemStatus; import com.openhis.common.enums.GenerateSource; import com.openhis.common.enums.RequestStatus; +import com.openhis.common.enums.EncounterClass; import com.openhis.web.check.dto.ExamApplyDto; import com.openhis.web.check.dto.ExamApplyItemDto; import com.openhis.workflow.domain.ServiceRequest; @@ -226,6 +227,7 @@ public class ExamApplyController extends BaseController { serviceRequest.setRequesterId(currentUserId); // 开单医生 serviceRequest.setOrgId(currentOrgId); // 执行科室 serviceRequest.setAuthoredTime(now); // 签发时间 + serviceRequest.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型：门诊 serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 来源=医生开立 // 将项目名称存入 contentJson，使医嘱列表能通过 JSON 字段回显 adviceName @@ -403,6 +405,7 @@ public class ExamApplyController extends BaseController { serviceRequest.setRequesterId(currentUserId); serviceRequest.setOrgId(currentOrgId); serviceRequest.setAuthoredTime(now); + serviceRequest.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型：门诊 serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 将项目名称存入 contentJson，使医嘱列表能通过 JSON 字段回显 adviceName