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 667cd1695..fa71860e8 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 @@ -92,14 +92,10 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer return R.fail("无待签发的医嘱,该申请单不可编辑"); } } else { - // 诊疗处方号 - 按申请单类型生成不同规则的单号 - if (ActivityDefCategory.TEST.getCode().equals(typeCode)) { - // 检查申请单:JC(检查)+ Z(住院标识)+ yyMMdd(日期)+ 5位顺序号 - String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); - prescriptionNo = "JCZ" + dateStr + assignSeqUtil.getSeq("JCZ_" + dateStr, 5); - } else { - prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.ACTIVITY_PSYCHOTROPIC_NO.getPrefix(), 8); - } + // 检查申请单号: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); } // 当前时间 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 22527a52d..3df82c5aa 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 @@ -270,6 +270,10 @@ public enum AssignSeqEnum { * 诊疗处方号 */ ACTIVITY_PSYCHOTROPIC_NO("62", "诊疗处方号", "PAR"), + /** + * 检查申请单号(住院) + */ + CHECK_APPLY_NO("72", "检查申请单号", "JCZ"), /** * b 病历文书 */