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 a3f653048..eb7841ebc 100755 --- 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 @@ -155,10 +155,13 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer return R.fail("无待签发的医嘱,该申请单不可编辑"); } } else { - // 检查申请单号:JC(检查)+ Z(住院标识)+ yyMMdd(日期)+ 5位顺序号 + // 根据申请单类型生成不同前缀的单号 String dateStr = new java.text.SimpleDateFormat("yyMMdd").format(new Date()); - int seq = assignSeqUtil.getSeqNoByDay(AssignSeqEnum.CHECK_APPLY_NO.getPrefix()); - prescriptionNo = "JCZ" + dateStr + String.format("%05d", seq); + AssignSeqEnum seqEnum = ActivityDefCategory.PROCEDURE.getCode().equals(typeCode) + ? AssignSeqEnum.SURGERY_APPLY_NO + : AssignSeqEnum.CHECK_APPLY_NO; + int seq = assignSeqUtil.getSeqNoByDay(seqEnum.getPrefix()); + prescriptionNo = seqEnum.getPrefix() + dateStr + String.format("%05d", seq); } // 当前时间 diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java index 3df82c5aa..568ef6708 100755 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java @@ -274,6 +274,10 @@ public enum AssignSeqEnum { * 检查申请单号(住院) */ CHECK_APPLY_NO("72", "检查申请单号", "JCZ"), + /** + * 手术申请单号(住院) + */ + SURGERY_APPLY_NO("73", "手术申请单号", "SSZ"), /** * b 病历文书 */