wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: Bug #407 门诊医生站：检查申请医嘱分类错误致数据库报错

Browse Source 
- ExamApplyController创建ServiceRequest时缺少categoryEnum字段设置
- 在两处ServiceRequest创建位置添加setCategoryEnum(EncounterClass.AMB.getValue())
- 添加EncounterClass导入
- 解决数据库category_enum字段NOT NULL约束报错
This commit is contained in:
关羽
2026-04-23 09:12:22 +08:00
parent 78bcdef7fd
commit acc59ab87c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/ExamApplyController.java
View File

@@ -18,6 +18,7 @@ import com.openhis.common.enums.AssignSeqEnum;
import com.openhis.common.enums.ChargeItemStatus; import com.openhis.common.enums.ChargeItemStatus;
import com.openhis.common.enums.GenerateSource; import com.openhis.common.enums.GenerateSource;
import com.openhis.common.enums.RequestStatus; 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.ExamApplyDto;
import com.openhis.web.check.dto.ExamApplyItemDto; import com.openhis.web.check.dto.ExamApplyItemDto;
import com.openhis.workflow.domain.ServiceRequest; import com.openhis.workflow.domain.ServiceRequest;
@@ -226,6 +227,7 @@ public class ExamApplyController extends BaseController {
serviceRequest.setRequesterId(currentUserId); // 开单医生 serviceRequest.setRequesterId(currentUserId); // 开单医生
serviceRequest.setOrgId(currentOrgId); // 执行科室 serviceRequest.setOrgId(currentOrgId); // 执行科室
serviceRequest.setAuthoredTime(now); // 签发时间 serviceRequest.setAuthoredTime(now); // 签发时间
serviceRequest.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型：门诊
serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 来源=医生开立 serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 来源=医生开立
// 将项目名称存入 contentJson，使医嘱列表能通过 JSON 字段回显 adviceName // 将项目名称存入 contentJson，使医嘱列表能通过 JSON 字段回显 adviceName
@@ -403,6 +405,7 @@ public class ExamApplyController extends BaseController {
serviceRequest.setRequesterId(currentUserId); serviceRequest.setRequesterId(currentUserId);
serviceRequest.setOrgId(currentOrgId); serviceRequest.setOrgId(currentOrgId);
serviceRequest.setAuthoredTime(now); serviceRequest.setAuthoredTime(now);
serviceRequest.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型：门诊
serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue());
// 将项目名称存入 contentJson，使医嘱列表能通过 JSON 字段回显 adviceName // 将项目名称存入 contentJson，使医嘱列表能通过 JSON 字段回显 adviceName