提交
This commit is contained in:
1 parent
973176d508
commit
cdaa0ac273
327 files changed
+32861
-25627
No files matched your search
@@ -1,4 +1,4 @@
|
||||
"""实验室入库编码:RK + 接收日期 YYYYMMDD + 3 位序号"""
|
||||
"""实验室入库编码校验与(遗留)RK 自动占号分配。"""
|
||||
import re
|
||||
from datetime import datetime
|
||||
from typing import List, Optional, Tuple
|
||||
@@ -25,10 +25,6 @@ def parse_reception_date(reception_date: str) -> str:
|
||||
return f"{y}{m}{d}"
|
||||
|
||||
|
||||
def reception_time_date_str(reception_time: datetime) -> str:
|
||||
return reception_time.strftime("%Y%m%d")
|
||||
|
||||
|
||||
def format_lab_storage_code(biz_date: str, seq: int) -> str:
|
||||
return f"{PREFIX}{biz_date}{seq:0{SEQ_DIGITS}d}"
|
||||
|
||||
@@ -165,24 +161,25 @@ def allocate_lab_storage_codes(
|
||||
return codes
|
||||
|
||||
|
||||
def validate_and_parse_lab_storage_code(
|
||||
code: str,
|
||||
reception_time: Optional[datetime] = None,
|
||||
) -> Tuple[str, Optional[str], Optional[int]]:
|
||||
"""校验入库编码非空;若为 RK+日期+序号 格式则解析 biz_date/seq 供序号同步,否则仅返回编码本身。"""
|
||||
def validate_lab_storage_code(code: str) -> str:
|
||||
"""校验入库编码:非空、长度不超过 32;不限制具体格式。"""
|
||||
c = (code or "").strip()
|
||||
if not c:
|
||||
raise ValueError("实验室入库编码不能为空")
|
||||
if len(c) > 32:
|
||||
raise ValueError("实验室入库编码长度不能超过 32 个字符")
|
||||
return c
|
||||
|
||||
|
||||
def validate_and_parse_lab_storage_code(
|
||||
code: str,
|
||||
) -> Tuple[str, Optional[str], Optional[int]]:
|
||||
"""兼容旧调用:校验编码;若为 RK+日期+序号 则额外解析供占号逻辑使用。"""
|
||||
c = validate_lab_storage_code(code)
|
||||
m = LAB_STORAGE_CODE_RE.match(c)
|
||||
if not m:
|
||||
return c, None, None
|
||||
biz_date, seq_str = m.group(1), m.group(2)
|
||||
if reception_time is not None:
|
||||
expected_date = reception_time_date_str(reception_time)
|
||||
if biz_date != expected_date:
|
||||
raise ValueError("实验室入库编码日期须与样本接收时间日期一致")
|
||||
return c, biz_date, int(seq_str)
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user