Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
71424ff576 | ||
|
|
fbe62c7a9b | ||
|
|
034a4da1ad | ||
|
|
dbc4a24543 | ||
|
|
b59c921b50 | ||
|
|
b57898fabb | ||
|
|
9fd1cc4370 | ||
|
|
af02e2cdd2 | ||
|
|
0b4c8dfda8 | ||
|
|
6ddd07dbb5 | ||
|
|
f9aa16ef31 | ||
|
|
7751cc0f4a | ||
|
|
0346bc0b1d | ||
|
|
76ddb81818 |
No files matched your search
@@ -47,10 +47,12 @@ from app.api.sample_cert_insurance import router as sample_cert_insurance_router
|
|||||||
from app.api.sample_code_correction import router as sample_code_correction_router
|
from app.api.sample_code_correction import router as sample_code_correction_router
|
||||||
from app.api.lab_sample_process import router as lab_sample_process_router
|
from app.api.lab_sample_process import router as lab_sample_process_router
|
||||||
from app.api.lab_sample_processing import router as lab_sample_processing_router
|
from app.api.lab_sample_processing import router as lab_sample_processing_router
|
||||||
|
from app.api.business_sample import router as business_sample_router
|
||||||
|
|
||||||
from app.api.project_management import router as project_management_router
|
from app.api.project_management import router as project_management_router
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
|
"business_sample_router",
|
||||||
"project_management_router",
|
"project_management_router",
|
||||||
"lab_sample_process_router",
|
"lab_sample_process_router",
|
||||||
"public_router",
|
"public_router",
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ from app.crud import user as user_svc
|
|||||||
from app.crud.collection_protocol import _lookup_attachment_by_url
|
from app.crud.collection_protocol import _lookup_attachment_by_url
|
||||||
from app.models.models import BizAttachment, SysDept, SysRole, SysUser, SysMenu, SysPost
|
from app.models.models import BizAttachment, SysDept, SysRole, SysUser, SysMenu, SysPost
|
||||||
from app.services.permission_administration import validate_tenant_references
|
from app.services.permission_administration import validate_tenant_references
|
||||||
|
from app.services.user_select_options import prioritize_caller_dept_options
|
||||||
from app.services.web_auth_roles import (
|
from app.services.web_auth_roles import (
|
||||||
_map_role_name_to_web,
|
_map_role_name_to_web,
|
||||||
list_user_ids_with_effective_role_name,
|
list_user_ids_with_effective_role_name,
|
||||||
@@ -77,12 +78,15 @@ async def list_roles_for_select(
|
|||||||
@router.get("/users/options")
|
@router.get("/users/options")
|
||||||
async def list_users_for_select(
|
async def list_users_for_select(
|
||||||
roleName: Optional[str] = Query(None, alias="roleName"),
|
roleName: Optional[str] = Query(None, alias="roleName"),
|
||||||
|
prioritizeCallerDept: bool = Query(False, alias="prioritizeCallerDept"),
|
||||||
_user: dict = Depends(require_admin_or_super_admin),
|
_user: dict = Depends(require_admin_or_super_admin),
|
||||||
db: Session = Depends(get_db),
|
db: Session = Depends(get_db),
|
||||||
):
|
):
|
||||||
"""返回用户下拉选项(label=昵称,value=用户ID),供流程设计器审批人选择使用。
|
"""返回用户下拉选项(label=昵称,value=用户ID,deptId=部门ID)。
|
||||||
|
|
||||||
|
供流程设计器审批人选择、OA 评论 @ 人员等使用。
|
||||||
可选 roleName:按有效角色(直接绑定 ∪ 职位继承)精确过滤。
|
可选 roleName:按有效角色(直接绑定 ∪ 职位继承)精确过滤。
|
||||||
|
可选 prioritizeCallerDept:当前登录用户同部门人员排在前面(组内仍按创建时间倒序)。
|
||||||
"""
|
"""
|
||||||
tenant_no = _user.get("tenant_no", "")
|
tenant_no = _user.get("tenant_no", "")
|
||||||
q = db.query(SysUser).filter(SysUser.del_flag == 0, SysUser.status == "1")
|
q = db.query(SysUser).filter(SysUser.del_flag == 0, SysUser.status == "1")
|
||||||
@@ -97,7 +101,16 @@ async def list_users_for_select(
|
|||||||
return success_response([])
|
return success_response([])
|
||||||
q = q.filter(SysUser.id.in_(matched_ids))
|
q = q.filter(SysUser.id.in_(matched_ids))
|
||||||
rows = q.order_by(SysUser.create_time.desc()).distinct().all()
|
rows = q.order_by(SysUser.create_time.desc()).distinct().all()
|
||||||
out = [{"label": (r.nick_name or r.user_no or ""), "value": r.id} for r in rows]
|
out = [
|
||||||
|
{
|
||||||
|
"label": (r.nick_name or r.user_no or ""),
|
||||||
|
"value": r.id,
|
||||||
|
"deptId": (r.dept_id or ""),
|
||||||
|
}
|
||||||
|
for r in rows
|
||||||
|
]
|
||||||
|
if prioritizeCallerDept:
|
||||||
|
out = prioritize_caller_dept_options(out, _user.get("region_id") or "")
|
||||||
return success_response(out)
|
return success_response(out)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
"""业务样本:人工作废等跨模块入口。"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Depends
|
||||||
|
from pydantic import BaseModel, ConfigDict, Field
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from app.core.database import get_db
|
||||||
|
from app.core.menu_guard import require_admin_or_super_admin
|
||||||
|
from app.core.response import error_response, success_response
|
||||||
|
from app.models.models import SysUser
|
||||||
|
from app.services.protocol_reception_discard_sync import SAMPLE_VOID_STATUS, void_sample_manually
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/web/admin", tags=["业务样本"])
|
||||||
|
|
||||||
|
|
||||||
|
class VoidSampleBody(BaseModel):
|
||||||
|
model_config = ConfigDict(populate_by_name=True)
|
||||||
|
|
||||||
|
reception_source: str = Field(..., alias="receptionSource")
|
||||||
|
void_desc: str = Field(..., alias="voidDesc")
|
||||||
|
sample_id: Optional[str] = Field(None, alias="sampleId")
|
||||||
|
sample_code: Optional[str] = Field(None, alias="sampleCode")
|
||||||
|
protocol_id: Optional[str] = Field(None, alias="protocolId")
|
||||||
|
|
||||||
|
|
||||||
|
def _get_tenant_no(db: Session, user: dict) -> str:
|
||||||
|
user_id = user.get("user_id")
|
||||||
|
if not user_id:
|
||||||
|
raise PermissionError("用户身份信息缺失,无法确定租户")
|
||||||
|
sys_user = db.query(SysUser).filter(SysUser.id == user_id).first()
|
||||||
|
if not sys_user or not sys_user.tenant_no:
|
||||||
|
raise PermissionError("用户租户信息缺失")
|
||||||
|
return sys_user.tenant_no
|
||||||
|
|
||||||
|
|
||||||
|
def _get_current_user_id(user: dict) -> str:
|
||||||
|
user_id = user.get("user_id")
|
||||||
|
if not user_id:
|
||||||
|
raise PermissionError("用户身份信息缺失")
|
||||||
|
return str(user_id)
|
||||||
|
|
||||||
|
|
||||||
|
@router.put("/business-samples/void")
|
||||||
|
async def void_business_sample(
|
||||||
|
body: VoidSampleBody,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
user: dict = Depends(require_admin_or_super_admin),
|
||||||
|
):
|
||||||
|
try:
|
||||||
|
tenant_no = _get_tenant_no(db, user)
|
||||||
|
user_id = _get_current_user_id(user)
|
||||||
|
sample = void_sample_manually(
|
||||||
|
db,
|
||||||
|
source=body.reception_source,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
void_desc=body.void_desc,
|
||||||
|
user_id=user_id,
|
||||||
|
sample_id=body.sample_id,
|
||||||
|
sample_code=body.sample_code,
|
||||||
|
protocol_id=body.protocol_id,
|
||||||
|
commit=True,
|
||||||
|
)
|
||||||
|
return success_response(
|
||||||
|
{
|
||||||
|
"id": sample.id,
|
||||||
|
"sampleCode": getattr(sample, "sample_code", None) or "",
|
||||||
|
"sampleStatus": SAMPLE_VOID_STATUS,
|
||||||
|
"voidDate": getattr(sample, "void_date", None) or "",
|
||||||
|
"voidDesc": getattr(sample, "void_desc", None) or "",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
except PermissionError as e:
|
||||||
|
return error_response(403, str(e))
|
||||||
|
except ValueError as e:
|
||||||
|
return error_response(400, str(e))
|
||||||
|
except Exception as e:
|
||||||
|
return error_response(400, str(e))
|
||||||
@@ -739,6 +739,7 @@ def _sample_to_dict(s: BizProtocolSample) -> Dict[str, Any]:
|
|||||||
"storageInDate": (s.storage_in_date or "").strip() if s.storage_in_date else "",
|
"storageInDate": (s.storage_in_date or "").strip() if s.storage_in_date else "",
|
||||||
"detectStartDate": (s.detect_start_date or "").strip() if s.detect_start_date else "",
|
"detectStartDate": (s.detect_start_date or "").strip() if s.detect_start_date else "",
|
||||||
"voidDate": (s.void_date or "").strip() if s.void_date else "",
|
"voidDate": (s.void_date or "").strip() if s.void_date else "",
|
||||||
|
"voidDesc": (getattr(s, "void_desc", None) or "").strip() if (getattr(s, "void_desc", None) or "").strip() else "",
|
||||||
"storageExpireDate": (s.storage_expire_date or "").strip() if s.storage_expire_date else "",
|
"storageExpireDate": (s.storage_expire_date or "").strip() if s.storage_expire_date else "",
|
||||||
**sample_special_to_dict(s),
|
**sample_special_to_dict(s),
|
||||||
"tenantNo": s.tenant_no,
|
"tenantNo": s.tenant_no,
|
||||||
|
|||||||
@@ -269,10 +269,13 @@ def _build_cell_system(
|
|||||||
clear_flag = checked
|
clear_flag = checked
|
||||||
break
|
break
|
||||||
|
|
||||||
|
sample_status = str(getattr(sample, "sample_status", None) or "").strip()
|
||||||
base: Dict[str, Any] = {
|
base: Dict[str, Any] = {
|
||||||
"receptionId": rec.id,
|
"receptionId": rec.id,
|
||||||
"sampleCode": (rec.sample_code or sample.sample_code or "").strip(),
|
"sampleCode": (rec.sample_code or sample.sample_code or "").strip(),
|
||||||
"labStorageCode": (rec.lab_storage_code or "").strip(),
|
"labStorageCode": (rec.lab_storage_code or "").strip(),
|
||||||
|
"sampleStatus": sample_status,
|
||||||
|
"voidDesc": str(getattr(sample, "void_desc", None) or "").strip(),
|
||||||
"motherName": (party.mother_name if party else "") or "",
|
"motherName": (party.mother_name if party else "") or "",
|
||||||
"collectionTime": ledger.format_cn_datetime(coll.sample_collect_time if coll else None),
|
"collectionTime": ledger.format_cn_datetime(coll.sample_collect_time if coll else None),
|
||||||
"collectionTimeRaw": _fmt_raw(coll.sample_collect_time if coll else None),
|
"collectionTimeRaw": _fmt_raw(coll.sample_collect_time if coll else None),
|
||||||
@@ -353,10 +356,13 @@ def _build_donation_system(
|
|||||||
qc_process: Dict[str, str],
|
qc_process: Dict[str, str],
|
||||||
) -> Dict[str, Any]:
|
) -> Dict[str, Any]:
|
||||||
prod = prod or {}
|
prod = prod or {}
|
||||||
|
sample_status = str(getattr(sample, "sample_status", None) or "").strip()
|
||||||
base: Dict[str, Any] = {
|
base: Dict[str, Any] = {
|
||||||
"receptionId": rec.id,
|
"receptionId": rec.id,
|
||||||
"sampleCode": (rec.sample_code or sample.sample_code or "").strip(),
|
"sampleCode": (rec.sample_code or sample.sample_code or "").strip(),
|
||||||
"labStorageCode": (rec.lab_storage_code or "").strip(),
|
"labStorageCode": (rec.lab_storage_code or "").strip(),
|
||||||
|
"sampleStatus": sample_status,
|
||||||
|
"voidDesc": str(getattr(sample, "void_desc", None) or "").strip(),
|
||||||
"motherName": (party.mother_name if party else "") or "",
|
"motherName": (party.mother_name if party else "") or "",
|
||||||
"receptionTime": ledger.format_cn_datetime(rec.reception_time),
|
"receptionTime": ledger.format_cn_datetime(rec.reception_time),
|
||||||
"receptionTimeRaw": _fmt_raw(rec.reception_time),
|
"receptionTimeRaw": _fmt_raw(rec.reception_time),
|
||||||
|
|||||||
@@ -45,6 +45,14 @@ from app.services.sample_payment_progress import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
_SAMPLE_STATUS_LABELS = {
|
||||||
|
"ycj": "已采集",
|
||||||
|
"jcz": "检测中",
|
||||||
|
"yrk": "已入库",
|
||||||
|
"yzf": "已作废",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
def _fmt_ymd8(v: Any) -> str:
|
def _fmt_ymd8(v: Any) -> str:
|
||||||
s = str(v or "").strip()
|
s = str(v or "").strip()
|
||||||
if len(s) == 8 and s.isdigit():
|
if len(s) == 8 and s.isdigit():
|
||||||
@@ -1882,6 +1890,7 @@ def _build_list_summary_row(
|
|||||||
]
|
]
|
||||||
receivable = float(sum(active_dues, Decimal("0"))) if active_dues else 0.0
|
receivable = float(sum(active_dues, Decimal("0"))) if active_dues else 0.0
|
||||||
discount = meta.get("discountAmount")
|
discount = meta.get("discountAmount")
|
||||||
|
sample_status = str(meta.get("sampleStatus") or "").strip()
|
||||||
row: Dict[str, Any] = {
|
row: Dict[str, Any] = {
|
||||||
"id": sp.id,
|
"id": sp.id,
|
||||||
"collectionProtocolId": sp.collection_protocol_id,
|
"collectionProtocolId": sp.collection_protocol_id,
|
||||||
@@ -1891,6 +1900,10 @@ def _build_list_summary_row(
|
|||||||
"motherName": (party.mother_name if party else "") or "",
|
"motherName": (party.mother_name if party else "") or "",
|
||||||
"motherPhone": (party.mother_phone if party else "") or "",
|
"motherPhone": (party.mother_phone if party else "") or "",
|
||||||
"sampleCode": sp.sample_code or "",
|
"sampleCode": sp.sample_code or "",
|
||||||
|
"sampleStatus": sample_status,
|
||||||
|
"sampleStatusLabel": str(meta.get("sampleStatusLabel") or "").strip()
|
||||||
|
or _SAMPLE_STATUS_LABELS.get(sample_status, ""),
|
||||||
|
"voidDesc": str(meta.get("voidDesc") or "").strip(),
|
||||||
"payMode": sp.pay_mode or "",
|
"payMode": sp.pay_mode or "",
|
||||||
"contractAmount": float(sp.contract_amount)
|
"contractAmount": float(sp.contract_amount)
|
||||||
if sp.contract_amount is not None
|
if sp.contract_amount is not None
|
||||||
@@ -2020,10 +2033,14 @@ def list_sample_payments_page(
|
|||||||
discount = None
|
discount = None
|
||||||
if orig is not None and price is not None and orig > price:
|
if orig is not None and price is not None and orig > price:
|
||||||
discount = round(orig - price, 2)
|
discount = round(orig - price, 2)
|
||||||
|
status = str(s.sample_status or "").strip()
|
||||||
sample_meta_by_key[key] = {
|
sample_meta_by_key[key] = {
|
||||||
"storageYears": s.storage_years,
|
"storageYears": s.storage_years,
|
||||||
"sampleTypeName": type_name_map.get(s.sample_type_id or "", ""),
|
"sampleTypeName": type_name_map.get(s.sample_type_id or "", ""),
|
||||||
"discountAmount": discount,
|
"discountAmount": discount,
|
||||||
|
"sampleStatus": status,
|
||||||
|
"sampleStatusLabel": _SAMPLE_STATUS_LABELS.get(status, ""),
|
||||||
|
"voidDesc": str(getattr(s, "void_desc", None) or "").strip(),
|
||||||
}
|
}
|
||||||
rows: List[Dict[str, Any]] = []
|
rows: List[Dict[str, Any]] = []
|
||||||
for sp, proto, party in candidates:
|
for sp, proto, party in candidates:
|
||||||
@@ -2228,6 +2245,40 @@ def list_payment_chase_page(
|
|||||||
for u in db.query(SysUser.id, SysUser.nick_name).filter(SysUser.id.in_(sales_ids)).all():
|
for u in db.query(SysUser.id, SysUser.nick_name).filter(SysUser.id.in_(sales_ids)).all():
|
||||||
sales_name_map[u.id] = u.nick_name or ""
|
sales_name_map[u.id] = u.nick_name or ""
|
||||||
|
|
||||||
|
sample_codes = list(
|
||||||
|
{
|
||||||
|
(sp.sample_code or sch.sample_code or "").strip()
|
||||||
|
for sch, sp, _, _, _ in candidates
|
||||||
|
if (sp.sample_code or sch.sample_code or "").strip()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
sample_status_by_code: Dict[str, Dict[str, str]] = {}
|
||||||
|
if sample_codes:
|
||||||
|
s_rows = (
|
||||||
|
db.query(BizProtocolSample)
|
||||||
|
.filter(
|
||||||
|
BizProtocolSample.tenant_no == tenant_no,
|
||||||
|
BizProtocolSample.del_flag == 0,
|
||||||
|
BizProtocolSample.sample_code.in_(sample_codes),
|
||||||
|
)
|
||||||
|
.order_by(
|
||||||
|
BizProtocolSample.update_time.desc(),
|
||||||
|
BizProtocolSample.create_time.desc(),
|
||||||
|
BizProtocolSample.id.desc(),
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
for sample in s_rows:
|
||||||
|
code = str(sample.sample_code or "").strip()
|
||||||
|
if not code or code in sample_status_by_code:
|
||||||
|
continue
|
||||||
|
status = str(sample.sample_status or "").strip()
|
||||||
|
sample_status_by_code[code] = {
|
||||||
|
"sampleStatus": status,
|
||||||
|
"sampleStatusLabel": _SAMPLE_STATUS_LABELS.get(status, ""),
|
||||||
|
"voidDesc": str(getattr(sample, "void_desc", None) or "").strip(),
|
||||||
|
}
|
||||||
|
|
||||||
ct = (chase_type or "").strip()
|
ct = (chase_type or "").strip()
|
||||||
rows: List[Dict[str, Any]] = []
|
rows: List[Dict[str, Any]] = []
|
||||||
for sch, sp, proto, party, ci in candidates:
|
for sch, sp, proto, party, ci in candidates:
|
||||||
@@ -2257,6 +2308,8 @@ def list_payment_chase_page(
|
|||||||
continue
|
continue
|
||||||
days_overdue = (today_d - due_d).days if overdue else 0
|
days_overdue = (today_d - due_d).days if overdue else 0
|
||||||
days_until = (due_d - today_d).days if not overdue else 0
|
days_until = (due_d - today_d).days if not overdue else 0
|
||||||
|
sample_code = sp.sample_code or sch.sample_code or ""
|
||||||
|
sample_state = sample_status_by_code.get(str(sample_code).strip(), {})
|
||||||
rows.append(
|
rows.append(
|
||||||
{
|
{
|
||||||
"scheduleId": sch.id,
|
"scheduleId": sch.id,
|
||||||
@@ -2265,7 +2318,10 @@ def list_payment_chase_page(
|
|||||||
"protocolNo": (proto.protocol_no if proto else "") or "",
|
"protocolNo": (proto.protocol_no if proto else "") or "",
|
||||||
"motherName": (party.mother_name if party else "") or "",
|
"motherName": (party.mother_name if party else "") or "",
|
||||||
"motherPhone": (party.mother_phone if party else "") or "",
|
"motherPhone": (party.mother_phone if party else "") or "",
|
||||||
"sampleCode": sp.sample_code or sch.sample_code or "",
|
"sampleCode": sample_code,
|
||||||
|
"sampleStatus": sample_state.get("sampleStatus", ""),
|
||||||
|
"sampleStatusLabel": sample_state.get("sampleStatusLabel", ""),
|
||||||
|
"voidDesc": sample_state.get("voidDesc", ""),
|
||||||
"salesUserId": (ci.sales_user_id if ci else "") or "",
|
"salesUserId": (ci.sales_user_id if ci else "") or "",
|
||||||
"salesUserName": sales_name_map.get(
|
"salesUserName": sales_name_map.get(
|
||||||
(ci.sales_user_id if ci else "") or "", ""
|
(ci.sales_user_id if ci else "") or "", ""
|
||||||
|
|||||||
@@ -679,9 +679,6 @@ def _enrich_work_order_list_items(
|
|||||||
code = (r.sample_code or "").strip()
|
code = (r.sample_code or "").strip()
|
||||||
if code and code not in sample_code_rec_map:
|
if code and code not in sample_code_rec_map:
|
||||||
sample_code_rec_map[code] = r
|
sample_code_rec_map[code] = r
|
||||||
if not rec_map and not sample_code_rec_map:
|
|
||||||
return items
|
|
||||||
|
|
||||||
def _resolve_reception(item: Dict[str, Any]) -> Optional[BizSampleReception]:
|
def _resolve_reception(item: Dict[str, Any]) -> Optional[BizSampleReception]:
|
||||||
rec = rec_map.get(item.get("receptionId") or "")
|
rec = rec_map.get(item.get("receptionId") or "")
|
||||||
if rec:
|
if rec:
|
||||||
@@ -697,7 +694,9 @@ def _enrich_work_order_list_items(
|
|||||||
rec = _resolve_reception(item)
|
rec = _resolve_reception(item)
|
||||||
source = _effective_reception_source(item, rec)
|
source = _effective_reception_source(item, rec)
|
||||||
if source == "research_donation":
|
if source == "research_donation":
|
||||||
dsid = _effective_donation_sample_id(item, rec)
|
dsid = _effective_donation_sample_id(item, rec) or (
|
||||||
|
item.get("protocolSampleId") or ""
|
||||||
|
).strip()
|
||||||
if dsid:
|
if dsid:
|
||||||
donation_sample_ids.append(dsid)
|
donation_sample_ids.append(dsid)
|
||||||
did = (
|
did = (
|
||||||
@@ -706,7 +705,9 @@ def _enrich_work_order_list_items(
|
|||||||
if did:
|
if did:
|
||||||
donation_ids.append(did)
|
donation_ids.append(did)
|
||||||
else:
|
else:
|
||||||
psid = _effective_protocol_sample_id(item, rec)
|
psid = _effective_protocol_sample_id(item, rec) or (
|
||||||
|
item.get("protocolSampleId") or ""
|
||||||
|
).strip()
|
||||||
if psid:
|
if psid:
|
||||||
cell_sample_ids.append(psid)
|
cell_sample_ids.append(psid)
|
||||||
pid = (
|
pid = (
|
||||||
@@ -864,11 +865,34 @@ def _enrich_work_order_list_items(
|
|||||||
item["motherName"] = _mother
|
item["motherName"] = _mother
|
||||||
item["newbornName"] = _newborn
|
item["newbornName"] = _newborn
|
||||||
item["maternalBloodCollectTime"] = cell_maternal_map.get(_pid or "", "") or ""
|
item["maternalBloodCollectTime"] = cell_maternal_map.get(_pid or "", "") or ""
|
||||||
|
def _apply_sample_status_fields() -> None:
|
||||||
|
sample_obj = None
|
||||||
|
if source == "research_donation":
|
||||||
|
dsid = _effective_donation_sample_id(item, rec) or (
|
||||||
|
item.get("protocolSampleId") or ""
|
||||||
|
).strip()
|
||||||
|
sample_obj = donation_samples.get(dsid) if dsid else None
|
||||||
|
else:
|
||||||
|
psid = _effective_protocol_sample_id(item, rec) or (
|
||||||
|
item.get("protocolSampleId") or ""
|
||||||
|
).strip()
|
||||||
|
sample_obj = protocol_samples.get(psid) if psid else None
|
||||||
|
item["sampleStatus"] = (
|
||||||
|
(sample_obj.sample_status or "").strip() if sample_obj else ""
|
||||||
|
)
|
||||||
|
item["voidDesc"] = (
|
||||||
|
(getattr(sample_obj, "void_desc", None) or "").strip() if sample_obj else ""
|
||||||
|
)
|
||||||
|
item["voidDate"] = (
|
||||||
|
(sample_obj.void_date or "").strip() if sample_obj else ""
|
||||||
|
)
|
||||||
|
|
||||||
if not rec:
|
if not rec:
|
||||||
item.setdefault("receptionTime", "")
|
item.setdefault("receptionTime", "")
|
||||||
item.setdefault("handlerName", "")
|
item.setdefault("handlerName", "")
|
||||||
item.setdefault("sampleTypeName", "")
|
item.setdefault("sampleTypeName", "")
|
||||||
item.setdefault("labStorageCode", "")
|
item.setdefault("labStorageCode", "")
|
||||||
|
_apply_sample_status_fields()
|
||||||
continue
|
continue
|
||||||
item["receptionTime"] = _fmt_dt(rec.reception_time)
|
item["receptionTime"] = _fmt_dt(rec.reception_time)
|
||||||
item["handlerName"] = rec.handler_name or ""
|
item["handlerName"] = rec.handler_name or ""
|
||||||
@@ -889,6 +913,7 @@ def _enrich_work_order_list_items(
|
|||||||
protocol_samples=protocol_samples,
|
protocol_samples=protocol_samples,
|
||||||
donation_samples=donation_samples,
|
donation_samples=donation_samples,
|
||||||
)
|
)
|
||||||
|
_apply_sample_status_fields()
|
||||||
if source == "research_donation":
|
if source == "research_donation":
|
||||||
_did = (
|
_did = (
|
||||||
(getattr(rec, "research_donation_id", None) or "").strip()
|
(getattr(rec, "research_donation_id", None) or "").strip()
|
||||||
|
|||||||
@@ -535,6 +535,7 @@ def _sample_to_dict(s: BizResearchDonationSample) -> Dict[str, Any]:
|
|||||||
"storageInDate": (s.storage_in_date or "").strip() if s.storage_in_date else "",
|
"storageInDate": (s.storage_in_date or "").strip() if s.storage_in_date else "",
|
||||||
"detectStartDate": (s.detect_start_date or "").strip() if s.detect_start_date else "",
|
"detectStartDate": (s.detect_start_date or "").strip() if s.detect_start_date else "",
|
||||||
"voidDate": (s.void_date or "").strip() if s.void_date else "",
|
"voidDate": (s.void_date or "").strip() if s.void_date else "",
|
||||||
|
"voidDesc": (getattr(s, "void_desc", None) or "").strip() if (getattr(s, "void_desc", None) or "").strip() else "",
|
||||||
"storageExpireDate": (s.storage_expire_date or "").strip() if s.storage_expire_date else "",
|
"storageExpireDate": (s.storage_expire_date or "").strip() if s.storage_expire_date else "",
|
||||||
**sample_special_to_dict(s),
|
**sample_special_to_dict(s),
|
||||||
"tenantNo": s.tenant_no,
|
"tenantNo": s.tenant_no,
|
||||||
|
|||||||
@@ -194,6 +194,14 @@ def _item_to_dict(item: BizSampleFreightItem) -> Dict[str, Any]:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
_SAMPLE_STATUS_LABELS = {
|
||||||
|
"ycj": "已采集",
|
||||||
|
"jcz": "检测中",
|
||||||
|
"yrk": "已入库",
|
||||||
|
"yzf": "已作废",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
def _item_to_dict_enriched(
|
def _item_to_dict_enriched(
|
||||||
item: BizSampleFreightItem,
|
item: BizSampleFreightItem,
|
||||||
*,
|
*,
|
||||||
@@ -201,12 +209,19 @@ def _item_to_dict_enriched(
|
|||||||
sample_type_name: str = "",
|
sample_type_name: str = "",
|
||||||
mother_name: str = "",
|
mother_name: str = "",
|
||||||
newborn_name: str = "",
|
newborn_name: str = "",
|
||||||
|
sample_status: str = "",
|
||||||
|
void_desc: str = "",
|
||||||
) -> Dict[str, Any]:
|
) -> Dict[str, Any]:
|
||||||
data = _item_to_dict(item)
|
data = _item_to_dict(item)
|
||||||
data["protocolNo"] = protocol_no or ""
|
data["protocolNo"] = protocol_no or ""
|
||||||
data["sampleTypeName"] = sample_type_name or ""
|
data["sampleTypeName"] = sample_type_name or ""
|
||||||
data["motherName"] = mother_name or ""
|
data["motherName"] = mother_name or ""
|
||||||
data["newbornName"] = newborn_name or ""
|
data["newbornName"] = newborn_name or ""
|
||||||
|
status = str(sample_status or "").strip()
|
||||||
|
if str(item.sample_code or "").strip():
|
||||||
|
data["sampleStatus"] = status
|
||||||
|
data["sampleStatusLabel"] = _SAMPLE_STATUS_LABELS.get(status, "")
|
||||||
|
data["voidDesc"] = str(void_desc or "").strip()
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|
||||||
@@ -257,6 +272,8 @@ def _enrich_items_maps(
|
|||||||
BizCellSampleType.type_name,
|
BizCellSampleType.type_name,
|
||||||
BizProtocolPartyCustomer.mother_name,
|
BizProtocolPartyCustomer.mother_name,
|
||||||
BizProtocolPartyCustomer.newborn_name,
|
BizProtocolPartyCustomer.newborn_name,
|
||||||
|
BizProtocolSample.sample_status,
|
||||||
|
BizProtocolSample.void_desc,
|
||||||
)
|
)
|
||||||
.outerjoin(
|
.outerjoin(
|
||||||
BizCollectionProtocol,
|
BizCollectionProtocol,
|
||||||
@@ -287,12 +304,14 @@ def _enrich_items_maps(
|
|||||||
)
|
)
|
||||||
.all()
|
.all()
|
||||||
)
|
)
|
||||||
for sid, pno, tname, mname, nname in rows:
|
for sid, pno, tname, mname, nname, status, void_desc in rows:
|
||||||
out[f"{SAMPLE_SOURCE_CELL}|{sid}"] = {
|
out[f"{SAMPLE_SOURCE_CELL}|{sid}"] = {
|
||||||
"protocolNo": pno or "",
|
"protocolNo": pno or "",
|
||||||
"sampleTypeName": tname or "",
|
"sampleTypeName": tname or "",
|
||||||
"motherName": mname or "",
|
"motherName": mname or "",
|
||||||
"newbornName": nname or "",
|
"newbornName": nname or "",
|
||||||
|
"sampleStatus": str(status or "").strip(),
|
||||||
|
"voidDesc": str(void_desc or "").strip(),
|
||||||
}
|
}
|
||||||
|
|
||||||
if donation_ids:
|
if donation_ids:
|
||||||
@@ -303,6 +322,8 @@ def _enrich_items_maps(
|
|||||||
BizCellSampleType.type_name,
|
BizCellSampleType.type_name,
|
||||||
BizResearchDonationParty.mother_name,
|
BizResearchDonationParty.mother_name,
|
||||||
BizResearchDonationParty.newborn_name,
|
BizResearchDonationParty.newborn_name,
|
||||||
|
BizResearchDonationSample.sample_status,
|
||||||
|
BizResearchDonationSample.void_desc,
|
||||||
)
|
)
|
||||||
.outerjoin(
|
.outerjoin(
|
||||||
BizResearchDonation,
|
BizResearchDonation,
|
||||||
@@ -334,12 +355,14 @@ def _enrich_items_maps(
|
|||||||
)
|
)
|
||||||
.all()
|
.all()
|
||||||
)
|
)
|
||||||
for sid, dno, tname, mname, nname in rows:
|
for sid, dno, tname, mname, nname, status, void_desc in rows:
|
||||||
out[f"{SAMPLE_SOURCE_DONATION}|{sid}"] = {
|
out[f"{SAMPLE_SOURCE_DONATION}|{sid}"] = {
|
||||||
"protocolNo": dno or "",
|
"protocolNo": dno or "",
|
||||||
"sampleTypeName": tname or "",
|
"sampleTypeName": tname or "",
|
||||||
"motherName": mname or "",
|
"motherName": mname or "",
|
||||||
"newbornName": nname or "",
|
"newbornName": nname or "",
|
||||||
|
"sampleStatus": str(status or "").strip(),
|
||||||
|
"voidDesc": str(void_desc or "").strip(),
|
||||||
}
|
}
|
||||||
|
|
||||||
return out
|
return out
|
||||||
@@ -541,6 +564,8 @@ def list_freights(
|
|||||||
sample_type_name=info.get("sampleTypeName", ""),
|
sample_type_name=info.get("sampleTypeName", ""),
|
||||||
mother_name=info.get("motherName", ""),
|
mother_name=info.get("motherName", ""),
|
||||||
newborn_name=info.get("newbornName", ""),
|
newborn_name=info.get("newbornName", ""),
|
||||||
|
sample_status=info.get("sampleStatus", ""),
|
||||||
|
void_desc=info.get("voidDesc", ""),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
data["items"] = enriched
|
data["items"] = enriched
|
||||||
@@ -584,6 +609,8 @@ def get_freight_detail(
|
|||||||
sample_type_name=info.get("sampleTypeName", ""),
|
sample_type_name=info.get("sampleTypeName", ""),
|
||||||
mother_name=info.get("motherName", ""),
|
mother_name=info.get("motherName", ""),
|
||||||
newborn_name=info.get("newbornName", ""),
|
newborn_name=info.get("newbornName", ""),
|
||||||
|
sample_status=info.get("sampleStatus", ""),
|
||||||
|
void_desc=info.get("voidDesc", ""),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
data["items"] = enriched
|
data["items"] = enriched
|
||||||
|
|||||||
@@ -1045,12 +1045,11 @@ def create_sample_reception(
|
|||||||
user_id=user_id,
|
user_id=user_id,
|
||||||
create_dept_id=create_dept_id or "",
|
create_dept_id=create_dept_id or "",
|
||||||
)
|
)
|
||||||
if conclusion == "bj":
|
from app.services.protocol_reception_discard_sync import after_sample_reception_saved
|
||||||
from app.services.protocol_reception_discard_sync import after_sample_reception_saved
|
|
||||||
|
|
||||||
after_sample_reception_saved(
|
after_sample_reception_saved(
|
||||||
db, reception=obj, tenant_no=tenant_no, user_id=user_id
|
db, reception=obj, tenant_no=tenant_no, user_id=user_id
|
||||||
)
|
)
|
||||||
db.commit()
|
db.commit()
|
||||||
db.refresh(obj)
|
db.refresh(obj)
|
||||||
return obj
|
return obj
|
||||||
@@ -1169,12 +1168,11 @@ def update_sample_reception(
|
|||||||
)
|
)
|
||||||
check_result_svc.sync_legacy_columns_from_results(db, rec, saved_rows)
|
check_result_svc.sync_legacy_columns_from_results(db, rec, saved_rows)
|
||||||
db.add(rec)
|
db.add(rec)
|
||||||
if conclusion == "bj":
|
from app.services.protocol_reception_discard_sync import after_sample_reception_saved
|
||||||
from app.services.protocol_reception_discard_sync import after_sample_reception_saved
|
|
||||||
|
|
||||||
after_sample_reception_saved(
|
after_sample_reception_saved(
|
||||||
db, reception=rec, tenant_no=tenant_no, user_id=user_id
|
db, reception=rec, tenant_no=tenant_no, user_id=user_id
|
||||||
)
|
)
|
||||||
db.commit()
|
db.commit()
|
||||||
db.refresh(rec)
|
db.refresh(rec)
|
||||||
return rec
|
return rec
|
||||||
|
|||||||
+2
-1
@@ -13,7 +13,7 @@ from app.core.database import SessionLocal
|
|||||||
from app.core.api_request_log_middleware import ApiRequestLogMiddleware
|
from app.core.api_request_log_middleware import ApiRequestLogMiddleware
|
||||||
from app.core.api_crypto_middleware import ApiCryptoMiddleware
|
from app.core.api_crypto_middleware import ApiCryptoMiddleware
|
||||||
from app.models import models # noqa: F401
|
from app.models import models # noqa: F401
|
||||||
from app.api import public_router, menu_router, admin_router, workflow_router, basic_info_router, collection_protocol_router, protocol_sample_payment_router, protocol_refund_record_router, presign_order_router, sample_freight_router, leave_router, operations_router, ethnic_router, sample_reception_router, sample_production_reception_router, qc_router, research_donation_router, production_router, pilot_service_router, insurance_company_router, material_router, storage_release_review_router, sample_sms_notification_router, storage_entry_sms_notification_router, qc_sms_notification_router, protocol_sample_collection_router, research_donation_sample_collection_router, pilot_application_router, pilot_checkup_router, pilot_delivery_router, pilot_infusion_confirm_router, pilot_infusion_schedule_mgmt_router, outbound_release_review_router, clinical_payment_router, env_detect_router, cleanroom_garment_router, market_router, pre_transit_sample_router, oa_approval_router, mini_auth_router, mini_menu_router, market_mobile_router, sample_storage_cert_qc_router, customer_service_dict_router, sample_cert_insurance_router, sample_code_correction_router, lab_sample_process_router, lab_sample_processing_router, project_management_router
|
from app.api import public_router, menu_router, admin_router, workflow_router, basic_info_router, collection_protocol_router, protocol_sample_payment_router, protocol_refund_record_router, presign_order_router, sample_freight_router, leave_router, operations_router, ethnic_router, sample_reception_router, sample_production_reception_router, qc_router, research_donation_router, production_router, pilot_service_router, insurance_company_router, material_router, storage_release_review_router, sample_sms_notification_router, storage_entry_sms_notification_router, qc_sms_notification_router, protocol_sample_collection_router, research_donation_sample_collection_router, pilot_application_router, pilot_checkup_router, pilot_delivery_router, pilot_infusion_confirm_router, pilot_infusion_schedule_mgmt_router, outbound_release_review_router, clinical_payment_router, env_detect_router, cleanroom_garment_router, market_router, pre_transit_sample_router, oa_approval_router, mini_auth_router, mini_menu_router, market_mobile_router, sample_storage_cert_qc_router, customer_service_dict_router, sample_cert_insurance_router, sample_code_correction_router, lab_sample_process_router, lab_sample_processing_router, project_management_router, business_sample_router
|
||||||
|
|
||||||
|
|
||||||
@asynccontextmanager
|
@asynccontextmanager
|
||||||
@@ -125,6 +125,7 @@ app.include_router(leave_router, prefix=settings.API_V1_PREFIX)
|
|||||||
app.include_router(operations_router, prefix=settings.API_V1_PREFIX)
|
app.include_router(operations_router, prefix=settings.API_V1_PREFIX)
|
||||||
app.include_router(ethnic_router, prefix=settings.API_V1_PREFIX)
|
app.include_router(ethnic_router, prefix=settings.API_V1_PREFIX)
|
||||||
app.include_router(sample_reception_router, prefix=settings.API_V1_PREFIX)
|
app.include_router(sample_reception_router, prefix=settings.API_V1_PREFIX)
|
||||||
|
app.include_router(business_sample_router, prefix=settings.API_V1_PREFIX)
|
||||||
app.include_router(sample_production_reception_router, prefix=settings.API_V1_PREFIX)
|
app.include_router(sample_production_reception_router, prefix=settings.API_V1_PREFIX)
|
||||||
app.include_router(qc_router, prefix=settings.API_V1_PREFIX)
|
app.include_router(qc_router, prefix=settings.API_V1_PREFIX)
|
||||||
app.include_router(research_donation_router, prefix=settings.API_V1_PREFIX)
|
app.include_router(research_donation_router, prefix=settings.API_V1_PREFIX)
|
||||||
|
|||||||
@@ -1597,6 +1597,7 @@ class BizProtocolSample(Base):
|
|||||||
storage_in_date = Column(CHAR(8), nullable=True, comment="入库日期YYYYMMDD")
|
storage_in_date = Column(CHAR(8), nullable=True, comment="入库日期YYYYMMDD")
|
||||||
detect_start_date = Column(CHAR(8), nullable=True, comment="检测开始日期YYYYMMDD")
|
detect_start_date = Column(CHAR(8), nullable=True, comment="检测开始日期YYYYMMDD")
|
||||||
void_date = Column(CHAR(8), nullable=True, comment="作废日期YYYYMMDD")
|
void_date = Column(CHAR(8), nullable=True, comment="作废日期YYYYMMDD")
|
||||||
|
void_desc = Column(String(512), nullable=True, comment="样本作废原因")
|
||||||
storage_expire_date = Column(CHAR(8), nullable=True, comment="存储到期日期YYYYMMDD")
|
storage_expire_date = Column(CHAR(8), nullable=True, comment="存储到期日期YYYYMMDD")
|
||||||
is_special = Column(SmallInteger, nullable=False, default=0, comment="是否特殊样本:0否 1是")
|
is_special = Column(SmallInteger, nullable=False, default=0, comment="是否特殊样本:0否 1是")
|
||||||
special_remark = Column(String(256), nullable=True, comment="特殊说明")
|
special_remark = Column(String(256), nullable=True, comment="特殊说明")
|
||||||
|
|||||||
@@ -175,6 +175,7 @@ class BizResearchDonationSample(Base):
|
|||||||
storage_in_date = Column(String(8), nullable=True, comment="入库日期YYYYMMDD")
|
storage_in_date = Column(String(8), nullable=True, comment="入库日期YYYYMMDD")
|
||||||
detect_start_date = Column(String(8), nullable=True, comment="检测开始日期YYYYMMDD")
|
detect_start_date = Column(String(8), nullable=True, comment="检测开始日期YYYYMMDD")
|
||||||
void_date = Column(String(8), nullable=True, comment="作废日期YYYYMMDD")
|
void_date = Column(String(8), nullable=True, comment="作废日期YYYYMMDD")
|
||||||
|
void_desc = Column(String(512), nullable=True, comment="样本作废原因")
|
||||||
storage_expire_date = Column(String(8), nullable=True, comment="存储到期日期YYYYMMDD")
|
storage_expire_date = Column(String(8), nullable=True, comment="存储到期日期YYYYMMDD")
|
||||||
is_special = Column(SmallInteger, nullable=False, default=0, comment="是否特殊样本:0否 1是")
|
is_special = Column(SmallInteger, nullable=False, default=0, comment="是否特殊样本:0否 1是")
|
||||||
special_remark = Column(String(256), nullable=True, comment="特殊说明")
|
special_remark = Column(String(256), nullable=True, comment="特殊说明")
|
||||||
|
|||||||
@@ -56,6 +56,12 @@ from app.services.web_auth_roles import (
|
|||||||
CELL = 'cell_storage'
|
CELL = 'cell_storage'
|
||||||
DONATION = 'research_donation'
|
DONATION = 'research_donation'
|
||||||
SOURCES = (CELL, DONATION)
|
SOURCES = (CELL, DONATION)
|
||||||
|
_SAMPLE_STATUS_LABELS = {
|
||||||
|
'ycj': '已采集',
|
||||||
|
'jcz': '检测中',
|
||||||
|
'yrk': '已入库',
|
||||||
|
'yzf': '已作废',
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
def _current_tenant_user_info(
|
def _current_tenant_user_info(
|
||||||
@@ -265,18 +271,25 @@ def _visible_rows(db: Session, freight_ids: List[str], ctx: MarketFieldContext,
|
|||||||
def _item_dict(row) -> Dict[str, Any]:
|
def _item_dict(row) -> Dict[str, Any]:
|
||||||
item, sample, parent, party, sample_type = row
|
item, sample, parent, party, sample_type = row
|
||||||
source = item.sample_source
|
source = item.sample_source
|
||||||
return {
|
sample_code = sample.sample_code or ''
|
||||||
|
payload = {
|
||||||
'id': item.id,
|
'id': item.id,
|
||||||
'freightId': item.freight_id,
|
'freightId': item.freight_id,
|
||||||
'sampleSource': source,
|
'sampleSource': source,
|
||||||
'sampleId': sample.id,
|
'sampleId': sample.id,
|
||||||
'sampleCode': sample.sample_code or '',
|
'sampleCode': sample_code,
|
||||||
'protocolId': parent.id,
|
'protocolId': parent.id,
|
||||||
'protocolNo': (parent.protocol_no if source == CELL else parent.donation_no) or '',
|
'protocolNo': (parent.protocol_no if source == CELL else parent.donation_no) or '',
|
||||||
'sampleTypeName': sample_type.type_name if sample_type else '',
|
'sampleTypeName': sample_type.type_name if sample_type else '',
|
||||||
'motherName': party.mother_name if party else '',
|
'motherName': party.mother_name if party else '',
|
||||||
'newbornName': party.newborn_name if party else '',
|
'newbornName': party.newborn_name if party else '',
|
||||||
}
|
}
|
||||||
|
if sample_code:
|
||||||
|
status = str(getattr(sample, 'sample_status', None) or '').strip()
|
||||||
|
payload['sampleStatus'] = status
|
||||||
|
payload['sampleStatusLabel'] = _SAMPLE_STATUS_LABELS.get(status, '')
|
||||||
|
payload['voidDesc'] = str(getattr(sample, 'void_desc', None) or '')
|
||||||
|
return payload
|
||||||
|
|
||||||
|
|
||||||
def _label_map(db: Session, tenant_no: str, values: List[str]) -> Dict[str, str]:
|
def _label_map(db: Session, tenant_no: str, values: List[str]) -> Dict[str, str]:
|
||||||
|
|||||||
@@ -40,6 +40,51 @@ from app.services.market_support import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
_SAMPLE_STATUS_LABELS = {
|
||||||
|
'ycj': '已采集',
|
||||||
|
'jcz': '检测中',
|
||||||
|
'yrk': '已入库',
|
||||||
|
'yzf': '已作废',
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _sample_status_by_code(
|
||||||
|
db: Session,
|
||||||
|
tenant_no: str,
|
||||||
|
sample_codes: List[str],
|
||||||
|
) -> Dict[str, Dict[str, str]]:
|
||||||
|
"""按租户 + 样本编码取样本状态;同一编码多行时保留最近更新的一条。"""
|
||||||
|
wanted = [code for code in {str(code or '').strip() for code in sample_codes} if code]
|
||||||
|
if not wanted:
|
||||||
|
return {}
|
||||||
|
rows = (
|
||||||
|
db.query(BizProtocolSample)
|
||||||
|
.filter(
|
||||||
|
BizProtocolSample.tenant_no == tenant_no,
|
||||||
|
BizProtocolSample.del_flag == 0,
|
||||||
|
BizProtocolSample.sample_code.in_(wanted),
|
||||||
|
)
|
||||||
|
.order_by(
|
||||||
|
BizProtocolSample.update_time.desc(),
|
||||||
|
BizProtocolSample.create_time.desc(),
|
||||||
|
BizProtocolSample.id.desc(),
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
result: Dict[str, Dict[str, str]] = {}
|
||||||
|
for sample in rows:
|
||||||
|
code = str(sample.sample_code or '').strip()
|
||||||
|
if not code or code in result:
|
||||||
|
continue
|
||||||
|
status = str(sample.sample_status or '').strip()
|
||||||
|
result[code] = {
|
||||||
|
'sampleStatus': status,
|
||||||
|
'sampleStatusLabel': _SAMPLE_STATUS_LABELS.get(status, ''),
|
||||||
|
'voidDesc': sample.void_desc or '',
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
def _current_dept_id(user_info: dict) -> str:
|
def _current_dept_id(user_info: dict) -> str:
|
||||||
return str(
|
return str(
|
||||||
user_info.get('dept_id')
|
user_info.get('dept_id')
|
||||||
@@ -104,12 +149,16 @@ def _load_sample_meta(
|
|||||||
discount = None
|
discount = None
|
||||||
if original is not None and current is not None and original > current:
|
if original is not None and current is not None and original > current:
|
||||||
discount = original - current
|
discount = original - current
|
||||||
|
status = str(sample.sample_status or '').strip()
|
||||||
result.setdefault(
|
result.setdefault(
|
||||||
sample.sample_code or '',
|
sample.sample_code or '',
|
||||||
{
|
{
|
||||||
'storageYears': sample.storage_years,
|
'storageYears': sample.storage_years,
|
||||||
'sampleTypeName': sample_type.type_name if sample_type else '',
|
'sampleTypeName': sample_type.type_name if sample_type else '',
|
||||||
'discountAmount': _money(discount),
|
'discountAmount': _money(discount),
|
||||||
|
'sampleStatus': status,
|
||||||
|
'sampleStatusLabel': _SAMPLE_STATUS_LABELS.get(status, ''),
|
||||||
|
'voidDesc': sample.void_desc or '',
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
return result
|
return result
|
||||||
@@ -235,7 +284,8 @@ def _payment_dict(
|
|||||||
'bfyj': '部分已缴',
|
'bfyj': '部分已缴',
|
||||||
'dfj': '待缴费',
|
'dfj': '待缴费',
|
||||||
}[progress_code]
|
}[progress_code]
|
||||||
return {
|
sample_code = payment.sample_code or ''
|
||||||
|
payload = {
|
||||||
'id': payment.id,
|
'id': payment.id,
|
||||||
'collectionProtocolId': protocol.id,
|
'collectionProtocolId': protocol.id,
|
||||||
'protocolNo': protocol.protocol_no or '',
|
'protocolNo': protocol.protocol_no or '',
|
||||||
@@ -243,7 +293,7 @@ def _payment_dict(
|
|||||||
'paymentModelVersion': int(getattr(protocol, 'payment_model_version', None) or 1),
|
'paymentModelVersion': int(getattr(protocol, 'payment_model_version', None) or 1),
|
||||||
'motherName': (party.mother_name if party else '') or '',
|
'motherName': (party.mother_name if party else '') or '',
|
||||||
'motherPhone': (party.mother_phone if party else '') or '',
|
'motherPhone': (party.mother_phone if party else '') or '',
|
||||||
'sampleCode': payment.sample_code or '',
|
'sampleCode': sample_code,
|
||||||
'payMode': payment.pay_mode or '',
|
'payMode': payment.pay_mode or '',
|
||||||
'contractAmount': _money(payment.contract_amount),
|
'contractAmount': _money(payment.contract_amount),
|
||||||
'signDate': _display_ymd(getattr(protocol, 'register_date', None)),
|
'signDate': _display_ymd(getattr(protocol, 'register_date', None)),
|
||||||
@@ -262,6 +312,11 @@ def _payment_dict(
|
|||||||
'periods': periods,
|
'periods': periods,
|
||||||
'schedules': schedule_rows,
|
'schedules': schedule_rows,
|
||||||
}
|
}
|
||||||
|
if sample_code:
|
||||||
|
payload['sampleStatus'] = meta.get('sampleStatus') or ''
|
||||||
|
payload['sampleStatusLabel'] = meta.get('sampleStatusLabel') or ''
|
||||||
|
payload['voidDesc'] = meta.get('voidDesc') or ''
|
||||||
|
return payload
|
||||||
|
|
||||||
|
|
||||||
def _scoped_payment_query(
|
def _scoped_payment_query(
|
||||||
@@ -733,6 +788,14 @@ def list_payment_chase(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
rows: List[Dict[str, Any]] = []
|
rows: List[Dict[str, Any]] = []
|
||||||
|
status_by_code = _sample_status_by_code(
|
||||||
|
db,
|
||||||
|
ctx.tenant_no,
|
||||||
|
[
|
||||||
|
payment.sample_code or schedule.sample_code or ''
|
||||||
|
for schedule, payment, _, _, _, _ in candidates
|
||||||
|
],
|
||||||
|
)
|
||||||
for schedule, payment, protocol, party, collection, paid in candidates:
|
for schedule, payment, protocol, party, collection, paid in candidates:
|
||||||
due_date = parse_due_date_ymd(schedule.due_date)
|
due_date = parse_due_date_ymd(schedule.due_date)
|
||||||
if due_date is None:
|
if due_date is None:
|
||||||
@@ -741,6 +804,8 @@ def list_payment_chase(
|
|||||||
due_value = Decimal(str(schedule.due_amount or 0))
|
due_value = Decimal(str(schedule.due_amount or 0))
|
||||||
arrears = max(due_value - paid_value, Decimal('0'))
|
arrears = max(due_value - paid_value, Decimal('0'))
|
||||||
is_overdue = due_date < today_value
|
is_overdue = due_date < today_value
|
||||||
|
sample_code = payment.sample_code or schedule.sample_code or ''
|
||||||
|
sample_state = status_by_code.get(sample_code, {}) if sample_code else {}
|
||||||
rows.append(
|
rows.append(
|
||||||
{
|
{
|
||||||
'scheduleId': schedule.id,
|
'scheduleId': schedule.id,
|
||||||
@@ -750,7 +815,16 @@ def list_payment_chase(
|
|||||||
'protocolStatus': protocol.protocol_status or '',
|
'protocolStatus': protocol.protocol_status or '',
|
||||||
'motherName': (party.mother_name if party else '') or '',
|
'motherName': (party.mother_name if party else '') or '',
|
||||||
'motherPhone': (party.mother_phone if party else '') or '',
|
'motherPhone': (party.mother_phone if party else '') or '',
|
||||||
'sampleCode': payment.sample_code or schedule.sample_code or '',
|
'sampleCode': sample_code,
|
||||||
|
**(
|
||||||
|
{
|
||||||
|
'sampleStatus': sample_state.get('sampleStatus', ''),
|
||||||
|
'sampleStatusLabel': sample_state.get('sampleStatusLabel', ''),
|
||||||
|
'voidDesc': sample_state.get('voidDesc', ''),
|
||||||
|
}
|
||||||
|
if sample_code
|
||||||
|
else {}
|
||||||
|
),
|
||||||
'salesUserId': collection.sales_user_id or '',
|
'salesUserId': collection.sales_user_id or '',
|
||||||
'salesUserName': sales_user_names.get(
|
'salesUserName': sales_user_names.get(
|
||||||
collection.sales_user_id or '', ''
|
collection.sales_user_id or '', ''
|
||||||
|
|||||||
@@ -641,6 +641,14 @@ def _party_name_donation(db: Session, ids: List[str], tenant_no: str) -> dict:
|
|||||||
return {row.research_donation_id: row.mother_name or '' for row in rows}
|
return {row.research_donation_id: row.mother_name or '' for row in rows}
|
||||||
|
|
||||||
|
|
||||||
|
_SAMPLE_STATUS_LABELS = {
|
||||||
|
'ycj': '已采集',
|
||||||
|
'jcz': '检测中',
|
||||||
|
'yrk': '已入库',
|
||||||
|
'yzf': '已作废',
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
def _enrich_protocol_cards(
|
def _enrich_protocol_cards(
|
||||||
db: Session, items: List[dict], tenant_no: str
|
db: Session, items: List[dict], tenant_no: str
|
||||||
) -> None:
|
) -> None:
|
||||||
@@ -795,6 +803,11 @@ def _enrich_protocol_cards(
|
|||||||
payment_summary = payment_summaries.get(item['id']) or {}
|
payment_summary = payment_summaries.get(item['id']) or {}
|
||||||
transport = transport_by_sample.get(getattr(sample, 'id', ''))
|
transport = transport_by_sample.get(getattr(sample, 'id', ''))
|
||||||
sample_code = getattr(sample, 'sample_code', '') or ''
|
sample_code = getattr(sample, 'sample_code', '') or ''
|
||||||
|
sample_status = ''
|
||||||
|
sample_void_desc = ''
|
||||||
|
if sample_code:
|
||||||
|
sample_status = str(getattr(sample, 'sample_status', None) or '').strip()
|
||||||
|
sample_void_desc = str(getattr(sample, 'void_desc', None) or '')
|
||||||
region_manager_name = user_names.get(
|
region_manager_name = user_names.get(
|
||||||
getattr(collection, 'region_manager_user_id', ''), ''
|
getattr(collection, 'region_manager_user_id', ''), ''
|
||||||
)
|
)
|
||||||
@@ -844,6 +857,11 @@ def _enrich_protocol_cards(
|
|||||||
str(item.get('voidType') or ''), ''
|
str(item.get('voidType') or ''), ''
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
if sample_code:
|
||||||
|
# 样本作废原因与协议级 voidDesc 分开,捐赠列表「废弃原因」仍读协议描述。
|
||||||
|
item['sampleStatus'] = sample_status
|
||||||
|
item['sampleStatusLabel'] = _SAMPLE_STATUS_LABELS.get(sample_status, '')
|
||||||
|
item['sampleVoidDesc'] = sample_void_desc
|
||||||
|
|
||||||
|
|
||||||
def list_protocols(
|
def list_protocols(
|
||||||
|
|||||||
@@ -1,10 +1,14 @@
|
|||||||
"""市场协议无效态 ↔ 样本接收废弃 / 样本状态作废联动。
|
"""市场协议无效态 ↔ 样本接收废弃 / 样本状态作废联动。
|
||||||
|
|
||||||
规则(细胞存储 / 科研捐赠):
|
规则(细胞存储 / 科研捐赠):
|
||||||
1. 协议变为已作废(yzf)或属地废弃(sdfq)时:
|
1. 单条样本接收结论为废弃(bj)时:仅该样本 `sample_status` 置为已作废(yzf)并写 `void_date`;
|
||||||
|
协议状态保持不变。接收结论改回接收(js)且协议仍有效时:若该样本为 yzf,则清空状态与 void_date。
|
||||||
|
2. 协议变为已作废(yzf)或属地废弃(sdfq)时:
|
||||||
- 协议下全部样本接收结论自动为废弃(bj);
|
- 协议下全部样本接收结论自动为废弃(bj);
|
||||||
- 协议下全部有效样本 `sample_status` 置为已作废(yzf),并写入 `void_date`。
|
- 协议下全部有效样本 `sample_status` 置为已作废(yzf),并写入 `void_date`。
|
||||||
2. 协议下全部有效样本均已废弃/拒收(bj)时,协议自动已作废,作废类型为「实验室废弃」。
|
3. 协议下全部有效样本均已废弃/拒收(bj)时,协议自动已作废,作废类型为「实验室废弃」。
|
||||||
|
4. 人工【样本废弃】:仅将该样本置 yzf 并写 void_date/void_desc,不改接收结论;
|
||||||
|
若协议下有效样本全部为 yzf,则自动作废协议(不联动接收结论)。
|
||||||
"""
|
"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
@@ -30,6 +34,7 @@ SAMPLE_VOID_STATUS = "yzf"
|
|||||||
|
|
||||||
_AUTO_DISCARD_REMARK = "协议作废自动废弃"
|
_AUTO_DISCARD_REMARK = "协议作废自动废弃"
|
||||||
_AUTO_VOID_DESC = "全部样本接收废弃/拒收,系统自动作废"
|
_AUTO_VOID_DESC = "全部样本接收废弃/拒收,系统自动作废"
|
||||||
|
_AUTO_VOID_BY_SAMPLE_STATUS_DESC = "全部样本已作废,系统自动作废协议"
|
||||||
|
|
||||||
|
|
||||||
def _void_date_yyyymmdd(
|
def _void_date_yyyymmdd(
|
||||||
@@ -471,6 +476,161 @@ def maybe_void_protocol_when_all_samples_discarded(
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def _find_sample_for_reception(
|
||||||
|
db: Session,
|
||||||
|
*,
|
||||||
|
reception: BizSampleReception,
|
||||||
|
tenant_no: str,
|
||||||
|
) -> tuple[str, Optional[Union[BizProtocolSample, BizResearchDonationSample]]]:
|
||||||
|
source = (reception.reception_source or "cell_storage").strip() or "cell_storage"
|
||||||
|
tenant = (tenant_no or "").strip()
|
||||||
|
code = (reception.sample_code or "").strip()
|
||||||
|
if source == "cell_storage":
|
||||||
|
sid = (reception.protocol_sample_id or "").strip()
|
||||||
|
if sid:
|
||||||
|
obj = (
|
||||||
|
db.query(BizProtocolSample)
|
||||||
|
.filter(
|
||||||
|
BizProtocolSample.id == sid,
|
||||||
|
BizProtocolSample.tenant_no == tenant,
|
||||||
|
BizProtocolSample.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if obj:
|
||||||
|
return source, obj
|
||||||
|
pid = (reception.collection_protocol_id or "").strip()
|
||||||
|
if code and pid:
|
||||||
|
return source, (
|
||||||
|
db.query(BizProtocolSample)
|
||||||
|
.filter(
|
||||||
|
BizProtocolSample.collection_protocol_id == pid,
|
||||||
|
BizProtocolSample.sample_code == code,
|
||||||
|
BizProtocolSample.tenant_no == tenant,
|
||||||
|
BizProtocolSample.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
return source, None
|
||||||
|
|
||||||
|
sid = (reception.donation_sample_id or "").strip()
|
||||||
|
if sid:
|
||||||
|
obj = (
|
||||||
|
db.query(BizResearchDonationSample)
|
||||||
|
.filter(
|
||||||
|
BizResearchDonationSample.id == sid,
|
||||||
|
BizResearchDonationSample.tenant_no == tenant,
|
||||||
|
BizResearchDonationSample.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if obj:
|
||||||
|
return source, obj
|
||||||
|
pid = (reception.research_donation_id or "").strip()
|
||||||
|
if code and pid:
|
||||||
|
return source, (
|
||||||
|
db.query(BizResearchDonationSample)
|
||||||
|
.filter(
|
||||||
|
BizResearchDonationSample.research_donation_id == pid,
|
||||||
|
BizResearchDonationSample.sample_code == code,
|
||||||
|
BizResearchDonationSample.tenant_no == tenant,
|
||||||
|
BizResearchDonationSample.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
return source, None
|
||||||
|
|
||||||
|
|
||||||
|
def _protocol_is_inactive(
|
||||||
|
db: Session,
|
||||||
|
*,
|
||||||
|
source: str,
|
||||||
|
protocol_id: str,
|
||||||
|
tenant_no: str,
|
||||||
|
) -> bool:
|
||||||
|
src = (source or "").strip()
|
||||||
|
pid = (protocol_id or "").strip()
|
||||||
|
tenant = (tenant_no or "").strip()
|
||||||
|
if not pid or not tenant:
|
||||||
|
return False
|
||||||
|
if src == "cell_storage":
|
||||||
|
obj = (
|
||||||
|
db.query(BizCollectionProtocol)
|
||||||
|
.filter(
|
||||||
|
BizCollectionProtocol.id == pid,
|
||||||
|
BizCollectionProtocol.tenant_no == tenant,
|
||||||
|
BizCollectionProtocol.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
status = (obj.protocol_status or "").strip() if obj else ""
|
||||||
|
else:
|
||||||
|
obj = (
|
||||||
|
db.query(BizResearchDonation)
|
||||||
|
.filter(
|
||||||
|
BizResearchDonation.id == pid,
|
||||||
|
BizResearchDonation.tenant_no == tenant,
|
||||||
|
BizResearchDonation.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
status = (obj.donation_status or "").strip() if obj else ""
|
||||||
|
return status in INACTIVE_PROTOCOL_STATUSES
|
||||||
|
|
||||||
|
|
||||||
|
def void_sample_for_discarded_reception(
|
||||||
|
db: Session,
|
||||||
|
*,
|
||||||
|
reception: BizSampleReception,
|
||||||
|
tenant_no: str,
|
||||||
|
user_id: Optional[str] = None,
|
||||||
|
) -> bool:
|
||||||
|
"""单条接收废弃:仅将该样本置为已作废。"""
|
||||||
|
_source, sample = _find_sample_for_reception(db, reception=reception, tenant_no=tenant_no)
|
||||||
|
if not sample:
|
||||||
|
return False
|
||||||
|
now = datetime.now()
|
||||||
|
sample.sample_status = SAMPLE_VOID_STATUS
|
||||||
|
sample.void_date = _void_date_yyyymmdd(void_time=reception.reception_time or now)
|
||||||
|
sample.update_by = user_id
|
||||||
|
sample.update_time = now
|
||||||
|
db.add(sample)
|
||||||
|
db.flush()
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def clear_sample_void_for_accepted_reception(
|
||||||
|
db: Session,
|
||||||
|
*,
|
||||||
|
reception: BizSampleReception,
|
||||||
|
tenant_no: str,
|
||||||
|
user_id: Optional[str] = None,
|
||||||
|
) -> bool:
|
||||||
|
"""接收改回接收:协议仍有效且样本为 yzf 时,清空样本作废状态。"""
|
||||||
|
source, sample = _find_sample_for_reception(db, reception=reception, tenant_no=tenant_no)
|
||||||
|
if not sample:
|
||||||
|
return False
|
||||||
|
if (sample.sample_status or "").strip() != SAMPLE_VOID_STATUS:
|
||||||
|
return False
|
||||||
|
if source == "cell_storage":
|
||||||
|
protocol_id = (reception.collection_protocol_id or "").strip()
|
||||||
|
else:
|
||||||
|
protocol_id = (reception.research_donation_id or "").strip()
|
||||||
|
if _protocol_is_inactive(
|
||||||
|
db, source=source, protocol_id=protocol_id, tenant_no=tenant_no
|
||||||
|
):
|
||||||
|
return False
|
||||||
|
now = datetime.now()
|
||||||
|
sample.sample_status = None
|
||||||
|
sample.void_date = None
|
||||||
|
sample.void_desc = None
|
||||||
|
sample.update_by = user_id
|
||||||
|
sample.update_time = now
|
||||||
|
db.add(sample)
|
||||||
|
db.flush()
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
def after_sample_reception_saved(
|
def after_sample_reception_saved(
|
||||||
db: Session,
|
db: Session,
|
||||||
*,
|
*,
|
||||||
@@ -478,23 +638,32 @@ def after_sample_reception_saved(
|
|||||||
tenant_no: str,
|
tenant_no: str,
|
||||||
user_id: Optional[str] = None,
|
user_id: Optional[str] = None,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""样本接收保存后:若结论为废弃,尝试自动作废所属协议。"""
|
"""样本接收保存后:同步该样本状态;若全部废弃则尝试自动作废协议。"""
|
||||||
if (reception.accept_conclusion or "").strip() != "bj":
|
conclusion = (reception.accept_conclusion or "").strip()
|
||||||
return
|
|
||||||
source = (reception.reception_source or "cell_storage").strip() or "cell_storage"
|
source = (reception.reception_source or "cell_storage").strip() or "cell_storage"
|
||||||
if source == "cell_storage":
|
if source == "cell_storage":
|
||||||
protocol_id = (reception.collection_protocol_id or "").strip()
|
protocol_id = (reception.collection_protocol_id or "").strip()
|
||||||
else:
|
else:
|
||||||
protocol_id = (reception.research_donation_id or "").strip()
|
protocol_id = (reception.research_donation_id or "").strip()
|
||||||
if not protocol_id:
|
|
||||||
|
if conclusion == "bj":
|
||||||
|
void_sample_for_discarded_reception(
|
||||||
|
db, reception=reception, tenant_no=tenant_no, user_id=user_id
|
||||||
|
)
|
||||||
|
if protocol_id:
|
||||||
|
maybe_void_protocol_when_all_samples_discarded(
|
||||||
|
db,
|
||||||
|
source=source,
|
||||||
|
protocol_id=protocol_id,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
user_id=user_id,
|
||||||
|
)
|
||||||
return
|
return
|
||||||
maybe_void_protocol_when_all_samples_discarded(
|
|
||||||
db,
|
if conclusion == "js":
|
||||||
source=source,
|
clear_sample_void_for_accepted_reception(
|
||||||
protocol_id=protocol_id,
|
db, reception=reception, tenant_no=tenant_no, user_id=user_id
|
||||||
tenant_no=tenant_no,
|
)
|
||||||
user_id=user_id,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def after_protocol_voided(
|
def after_protocol_voided(
|
||||||
@@ -523,3 +692,224 @@ def after_protocol_voided(
|
|||||||
db, source=source, protocol_id=protocol_id, tenant_no=tenant_no
|
db, source=source, protocol_id=protocol_id, tenant_no=tenant_no
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _all_samples_status_voided(
|
||||||
|
db: Session,
|
||||||
|
*,
|
||||||
|
source: str,
|
||||||
|
protocol_id: str,
|
||||||
|
tenant_no: str,
|
||||||
|
) -> bool:
|
||||||
|
src = (source or "").strip()
|
||||||
|
if src == "cell_storage":
|
||||||
|
samples = _list_cell_samples(db, protocol_id=protocol_id, tenant_no=tenant_no)
|
||||||
|
else:
|
||||||
|
samples = _list_donation_samples(db, donation_id=protocol_id, tenant_no=tenant_no)
|
||||||
|
if not samples:
|
||||||
|
return False
|
||||||
|
for sample in samples:
|
||||||
|
if (sample.sample_status or "").strip() != SAMPLE_VOID_STATUS:
|
||||||
|
return False
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def maybe_void_protocol_when_all_samples_status_voided(
|
||||||
|
db: Session,
|
||||||
|
*,
|
||||||
|
source: str,
|
||||||
|
protocol_id: str,
|
||||||
|
tenant_no: str,
|
||||||
|
user_id: Optional[str] = None,
|
||||||
|
) -> bool:
|
||||||
|
"""若协议下有效样本全部已作废,则自动作废协议;不联动接收结论。"""
|
||||||
|
src = (source or "").strip()
|
||||||
|
pid = (protocol_id or "").strip()
|
||||||
|
tenant = (tenant_no or "").strip()
|
||||||
|
if src not in ("cell_storage", "research_donation") or not pid or not tenant:
|
||||||
|
return False
|
||||||
|
if not _all_samples_status_voided(db, source=src, protocol_id=pid, tenant_no=tenant):
|
||||||
|
return False
|
||||||
|
|
||||||
|
void_type = ensure_lab_void_type(db, tenant_no=tenant)
|
||||||
|
now = datetime.now()
|
||||||
|
|
||||||
|
if src == "cell_storage":
|
||||||
|
obj = (
|
||||||
|
db.query(BizCollectionProtocol)
|
||||||
|
.filter(
|
||||||
|
BizCollectionProtocol.id == pid,
|
||||||
|
BizCollectionProtocol.tenant_no == tenant,
|
||||||
|
BizCollectionProtocol.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if not obj:
|
||||||
|
return False
|
||||||
|
status = (obj.protocol_status or "").strip()
|
||||||
|
if status in INACTIVE_PROTOCOL_STATUSES:
|
||||||
|
return False
|
||||||
|
from app.core.protocol_status_display import assert_protocol_status_transition
|
||||||
|
from app.crud.collection_protocol import update_collection_protocol
|
||||||
|
|
||||||
|
try:
|
||||||
|
assert_protocol_status_transition(status, "yzf", kind="protocol")
|
||||||
|
except ValueError:
|
||||||
|
return False
|
||||||
|
|
||||||
|
update_collection_protocol(
|
||||||
|
db,
|
||||||
|
pid,
|
||||||
|
tenant_no=tenant,
|
||||||
|
user_id=user_id,
|
||||||
|
protocol_status="yzf",
|
||||||
|
void_time=now,
|
||||||
|
void_desc=_AUTO_VOID_BY_SAMPLE_STATUS_DESC,
|
||||||
|
void_type=void_type,
|
||||||
|
commit=False,
|
||||||
|
sync_reception_discard=False,
|
||||||
|
)
|
||||||
|
return True
|
||||||
|
|
||||||
|
obj = (
|
||||||
|
db.query(BizResearchDonation)
|
||||||
|
.filter(
|
||||||
|
BizResearchDonation.id == pid,
|
||||||
|
BizResearchDonation.tenant_no == tenant,
|
||||||
|
BizResearchDonation.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if not obj:
|
||||||
|
return False
|
||||||
|
status = (obj.donation_status or "").strip()
|
||||||
|
if status in INACTIVE_PROTOCOL_STATUSES:
|
||||||
|
return False
|
||||||
|
|
||||||
|
from app.core.protocol_status_display import assert_protocol_status_transition
|
||||||
|
from app.crud.dict_data import normalize_void_type
|
||||||
|
from app.crud.research_donation import (
|
||||||
|
_DONATION_STATUS_CHANGE_TYPE,
|
||||||
|
append_donation_status_change,
|
||||||
|
)
|
||||||
|
|
||||||
|
current = obj.donation_status or ""
|
||||||
|
try:
|
||||||
|
assert_protocol_status_transition(current, "yzf", kind="donation")
|
||||||
|
except ValueError:
|
||||||
|
return False
|
||||||
|
normalized = normalize_void_type(db, value=void_type, tenant_no=tenant)
|
||||||
|
obj.donation_status = "yzf"
|
||||||
|
obj.void_time = now
|
||||||
|
obj.void_desc = _AUTO_VOID_BY_SAMPLE_STATUS_DESC
|
||||||
|
obj.void_type = normalized
|
||||||
|
obj.update_by = user_id
|
||||||
|
obj.update_time = now
|
||||||
|
change_type = _DONATION_STATUS_CHANGE_TYPE.get("yzf")
|
||||||
|
if change_type:
|
||||||
|
append_donation_status_change(
|
||||||
|
db,
|
||||||
|
research_donation_id=obj.id,
|
||||||
|
change_type=change_type,
|
||||||
|
from_status=current,
|
||||||
|
to_status="yzf",
|
||||||
|
change_time=now,
|
||||||
|
change_desc=_AUTO_VOID_BY_SAMPLE_STATUS_DESC,
|
||||||
|
void_type=normalized,
|
||||||
|
tenant_no=tenant,
|
||||||
|
user_id=user_id,
|
||||||
|
)
|
||||||
|
db.add(obj)
|
||||||
|
db.flush()
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def void_sample_manually(
|
||||||
|
db: Session,
|
||||||
|
*,
|
||||||
|
source: str,
|
||||||
|
tenant_no: str,
|
||||||
|
void_desc: str,
|
||||||
|
user_id: Optional[str] = None,
|
||||||
|
sample_id: Optional[str] = None,
|
||||||
|
sample_code: Optional[str] = None,
|
||||||
|
protocol_id: Optional[str] = None,
|
||||||
|
commit: bool = True,
|
||||||
|
) -> Union[BizProtocolSample, BizResearchDonationSample]:
|
||||||
|
"""人工样本废弃:写 yzf/void_date/void_desc;不改接收;全作废则自动作废协议。"""
|
||||||
|
src = (source or "").strip()
|
||||||
|
tenant = (tenant_no or "").strip()
|
||||||
|
reason = (void_desc or "").strip()
|
||||||
|
sid = (sample_id or "").strip()
|
||||||
|
code = (sample_code or "").strip()
|
||||||
|
pid = (protocol_id or "").strip()
|
||||||
|
if src not in ("cell_storage", "research_donation"):
|
||||||
|
raise ValueError("来源类型无效")
|
||||||
|
if not tenant:
|
||||||
|
raise ValueError("租户编号不能为空")
|
||||||
|
if not reason:
|
||||||
|
raise ValueError("请填写作废原因")
|
||||||
|
if not sid and not code:
|
||||||
|
raise ValueError("样本标识不能为空")
|
||||||
|
|
||||||
|
now = datetime.now()
|
||||||
|
sample: Optional[Union[BizProtocolSample, BizResearchDonationSample]] = None
|
||||||
|
parent_id = ""
|
||||||
|
|
||||||
|
if src == "cell_storage":
|
||||||
|
q = db.query(BizProtocolSample).filter(
|
||||||
|
BizProtocolSample.tenant_no == tenant,
|
||||||
|
BizProtocolSample.del_flag == 0,
|
||||||
|
)
|
||||||
|
if sid:
|
||||||
|
q = q.filter(BizProtocolSample.id == sid)
|
||||||
|
else:
|
||||||
|
q = q.filter(BizProtocolSample.sample_code == code)
|
||||||
|
if pid:
|
||||||
|
q = q.filter(BizProtocolSample.collection_protocol_id == pid)
|
||||||
|
sample = q.first()
|
||||||
|
if not sample:
|
||||||
|
raise ValueError("样本不存在")
|
||||||
|
parent_id = (sample.collection_protocol_id or "").strip()
|
||||||
|
else:
|
||||||
|
q = db.query(BizResearchDonationSample).filter(
|
||||||
|
BizResearchDonationSample.tenant_no == tenant,
|
||||||
|
BizResearchDonationSample.del_flag == 0,
|
||||||
|
)
|
||||||
|
if sid:
|
||||||
|
q = q.filter(BizResearchDonationSample.id == sid)
|
||||||
|
else:
|
||||||
|
q = q.filter(BizResearchDonationSample.sample_code == code)
|
||||||
|
if pid:
|
||||||
|
q = q.filter(BizResearchDonationSample.research_donation_id == pid)
|
||||||
|
sample = q.first()
|
||||||
|
if not sample:
|
||||||
|
raise ValueError("样本不存在")
|
||||||
|
parent_id = (sample.research_donation_id or "").strip()
|
||||||
|
|
||||||
|
if _protocol_is_inactive(db, source=src, protocol_id=parent_id, tenant_no=tenant):
|
||||||
|
raise ValueError("所属协议已作废或属地废弃,无法操作")
|
||||||
|
|
||||||
|
sample.sample_status = SAMPLE_VOID_STATUS
|
||||||
|
sample.void_date = _void_date_yyyymmdd(void_time=now)
|
||||||
|
sample.void_desc = reason
|
||||||
|
sample.update_by = user_id
|
||||||
|
sample.update_time = now
|
||||||
|
db.add(sample)
|
||||||
|
db.flush()
|
||||||
|
|
||||||
|
if parent_id:
|
||||||
|
maybe_void_protocol_when_all_samples_status_voided(
|
||||||
|
db,
|
||||||
|
source=src,
|
||||||
|
protocol_id=parent_id,
|
||||||
|
tenant_no=tenant,
|
||||||
|
user_id=user_id,
|
||||||
|
)
|
||||||
|
|
||||||
|
if commit:
|
||||||
|
db.commit()
|
||||||
|
db.refresh(sample)
|
||||||
|
else:
|
||||||
|
db.flush()
|
||||||
|
return sample
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
"""用户下拉选项:同部门优先排序等轻量辅助。"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import Any, Dict, List, Sequence
|
||||||
|
|
||||||
|
|
||||||
|
def prioritize_caller_dept_options(
|
||||||
|
options: Sequence[Dict[str, Any]],
|
||||||
|
caller_dept_id: str,
|
||||||
|
) -> List[Dict[str, Any]]:
|
||||||
|
"""稳定排序:当前登录用户同部门在前,其余保持原相对顺序。"""
|
||||||
|
items = list(options)
|
||||||
|
dept = (caller_dept_id or "").strip()
|
||||||
|
if not dept or not items:
|
||||||
|
return items
|
||||||
|
return sorted(
|
||||||
|
items,
|
||||||
|
key=lambda item: 0 if str(item.get("deptId") or "").strip() == dept else 1,
|
||||||
|
)
|
||||||
@@ -0,0 +1,211 @@
|
|||||||
|
"""人工样本废弃:写状态/原因,全作废则协议作废,不联动接收。"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from sqlalchemy import create_engine
|
||||||
|
from sqlalchemy.orm import sessionmaker
|
||||||
|
|
||||||
|
from app.core.database import Base
|
||||||
|
from app.models.models import (
|
||||||
|
BizCollectionProtocol,
|
||||||
|
BizProtocolSample,
|
||||||
|
BizProtocolStatusChange,
|
||||||
|
BizSampleReception,
|
||||||
|
SysDictData,
|
||||||
|
)
|
||||||
|
from app.services.protocol_reception_discard_sync import (
|
||||||
|
LAB_VOID_TYPE_CODE,
|
||||||
|
SAMPLE_VOID_STATUS,
|
||||||
|
void_sample_manually,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _session():
|
||||||
|
engine = create_engine("sqlite://")
|
||||||
|
Base.metadata.create_all(
|
||||||
|
bind=engine,
|
||||||
|
tables=[
|
||||||
|
SysDictData.__table__,
|
||||||
|
BizCollectionProtocol.__table__,
|
||||||
|
BizProtocolSample.__table__,
|
||||||
|
BizProtocolStatusChange.__table__,
|
||||||
|
BizSampleReception.__table__,
|
||||||
|
],
|
||||||
|
)
|
||||||
|
return sessionmaker(bind=engine)()
|
||||||
|
|
||||||
|
|
||||||
|
def _now():
|
||||||
|
return datetime(2026, 11, 19, 12, 0, 0)
|
||||||
|
|
||||||
|
|
||||||
|
class TestBusinessSampleVoid(unittest.TestCase):
|
||||||
|
def test_void_one_sample_keeps_protocol_and_skips_reception(self):
|
||||||
|
db = _session()
|
||||||
|
now = _now()
|
||||||
|
db.add(
|
||||||
|
BizCollectionProtocol(
|
||||||
|
id="p1",
|
||||||
|
protocol_no="CP-1",
|
||||||
|
protocol_status="sxz",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
db.add(
|
||||||
|
BizProtocolSample(
|
||||||
|
id="sa",
|
||||||
|
collection_protocol_id="p1",
|
||||||
|
sample_code="A001",
|
||||||
|
sample_status="ycj",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
db.add(
|
||||||
|
BizProtocolSample(
|
||||||
|
id="sb",
|
||||||
|
collection_protocol_id="p1",
|
||||||
|
sample_code="B001",
|
||||||
|
sample_status="ycj",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
db.add(
|
||||||
|
BizSampleReception(
|
||||||
|
id="ra",
|
||||||
|
protocol_sample_id="sa",
|
||||||
|
collection_protocol_id="p1",
|
||||||
|
reception_time=now,
|
||||||
|
accept_conclusion="js",
|
||||||
|
reception_source="cell_storage",
|
||||||
|
sample_code="A001",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
check_packaging=0,
|
||||||
|
check_sealing=0,
|
||||||
|
check_no_damage=0,
|
||||||
|
check_no_leakage=0,
|
||||||
|
check_color=0,
|
||||||
|
check_tying_rope=0,
|
||||||
|
check_no_stratification=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
void_sample_manually(
|
||||||
|
db,
|
||||||
|
source="cell_storage",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
void_desc="质检发现污染",
|
||||||
|
user_id="u1",
|
||||||
|
sample_id="sa",
|
||||||
|
)
|
||||||
|
|
||||||
|
a = db.query(BizProtocolSample).filter(BizProtocolSample.id == "sa").one()
|
||||||
|
b = db.query(BizProtocolSample).filter(BizProtocolSample.id == "sb").one()
|
||||||
|
proto = db.query(BizCollectionProtocol).filter(BizCollectionProtocol.id == "p1").one()
|
||||||
|
rec = db.query(BizSampleReception).filter(BizSampleReception.id == "ra").one()
|
||||||
|
self.assertEqual(a.sample_status, SAMPLE_VOID_STATUS)
|
||||||
|
self.assertEqual(a.void_desc, "质检发现污染")
|
||||||
|
self.assertTrue((a.void_date or "").strip())
|
||||||
|
self.assertEqual(b.sample_status, "ycj")
|
||||||
|
self.assertEqual(proto.protocol_status, "sxz")
|
||||||
|
self.assertEqual(rec.accept_conclusion, "js")
|
||||||
|
|
||||||
|
def test_void_all_samples_auto_voids_protocol_without_reception_change(self):
|
||||||
|
db = _session()
|
||||||
|
now = _now()
|
||||||
|
db.add(
|
||||||
|
BizCollectionProtocol(
|
||||||
|
id="p2",
|
||||||
|
protocol_no="CP-2",
|
||||||
|
protocol_status="sxz",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
for sid, code in (("s1", "C001"), ("s2", "C002")):
|
||||||
|
db.add(
|
||||||
|
BizProtocolSample(
|
||||||
|
id=sid,
|
||||||
|
collection_protocol_id="p2",
|
||||||
|
sample_code=code,
|
||||||
|
sample_status="ycj",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
db.add(
|
||||||
|
BizSampleReception(
|
||||||
|
id="r1",
|
||||||
|
protocol_sample_id="s1",
|
||||||
|
collection_protocol_id="p2",
|
||||||
|
reception_time=now,
|
||||||
|
accept_conclusion="js",
|
||||||
|
reception_source="cell_storage",
|
||||||
|
sample_code="C001",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
check_packaging=0,
|
||||||
|
check_sealing=0,
|
||||||
|
check_no_damage=0,
|
||||||
|
check_no_leakage=0,
|
||||||
|
check_color=0,
|
||||||
|
check_tying_rope=0,
|
||||||
|
check_no_stratification=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
void_sample_manually(
|
||||||
|
db,
|
||||||
|
source="cell_storage",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
void_desc="原因1",
|
||||||
|
sample_id="s1",
|
||||||
|
commit=True,
|
||||||
|
)
|
||||||
|
void_sample_manually(
|
||||||
|
db,
|
||||||
|
source="cell_storage",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
void_desc="原因2",
|
||||||
|
sample_id="s2",
|
||||||
|
commit=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
proto = db.query(BizCollectionProtocol).filter(BizCollectionProtocol.id == "p2").one()
|
||||||
|
rec = db.query(BizSampleReception).filter(BizSampleReception.id == "r1").one()
|
||||||
|
self.assertEqual(proto.protocol_status, "yzf")
|
||||||
|
self.assertEqual(proto.void_type, LAB_VOID_TYPE_CODE)
|
||||||
|
self.assertEqual(rec.accept_conclusion, "js")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -3,6 +3,7 @@ from __future__ import annotations
|
|||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
from types import SimpleNamespace
|
||||||
|
|
||||||
from app.services.lab_sample_process import (
|
from app.services.lab_sample_process import (
|
||||||
format_cn_datetime,
|
format_cn_datetime,
|
||||||
@@ -38,5 +39,65 @@ class LabSampleProcessServiceTests(unittest.TestCase):
|
|||||||
self.assertEqual(merged["motherName"], "张三")
|
self.assertEqual(merged["motherName"], "张三")
|
||||||
|
|
||||||
|
|
||||||
|
class LabSampleProcessRowStatusTests(unittest.TestCase):
|
||||||
|
def test_cell_and_donation_rows_expose_sample_status(self):
|
||||||
|
from app.crud.lab_sample_process import (
|
||||||
|
_build_cell_system,
|
||||||
|
_build_donation_system,
|
||||||
|
)
|
||||||
|
|
||||||
|
rec = SimpleNamespace(
|
||||||
|
id="r1",
|
||||||
|
sample_code="S1",
|
||||||
|
lab_storage_code="B0000108",
|
||||||
|
reception_time=None,
|
||||||
|
receive_temperature="",
|
||||||
|
handler_name="",
|
||||||
|
remark="",
|
||||||
|
create_time=None,
|
||||||
|
)
|
||||||
|
sample = SimpleNamespace(
|
||||||
|
sample_code="S1",
|
||||||
|
sample_status="yrk",
|
||||||
|
void_desc="",
|
||||||
|
)
|
||||||
|
voided = SimpleNamespace(
|
||||||
|
sample_code="S2",
|
||||||
|
sample_status="yzf",
|
||||||
|
void_desc="溶血",
|
||||||
|
)
|
||||||
|
cell = _build_cell_system(
|
||||||
|
tab_key="cell_hsc",
|
||||||
|
rec=rec,
|
||||||
|
sample=sample,
|
||||||
|
party=None,
|
||||||
|
coll=None,
|
||||||
|
protocol=None,
|
||||||
|
prod={},
|
||||||
|
hospital_name="",
|
||||||
|
check_flags={},
|
||||||
|
storage_status="已入库",
|
||||||
|
qc_mother={},
|
||||||
|
qc_process={},
|
||||||
|
)
|
||||||
|
self.assertEqual(cell["sampleStatus"], "yrk")
|
||||||
|
self.assertEqual(cell["voidDesc"], "")
|
||||||
|
self.assertEqual(cell["cellCode"], "B0000108")
|
||||||
|
|
||||||
|
donation = _build_donation_system(
|
||||||
|
tab_key="donation_hsc",
|
||||||
|
rec=rec,
|
||||||
|
sample=voided,
|
||||||
|
party=None,
|
||||||
|
coll=None,
|
||||||
|
prod={},
|
||||||
|
storage_status="",
|
||||||
|
qc_mother={},
|
||||||
|
qc_process={},
|
||||||
|
)
|
||||||
|
self.assertEqual(donation["sampleStatus"], "yzf")
|
||||||
|
self.assertEqual(donation["voidDesc"], "溶血")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
@@ -99,12 +99,20 @@ def test_specialist_sees_shared_batch_but_only_own_items_and_count():
|
|||||||
from app.services.market_freight import get_freight_detail, list_freights
|
from app.services.market_freight import get_freight_detail, list_freights
|
||||||
db = _session()
|
db = _session()
|
||||||
own, own_parent = _sample(db, 'own')
|
own, own_parent = _sample(db, 'own')
|
||||||
|
own.sample_status = 'yzf'
|
||||||
|
own.void_desc = '冷链中断'
|
||||||
|
db.commit()
|
||||||
other, other_parent = _sample(db, 'other', sales='u2')
|
other, other_parent = _sample(db, 'other', sales='u2')
|
||||||
freight = _freight(db, 'mixed', [('cell_storage', own, own_parent), ('cell_storage', other, other_parent)])
|
freight = _freight(db, 'mixed', [('cell_storage', own, own_parent), ('cell_storage', other, other_parent)])
|
||||||
rows, total = list_freights(db, ctx=_ctx(), user_info=_user(), include_items=True)
|
rows, total = list_freights(db, ctx=_ctx(), user_info=_user(), include_items=True)
|
||||||
detail = get_freight_detail(db, freight.id, ctx=_ctx(), user_info=_user())
|
detail = get_freight_detail(db, freight.id, ctx=_ctx(), user_info=_user())
|
||||||
assert total == 1 and rows[0]['visibleItemCount'] == 1
|
assert total == 1 and rows[0]['visibleItemCount'] == 1
|
||||||
assert [item['sampleCode'] for item in rows[0]['items']] == ['C-own']
|
assert [item['sampleCode'] for item in rows[0]['items']] == ['C-own']
|
||||||
|
assert rows[0]['items'][0]['sampleStatus'] == 'yzf'
|
||||||
|
assert rows[0]['items'][0]['sampleStatusLabel'] == '已作废'
|
||||||
|
assert rows[0]['items'][0]['voidDesc'] == '冷链中断'
|
||||||
|
assert detail['items'][0]['sampleStatus'] == 'yzf'
|
||||||
|
assert detail['items'][0]['voidDesc'] == '冷链中断'
|
||||||
assert [item['sampleCode'] for item in detail['items']] == ['C-own']
|
assert [item['sampleCode'] for item in detail['items']] == ['C-own']
|
||||||
assert rows[0]['createBy'] == detail['createBy'] == 'u1'
|
assert rows[0]['createBy'] == detail['createBy'] == 'u1'
|
||||||
assert rows[0]['createByName'] == detail['createByName'] == '专员'
|
assert rows[0]['createByName'] == detail['createByName'] == '专员'
|
||||||
|
|||||||
@@ -674,6 +674,33 @@ def test_chase_filters_counts_orders_and_pages_in_sql_before_materialization():
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_payment_and_chase_lists_include_sample_status_when_coded():
|
||||||
|
from app.services.market_payment import list_payment_chase, list_payments
|
||||||
|
|
||||||
|
db = _session()
|
||||||
|
today = date(2026, 10, 11)
|
||||||
|
_payment_tree(db, 'void-sample', due_date=today.strftime('%Y%m%d'))
|
||||||
|
sample = db.get(BizProtocolSample, 'sample-void-sample')
|
||||||
|
sample.sample_status = 'yzf'
|
||||||
|
sample.void_desc = '客户放弃'
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
payments, payment_total = list_payments(db, ctx=_ctx(), user_info=_user())
|
||||||
|
chase, chase_total = list_payment_chase(
|
||||||
|
db, ctx=_ctx(), user_info=_user(), today=today
|
||||||
|
)
|
||||||
|
|
||||||
|
assert payment_total == 1
|
||||||
|
assert payments[0]['sampleCode'] == 'S-void-sample'
|
||||||
|
assert payments[0]['sampleStatus'] == 'yzf'
|
||||||
|
assert payments[0]['sampleStatusLabel'] == '已作废'
|
||||||
|
assert payments[0]['voidDesc'] == '客户放弃'
|
||||||
|
assert chase_total == 1
|
||||||
|
assert chase[0]['sampleStatus'] == 'yzf'
|
||||||
|
assert chase[0]['sampleStatusLabel'] == '已作废'
|
||||||
|
assert chase[0]['voidDesc'] == '客户放弃'
|
||||||
|
|
||||||
|
|
||||||
def test_payment_list_includes_legacy_models_and_uses_parent_scope_not_transfer_department():
|
def test_payment_list_includes_legacy_models_and_uses_parent_scope_not_transfer_department():
|
||||||
from app.services.market_payment import list_payments
|
from app.services.market_payment import list_payments
|
||||||
|
|
||||||
|
|||||||
@@ -3604,6 +3604,10 @@ def test_protocol_list_contains_mobile_card_fields():
|
|||||||
assert items[0]['deliveryMode'] == 'sc'
|
assert items[0]['deliveryMode'] == 'sc'
|
||||||
assert items[0]['newbornWeightGram'] == 3200
|
assert items[0]['newbornWeightGram'] == 3200
|
||||||
assert items[0]['salesUserName'] == '当前用户'
|
assert items[0]['salesUserName'] == '当前用户'
|
||||||
|
assert items[0]['sampleStatus'] == ''
|
||||||
|
assert items[0]['sampleStatusLabel'] == ''
|
||||||
|
assert items[0]['sampleVoidDesc'] == ''
|
||||||
|
assert items[0]['voidDesc'] == ''
|
||||||
|
|
||||||
by_customer, customer_total = list_protocols(
|
by_customer, customer_total = list_protocols(
|
||||||
db, ctx=_ctx('specialist'), user_info=_user(), keyword='李安然'
|
db, ctx=_ctx('specialist'), user_info=_user(), keyword='李安然'
|
||||||
@@ -3626,6 +3630,54 @@ def test_protocol_list_contains_mobile_card_fields():
|
|||||||
} == {row.id}
|
} == {row.id}
|
||||||
|
|
||||||
|
|
||||||
|
def test_protocol_list_returns_sample_status_without_replacing_donation_void_desc():
|
||||||
|
from app.services.market_protocol import list_protocols
|
||||||
|
|
||||||
|
db = _session()
|
||||||
|
cell = _cell(db, 'status-cell')
|
||||||
|
db.add(
|
||||||
|
BizProtocolSample(
|
||||||
|
id='sample-status-cell',
|
||||||
|
collection_protocol_id=cell.id,
|
||||||
|
sample_code='S-CELL',
|
||||||
|
sample_status='yzf',
|
||||||
|
void_desc='试管破裂',
|
||||||
|
tenant_no='tenant-a',
|
||||||
|
create_dept_id='',
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
donation = _donation(db, 'status-don')
|
||||||
|
donation.void_desc = '协议作废说明'
|
||||||
|
db.add(
|
||||||
|
BizResearchDonationSample(
|
||||||
|
id='sample-status-don',
|
||||||
|
research_donation_id=donation.id,
|
||||||
|
sample_code='S-DON',
|
||||||
|
sample_status='yrk',
|
||||||
|
void_desc='样本溶血',
|
||||||
|
tenant_no='tenant-a',
|
||||||
|
create_dept_id='',
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
items, total = list_protocols(db, ctx=_ctx('specialist'), user_info=_user())
|
||||||
|
|
||||||
|
assert total == 2
|
||||||
|
by_id = {item['id']: item for item in items}
|
||||||
|
assert by_id['status-cell']['sampleCode'] == 'S-CELL'
|
||||||
|
assert by_id['status-cell']['sampleStatus'] == 'yzf'
|
||||||
|
assert by_id['status-cell']['sampleStatusLabel'] == '已作废'
|
||||||
|
assert by_id['status-cell']['voidDesc'] == '试管破裂'
|
||||||
|
assert by_id['status-cell']['sampleVoidDesc'] == '试管破裂'
|
||||||
|
assert by_id['status-don']['sampleStatus'] == 'yrk'
|
||||||
|
assert by_id['status-don']['sampleStatusLabel'] == '已入库'
|
||||||
|
assert by_id['status-don']['voidDesc'] == '协议作废说明'
|
||||||
|
assert by_id['status-don']['sampleVoidDesc'] == '样本溶血'
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('source', ['cell_storage', 'research_donation'])
|
@pytest.mark.parametrize('source', ['cell_storage', 'research_donation'])
|
||||||
def test_protocol_list_and_detail_resolve_tenant_void_type_label(source):
|
def test_protocol_list_and_detail_resolve_tenant_void_type_label(source):
|
||||||
from app.services.market_protocol import get_protocol, list_protocols
|
from app.services.market_protocol import get_protocol, list_protocols
|
||||||
|
|||||||
@@ -399,6 +399,143 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
)
|
)
|
||||||
self.assertEqual(rec.accept_conclusion, "bj")
|
self.assertEqual(rec.accept_conclusion, "bj")
|
||||||
|
|
||||||
|
def test_single_reception_discard_voids_only_that_sample(self):
|
||||||
|
db = _session()
|
||||||
|
now = _now()
|
||||||
|
db.add(
|
||||||
|
BizCollectionProtocol(
|
||||||
|
id="p-multi",
|
||||||
|
protocol_no="CP-MULTI",
|
||||||
|
protocol_status="sxz",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
for sid, code, status in (
|
||||||
|
("sa", "ZKA", "ycj"),
|
||||||
|
("sb", "ZKB", "ycj"),
|
||||||
|
("sc", "ZKC", "ycj"),
|
||||||
|
):
|
||||||
|
db.add(
|
||||||
|
BizProtocolSample(
|
||||||
|
id=sid,
|
||||||
|
collection_protocol_id="p-multi",
|
||||||
|
sample_code=code,
|
||||||
|
sample_status=status,
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
rec_a = BizSampleReception(
|
||||||
|
id="ra",
|
||||||
|
protocol_sample_id="sa",
|
||||||
|
collection_protocol_id="p-multi",
|
||||||
|
reception_time=now,
|
||||||
|
accept_conclusion="bj",
|
||||||
|
reception_source="cell_storage",
|
||||||
|
sample_code="ZKA",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
check_packaging=0,
|
||||||
|
check_sealing=0,
|
||||||
|
check_no_damage=0,
|
||||||
|
check_no_leakage=0,
|
||||||
|
check_color=0,
|
||||||
|
check_tying_rope=0,
|
||||||
|
check_no_stratification=0,
|
||||||
|
)
|
||||||
|
db.add(rec_a)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
after_sample_reception_saved(
|
||||||
|
db, reception=rec_a, tenant_no="tenant-a", user_id="u1"
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
proto = db.query(BizCollectionProtocol).filter(BizCollectionProtocol.id == "p-multi").one()
|
||||||
|
self.assertEqual(proto.protocol_status, "sxz")
|
||||||
|
by_id = {
|
||||||
|
s.id: s
|
||||||
|
for s in db.query(BizProtocolSample)
|
||||||
|
.filter(BizProtocolSample.collection_protocol_id == "p-multi")
|
||||||
|
.all()
|
||||||
|
}
|
||||||
|
self.assertEqual(by_id["sa"].sample_status, SAMPLE_VOID_STATUS)
|
||||||
|
self.assertEqual(by_id["sa"].void_date, "20261105")
|
||||||
|
self.assertEqual(by_id["sb"].sample_status, "ycj")
|
||||||
|
self.assertEqual(by_id["sc"].sample_status, "ycj")
|
||||||
|
|
||||||
|
def test_reception_accept_clears_sample_void_when_protocol_active(self):
|
||||||
|
db = _session()
|
||||||
|
now = _now()
|
||||||
|
db.add(
|
||||||
|
BizCollectionProtocol(
|
||||||
|
id="p-clear",
|
||||||
|
protocol_no="CP-CLEAR",
|
||||||
|
protocol_status="sxz",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
db.add(
|
||||||
|
BizProtocolSample(
|
||||||
|
id="s-clear",
|
||||||
|
collection_protocol_id="p-clear",
|
||||||
|
sample_code="ZKCLR",
|
||||||
|
sample_status=SAMPLE_VOID_STATUS,
|
||||||
|
void_date="20261101",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
rec = BizSampleReception(
|
||||||
|
id="r-clear",
|
||||||
|
protocol_sample_id="s-clear",
|
||||||
|
collection_protocol_id="p-clear",
|
||||||
|
reception_time=now,
|
||||||
|
accept_conclusion="js",
|
||||||
|
reception_source="cell_storage",
|
||||||
|
sample_code="ZKCLR",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
check_packaging=0,
|
||||||
|
check_sealing=0,
|
||||||
|
check_no_damage=0,
|
||||||
|
check_no_leakage=0,
|
||||||
|
check_color=0,
|
||||||
|
check_tying_rope=0,
|
||||||
|
check_no_stratification=0,
|
||||||
|
)
|
||||||
|
db.add(rec)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
after_sample_reception_saved(
|
||||||
|
db, reception=rec, tenant_no="tenant-a", user_id="u1"
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
sample = db.query(BizProtocolSample).filter(BizProtocolSample.id == "s-clear").one()
|
||||||
|
self.assertFalse((sample.sample_status or "").strip())
|
||||||
|
self.assertFalse((sample.void_date or "").strip())
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
@@ -79,12 +79,26 @@ class TestFreightListHelpers(unittest.TestCase):
|
|||||||
sample_type_name="脐带血",
|
sample_type_name="脐带血",
|
||||||
mother_name="张三",
|
mother_name="张三",
|
||||||
newborn_name="张小宝",
|
newborn_name="张小宝",
|
||||||
|
sample_status="ycj",
|
||||||
|
void_desc="",
|
||||||
)
|
)
|
||||||
self.assertEqual(d["protocolNo"], "CP001")
|
self.assertEqual(d["protocolNo"], "CP001")
|
||||||
self.assertEqual(d["sampleTypeName"], "脐带血")
|
self.assertEqual(d["sampleTypeName"], "脐带血")
|
||||||
self.assertEqual(d["sampleSource"], "cell_storage")
|
self.assertEqual(d["sampleSource"], "cell_storage")
|
||||||
self.assertEqual(d["motherName"], "张三")
|
self.assertEqual(d["motherName"], "张三")
|
||||||
self.assertEqual(d["newbornName"], "张小宝")
|
self.assertEqual(d["newbornName"], "张小宝")
|
||||||
|
self.assertEqual(d["sampleStatus"], "ycj")
|
||||||
|
self.assertEqual(d["sampleStatusLabel"], "已采集")
|
||||||
|
self.assertEqual(d["voidDesc"], "")
|
||||||
|
|
||||||
|
voided = _item_to_dict_enriched(
|
||||||
|
I(),
|
||||||
|
sample_status="yzf",
|
||||||
|
void_desc="运输破损",
|
||||||
|
)
|
||||||
|
self.assertEqual(voided["sampleStatus"], "yzf")
|
||||||
|
self.assertEqual(voided["sampleStatusLabel"], "已作废")
|
||||||
|
self.assertEqual(voided["voidDesc"], "运输破损")
|
||||||
|
|
||||||
def test_row_dict_includes_create_by(self):
|
def test_row_dict_includes_create_by(self):
|
||||||
from app.crud.sample_freight import _row_to_dict
|
from app.crud.sample_freight import _row_to_dict
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
"""样本缴费列表:进度过滤与分页顺序"""
|
"""样本缴费列表:进度过滤与分页顺序、样本状态汇总字段"""
|
||||||
|
|
||||||
|
from types import SimpleNamespace
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from app.crud.protocol_sample_payment import _filter_and_page_progress
|
from app.crud.protocol_sample_payment import (
|
||||||
|
_build_list_summary_row,
|
||||||
|
_filter_and_page_progress,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class TestFilterAndPageProgress(unittest.TestCase):
|
class TestFilterAndPageProgress(unittest.TestCase):
|
||||||
@@ -33,5 +37,73 @@ class TestFilterAndPageProgress(unittest.TestCase):
|
|||||||
self.assertEqual([r["id"] for r in page], ["0", "1", "2"])
|
self.assertEqual([r["id"] for r in page], ["0", "1", "2"])
|
||||||
|
|
||||||
|
|
||||||
|
class TestPaymentListSampleStatus(unittest.TestCase):
|
||||||
|
def test_summary_row_exposes_sample_status_and_void_desc(self):
|
||||||
|
sp = SimpleNamespace(
|
||||||
|
id="sp1",
|
||||||
|
collection_protocol_id="p1",
|
||||||
|
sample_code="ZKZX34001028",
|
||||||
|
pay_mode="dj",
|
||||||
|
contract_amount=None,
|
||||||
|
remark="",
|
||||||
|
)
|
||||||
|
proto = SimpleNamespace(
|
||||||
|
protocol_no="CP-1",
|
||||||
|
protocol_status="sxz",
|
||||||
|
void_type="",
|
||||||
|
register_date="20261101",
|
||||||
|
)
|
||||||
|
party = SimpleNamespace(mother_name="张三", mother_phone="13800000000")
|
||||||
|
progress = {
|
||||||
|
"progressStatus": "dfj",
|
||||||
|
"paidAmount": 0,
|
||||||
|
"arrearsAmount": 0,
|
||||||
|
"dueAmount": 0,
|
||||||
|
}
|
||||||
|
row = _build_list_summary_row(
|
||||||
|
sp,
|
||||||
|
proto,
|
||||||
|
party,
|
||||||
|
progress,
|
||||||
|
schedules=[],
|
||||||
|
transfers=[],
|
||||||
|
sample_meta={
|
||||||
|
"storageYears": 20,
|
||||||
|
"sampleTypeName": "脐带血",
|
||||||
|
"discountAmount": None,
|
||||||
|
"sampleStatus": "ycj",
|
||||||
|
"sampleStatusLabel": "已采集",
|
||||||
|
"voidDesc": "",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertEqual(row["sampleStatus"], "ycj")
|
||||||
|
self.assertEqual(row["sampleStatusLabel"], "已采集")
|
||||||
|
self.assertEqual(row["voidDesc"], "")
|
||||||
|
|
||||||
|
voided = _build_list_summary_row(
|
||||||
|
sp,
|
||||||
|
proto,
|
||||||
|
party,
|
||||||
|
progress,
|
||||||
|
schedules=[],
|
||||||
|
transfers=[],
|
||||||
|
sample_meta={
|
||||||
|
"sampleStatus": "yzf",
|
||||||
|
"voidDesc": "客户放弃存储",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertEqual(voided["sampleStatus"], "yzf")
|
||||||
|
self.assertEqual(voided["sampleStatusLabel"], "已作废")
|
||||||
|
self.assertEqual(voided["voidDesc"], "客户放弃存储")
|
||||||
|
|
||||||
|
|
||||||
|
class TestPaymentChaseSampleStatusLabels(unittest.TestCase):
|
||||||
|
def test_status_label_map_covers_voided(self):
|
||||||
|
from app.crud.protocol_sample_payment import _SAMPLE_STATUS_LABELS
|
||||||
|
|
||||||
|
self.assertEqual(_SAMPLE_STATUS_LABELS.get("ycj"), "已采集")
|
||||||
|
self.assertEqual(_SAMPLE_STATUS_LABELS.get("yzf"), "已作废")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
"""用户下拉选项:同部门优先排序。"""
|
||||||
|
from app.services.user_select_options import prioritize_caller_dept_options
|
||||||
|
|
||||||
|
|
||||||
|
def test_prioritize_caller_dept_keeps_relative_order():
|
||||||
|
options = [
|
||||||
|
{"label": "外1", "value": "a", "deptId": "d2"},
|
||||||
|
{"label": "同1", "value": "b", "deptId": "d1"},
|
||||||
|
{"label": "外2", "value": "c", "deptId": "d3"},
|
||||||
|
{"label": "同2", "value": "d", "deptId": "d1"},
|
||||||
|
{"label": "无部门", "value": "e", "deptId": ""},
|
||||||
|
]
|
||||||
|
out = prioritize_caller_dept_options(options, "d1")
|
||||||
|
assert [x["value"] for x in out] == ["b", "d", "a", "c", "e"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_prioritize_caller_dept_noop_without_caller_dept():
|
||||||
|
options = [
|
||||||
|
{"label": "a", "value": "a", "deptId": "d1"},
|
||||||
|
{"label": "b", "value": "b", "deptId": "d2"},
|
||||||
|
]
|
||||||
|
assert prioritize_caller_dept_options(options, "") == options
|
||||||
|
assert prioritize_caller_dept_options(options, " ") == options
|
||||||
|
|
||||||
|
|
||||||
|
def test_prioritize_caller_dept_empty_list():
|
||||||
|
assert prioritize_caller_dept_options([], "d1") == []
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
-- Issue #129:样本接收结论已为废弃(bj)、但样本状态尚未作废的历史回刷
|
||||||
|
-- 细胞存储 / 科研捐赠;可重复执行。
|
||||||
|
-- 仅处理协议仍有效(非 yzf/sdfq)的样本行;已作废协议样本由 #127 回刷脚本覆盖。
|
||||||
|
|
||||||
|
-- 细胞存储
|
||||||
|
UPDATE biz_protocol_sample s
|
||||||
|
INNER JOIN biz_sample_reception r
|
||||||
|
ON r.tenant_no = s.tenant_no
|
||||||
|
AND r.del_flag = 0
|
||||||
|
AND r.reception_source = 'cell_storage'
|
||||||
|
AND r.accept_conclusion = 'bj'
|
||||||
|
AND r.sample_code = s.sample_code
|
||||||
|
AND r.collection_protocol_id = s.collection_protocol_id
|
||||||
|
INNER JOIN biz_collection_protocol p
|
||||||
|
ON p.id = s.collection_protocol_id
|
||||||
|
AND p.tenant_no = s.tenant_no
|
||||||
|
AND p.del_flag = 0
|
||||||
|
SET
|
||||||
|
s.sample_status = 'yzf',
|
||||||
|
s.void_date = CASE
|
||||||
|
WHEN s.void_date IS NOT NULL AND TRIM(s.void_date) <> '' THEN s.void_date
|
||||||
|
WHEN r.reception_time IS NOT NULL THEN DATE_FORMAT(r.reception_time, '%Y%m%d')
|
||||||
|
WHEN s.update_time IS NOT NULL THEN DATE_FORMAT(s.update_time, '%Y%m%d')
|
||||||
|
ELSE DATE_FORMAT(NOW(), '%Y%m%d')
|
||||||
|
END,
|
||||||
|
s.update_time = NOW()
|
||||||
|
WHERE s.del_flag = 0
|
||||||
|
AND p.protocol_status NOT IN ('yzf', 'sdfq')
|
||||||
|
AND (
|
||||||
|
s.sample_status IS NULL
|
||||||
|
OR TRIM(s.sample_status) = ''
|
||||||
|
OR s.sample_status <> 'yzf'
|
||||||
|
OR s.void_date IS NULL
|
||||||
|
OR TRIM(s.void_date) = ''
|
||||||
|
);
|
||||||
|
|
||||||
|
-- 科研捐赠
|
||||||
|
UPDATE biz_research_donation_sample s
|
||||||
|
INNER JOIN biz_sample_reception r
|
||||||
|
ON r.tenant_no = s.tenant_no
|
||||||
|
AND r.del_flag = 0
|
||||||
|
AND r.reception_source = 'research_donation'
|
||||||
|
AND r.accept_conclusion = 'bj'
|
||||||
|
AND r.sample_code = s.sample_code
|
||||||
|
AND r.research_donation_id = s.research_donation_id
|
||||||
|
INNER JOIN biz_research_donation d
|
||||||
|
ON d.id = s.research_donation_id
|
||||||
|
AND d.tenant_no = s.tenant_no
|
||||||
|
AND d.del_flag = 0
|
||||||
|
SET
|
||||||
|
s.sample_status = 'yzf',
|
||||||
|
s.void_date = CASE
|
||||||
|
WHEN s.void_date IS NOT NULL AND TRIM(s.void_date) <> '' THEN s.void_date
|
||||||
|
WHEN r.reception_time IS NOT NULL THEN DATE_FORMAT(r.reception_time, '%Y%m%d')
|
||||||
|
WHEN s.update_time IS NOT NULL THEN DATE_FORMAT(s.update_time, '%Y%m%d')
|
||||||
|
ELSE DATE_FORMAT(NOW(), '%Y%m%d')
|
||||||
|
END,
|
||||||
|
s.update_time = NOW()
|
||||||
|
WHERE s.del_flag = 0
|
||||||
|
AND d.donation_status NOT IN ('yzf', 'sdfq')
|
||||||
|
AND (
|
||||||
|
s.sample_status IS NULL
|
||||||
|
OR TRIM(s.sample_status) = ''
|
||||||
|
OR s.sample_status <> 'yzf'
|
||||||
|
OR s.void_date IS NULL
|
||||||
|
OR TRIM(s.void_date) = ''
|
||||||
|
);
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
-- Issue #131:样本作废原因字段 void_desc
|
||||||
|
-- 细胞存储 / 科研捐赠样本表;按列是否已存在可重复执行。
|
||||||
|
|
||||||
|
SET @db := DATABASE();
|
||||||
|
|
||||||
|
SET @exists := (
|
||||||
|
SELECT COUNT(*) FROM information_schema.COLUMNS
|
||||||
|
WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'biz_protocol_sample' AND COLUMN_NAME = 'void_desc'
|
||||||
|
);
|
||||||
|
SET @sql := IF(
|
||||||
|
@exists = 0,
|
||||||
|
'ALTER TABLE biz_protocol_sample ADD COLUMN void_desc VARCHAR(512) NULL COMMENT ''样本作废原因'' AFTER void_date',
|
||||||
|
'SELECT 1'
|
||||||
|
);
|
||||||
|
PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
|
||||||
|
|
||||||
|
SET @exists := (
|
||||||
|
SELECT COUNT(*) FROM information_schema.COLUMNS
|
||||||
|
WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'biz_research_donation_sample' AND COLUMN_NAME = 'void_desc'
|
||||||
|
);
|
||||||
|
SET @sql := IF(
|
||||||
|
@exists = 0,
|
||||||
|
'ALTER TABLE biz_research_donation_sample ADD COLUMN void_desc VARCHAR(512) NULL COMMENT ''样本作废原因'' AFTER void_date',
|
||||||
|
'SELECT 1'
|
||||||
|
);
|
||||||
|
PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
|
||||||
@@ -23,23 +23,11 @@
|
|||||||
</header>
|
</header>
|
||||||
|
|
||||||
<div class="market-list-card__fields">
|
<div class="market-list-card__fields">
|
||||||
<div
|
<MarketListField
|
||||||
v-for="field in previewFields"
|
v-for="field in previewFields"
|
||||||
:key="`${field.label}:${field.value}`"
|
:key="`${field.label}:${field.value}`"
|
||||||
class="market-list-card__field"
|
:field="field"
|
||||||
:class="{ 'is-wide': field.wide }"
|
/>
|
||||||
>
|
|
||||||
<span>{{ field.label }}</span>
|
|
||||||
<van-tag
|
|
||||||
v-if="field.tag"
|
|
||||||
class="market-tag"
|
|
||||||
:type="resolveStatusTone(field.value, field.tagType)"
|
|
||||||
size="medium"
|
|
||||||
round
|
|
||||||
:title="field.value"
|
|
||||||
>{{ field.value }}</van-tag>
|
|
||||||
<b v-else :class="{ 'is-money': field.money }">{{ field.value }}</b>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 每一期缴费:始终展示在「展开更多」上方,不收进总折叠 -->
|
<!-- 每一期缴费:始终展示在「展开更多」上方,不收进总折叠 -->
|
||||||
@@ -70,15 +58,11 @@
|
|||||||
</button>
|
</button>
|
||||||
<div v-show="periodOpenKeys[block.key]" class="market-list-card__period-body">
|
<div v-show="periodOpenKeys[block.key]" class="market-list-card__period-body">
|
||||||
<div class="market-list-card__fields market-list-card__fields--compact">
|
<div class="market-list-card__fields market-list-card__fields--compact">
|
||||||
<div
|
<MarketListField
|
||||||
v-for="field in block.fields"
|
v-for="field in block.fields"
|
||||||
:key="`${block.key}:${field.label}`"
|
:key="`${block.key}:${field.label}`"
|
||||||
class="market-list-card__field"
|
:field="field"
|
||||||
:class="{ 'is-wide': field.wide }"
|
/>
|
||||||
>
|
|
||||||
<span>{{ field.label }}</span>
|
|
||||||
<b :class="{ 'is-money': field.money }">{{ field.value }}</b>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -102,44 +86,20 @@
|
|||||||
<van-icon class="market-list-card__fields-toggle-chevron" name="arrow-down" />
|
<van-icon class="market-list-card__fields-toggle-chevron" name="arrow-down" />
|
||||||
</button>
|
</button>
|
||||||
<div v-show="fieldsOpen && collapsedFields.length" class="market-list-card__fields market-list-card__fields--folded">
|
<div v-show="fieldsOpen && collapsedFields.length" class="market-list-card__fields market-list-card__fields--folded">
|
||||||
<div
|
<MarketListField
|
||||||
v-for="field in collapsedFields"
|
v-for="field in collapsedFields"
|
||||||
:key="`more:${field.label}:${field.value}`"
|
:key="`more:${field.label}:${field.value}`"
|
||||||
class="market-list-card__field"
|
:field="field"
|
||||||
:class="{ 'is-wide': field.wide }"
|
/>
|
||||||
>
|
|
||||||
<span>{{ field.label }}</span>
|
|
||||||
<van-tag
|
|
||||||
v-if="field.tag"
|
|
||||||
class="market-tag"
|
|
||||||
:type="resolveStatusTone(field.value, field.tagType)"
|
|
||||||
size="medium"
|
|
||||||
round
|
|
||||||
:title="field.value"
|
|
||||||
>{{ field.value }}</van-tag>
|
|
||||||
<b v-else :class="{ 'is-money': field.money }">{{ field.value }}</b>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="card.footerFields?.length && showFoldedFooter" class="market-list-card__fields">
|
<div v-if="card.footerFields?.length && showFoldedFooter" class="market-list-card__fields">
|
||||||
<div
|
<MarketListField
|
||||||
v-for="field in card.footerFields"
|
v-for="field in card.footerFields"
|
||||||
:key="`footer:${field.label}:${field.value}`"
|
:key="`footer:${field.label}:${field.value}`"
|
||||||
class="market-list-card__field"
|
:field="field"
|
||||||
:class="{ 'is-wide': field.wide }"
|
/>
|
||||||
>
|
|
||||||
<span>{{ field.label }}</span>
|
|
||||||
<van-tag
|
|
||||||
v-if="field.tag"
|
|
||||||
class="market-tag"
|
|
||||||
:type="resolveStatusTone(field.value, field.tagType)"
|
|
||||||
size="medium"
|
|
||||||
round
|
|
||||||
:title="field.value"
|
|
||||||
>{{ field.value }}</van-tag>
|
|
||||||
<b v-else :class="{ 'is-money': field.money }">{{ field.value }}</b>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@@ -181,15 +141,11 @@
|
|||||||
>{{ block.status }}</van-tag>
|
>{{ block.status }}</van-tag>
|
||||||
</div>
|
</div>
|
||||||
<div class="market-list-card__fields market-list-card__fields--compact">
|
<div class="market-list-card__fields market-list-card__fields--compact">
|
||||||
<div
|
<MarketListField
|
||||||
v-for="field in block.fields"
|
v-for="field in block.fields"
|
||||||
:key="`${block.key}:${field.label}`"
|
:key="`${block.key}:${field.label}`"
|
||||||
class="market-list-card__field"
|
:field="field"
|
||||||
:class="{ 'is-wide': field.wide }"
|
/>
|
||||||
>
|
|
||||||
<span>{{ field.label }}</span>
|
|
||||||
<b>{{ field.value }}</b>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -222,6 +178,7 @@
|
|||||||
import { computed, ref, watch } from 'vue'
|
import { computed, ref, watch } from 'vue'
|
||||||
import { actionLabel, buildMarketCard } from '../list-presenter.js'
|
import { actionLabel, buildMarketCard } from '../list-presenter.js'
|
||||||
import { resolveStatusTone } from '../status-tone.js'
|
import { resolveStatusTone } from '../status-tone.js'
|
||||||
|
import MarketListField from './MarketListField.vue'
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
item: { type: Object, required: true },
|
item: { type: Object, required: true },
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
<template>
|
||||||
|
<div class="market-list-card__field" :class="{ 'is-wide': field.wide }">
|
||||||
|
<span>{{ field.label }}</span>
|
||||||
|
<span class="market-list-card__value">
|
||||||
|
<van-tag
|
||||||
|
v-if="field.tag"
|
||||||
|
class="market-tag"
|
||||||
|
:type="resolveStatusTone(field.value, field.tagType)"
|
||||||
|
size="medium"
|
||||||
|
round
|
||||||
|
:title="field.value"
|
||||||
|
>{{ field.value }}</van-tag>
|
||||||
|
<b v-else :class="{ 'is-money': field.money }">{{ field.value }}</b>
|
||||||
|
<button
|
||||||
|
v-if="field.helpTitle"
|
||||||
|
type="button"
|
||||||
|
class="market-list-card__help"
|
||||||
|
:aria-label="`查看${field.helpTitle}`"
|
||||||
|
:title="field.helpTitle"
|
||||||
|
@click="showHelp"
|
||||||
|
>
|
||||||
|
<van-icon name="question-o" />
|
||||||
|
</button>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
import { showDialog } from 'vant'
|
||||||
|
import { resolveStatusTone } from '../status-tone.js'
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
field: { type: Object, required: true }
|
||||||
|
})
|
||||||
|
|
||||||
|
function showHelp() {
|
||||||
|
showDialog({
|
||||||
|
title: props.field.helpTitle || '作废原因',
|
||||||
|
message: props.field.helpText || '—',
|
||||||
|
messageAlign: 'left',
|
||||||
|
confirmButtonText: '知道了'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -2,6 +2,7 @@ import { formatMoney } from './money.js'
|
|||||||
import {
|
import {
|
||||||
resolveStatusTag,
|
resolveStatusTag,
|
||||||
samplePaymentProgress,
|
samplePaymentProgress,
|
||||||
|
sampleStatus,
|
||||||
payMode,
|
payMode,
|
||||||
protocolStatus,
|
protocolStatus,
|
||||||
donationStatus,
|
donationStatus,
|
||||||
@@ -94,6 +95,30 @@ const personName = (name, id) => {
|
|||||||
: referenceId ? '未知人员' : '—'
|
: referenceId ? '未知人员' : '—'
|
||||||
}
|
}
|
||||||
const field = (labelText, value, options = {}) => ({ label: labelText, value: text(value), ...options })
|
const field = (labelText, value, options = {}) => ({ label: labelText, value: text(value), ...options })
|
||||||
|
|
||||||
|
function sampleVoidReason(item) {
|
||||||
|
if (item && Object.prototype.hasOwnProperty.call(item, 'sampleVoidDesc')) {
|
||||||
|
return String(item.sampleVoidDesc ?? '').trim()
|
||||||
|
}
|
||||||
|
return String(item?.voidDesc ?? '').trim()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 样本编码旁的样本状态;已作废时附带作废原因,供卡片问号展开 */
|
||||||
|
function sampleStatusField(item) {
|
||||||
|
const provided = String(item?.sampleStatusLabel ?? '').trim()
|
||||||
|
const code = String(item?.sampleStatus ?? '').trim()
|
||||||
|
if (!code && !provided) return field('样本状态', '')
|
||||||
|
const resolved = resolveStatusTag(sampleStatus, code)
|
||||||
|
const display = provided || resolved.label
|
||||||
|
const voided = code === 'yzf' || display === '已作废'
|
||||||
|
return field('样本状态', display, {
|
||||||
|
tag: true,
|
||||||
|
tagType: voided ? 'danger' : (code ? resolved.tagType : 'info'),
|
||||||
|
...(voided
|
||||||
|
? { helpTitle: '作废原因', helpText: sampleVoidReason(item) || '—' }
|
||||||
|
: {})
|
||||||
|
})
|
||||||
|
}
|
||||||
export function money(value) {
|
export function money(value) {
|
||||||
return formatMoney(value)
|
return formatMoney(value)
|
||||||
}
|
}
|
||||||
@@ -134,6 +159,7 @@ function protocolCard(item) {
|
|||||||
field('所属项目', item.projectName || item.basic?.projectName || ((item.projectId || item.basic?.projectId) ? '历史项目' : '未归属')),
|
field('所属项目', item.projectName || item.basic?.projectName || ((item.projectId || item.basic?.projectId) ? '历史项目' : '未归属')),
|
||||||
field('项目组', item.teamName || item.basic?.teamName),
|
field('项目组', item.teamName || item.basic?.teamName),
|
||||||
field('样本编码', item.sampleCode || item.labStorageCode),
|
field('样本编码', item.sampleCode || item.labStorageCode),
|
||||||
|
sampleStatusField(item),
|
||||||
field('采集日期', collectDate || item.donationDate),
|
field('采集日期', collectDate || item.donationDate),
|
||||||
field('当月核量号', item.monthlyVerifyNo),
|
field('当月核量号', item.monthlyVerifyNo),
|
||||||
field('实验室流转编号', item.labStorageCode || item.sampleCode),
|
field('实验室流转编号', item.labStorageCode || item.sampleCode),
|
||||||
@@ -172,6 +198,7 @@ function protocolCard(item) {
|
|||||||
field('所属项目', item.projectName || item.basic?.projectName || ((item.projectId || item.basic?.projectId) ? '历史项目' : '未归属')),
|
field('所属项目', item.projectName || item.basic?.projectName || ((item.projectId || item.basic?.projectId) ? '历史项目' : '未归属')),
|
||||||
field('项目组', item.teamName || item.basic?.teamName),
|
field('项目组', item.teamName || item.basic?.teamName),
|
||||||
field('样本编码', item.sampleCode),
|
field('样本编码', item.sampleCode),
|
||||||
|
sampleStatusField(item),
|
||||||
field('登记日期', item.registerDate || item.donationDate),
|
field('登记日期', item.registerDate || item.donationDate),
|
||||||
field('母亲电话', item.motherPhone),
|
field('母亲电话', item.motherPhone),
|
||||||
field('母亲身份证号', item.motherIdCard),
|
field('母亲身份证号', item.motherIdCard),
|
||||||
@@ -212,6 +239,7 @@ function chaseCard(item) {
|
|||||||
field('客户', item.motherName),
|
field('客户', item.motherName),
|
||||||
field('联系电话', item.motherPhone),
|
field('联系电话', item.motherPhone),
|
||||||
field('样本编码', item.sampleCode),
|
field('样本编码', item.sampleCode),
|
||||||
|
sampleStatusField(item),
|
||||||
field('市场专员', personName(item.salesUserName, item.salesUserId)),
|
field('市场专员', personName(item.salesUserName, item.salesUserId)),
|
||||||
field('缴费方式', mode.label, { tag: true, tagType: mode.tagType }),
|
field('缴费方式', mode.label, { tag: true, tagType: mode.tagType }),
|
||||||
field('期次', `第 ${text(item.scheduleNo, '1')} 期`),
|
field('期次', `第 ${text(item.scheduleNo, '1')} 期`),
|
||||||
@@ -281,7 +309,7 @@ function paymentCard(item) {
|
|||||||
statusTone: progress.tagType,
|
statusTone: progress.tagType,
|
||||||
fields: [
|
fields: [
|
||||||
field('姓名', item.motherName), field('手机号', item.motherPhone),
|
field('姓名', item.motherName), field('手机号', item.motherPhone),
|
||||||
field('样本编码', item.sampleCode), field('签署日期', item.signDate),
|
field('样本编码', item.sampleCode), sampleStatusField(item), field('签署日期', item.signDate),
|
||||||
field('存储项目', item.sampleTypeName), field('合同总额', money(item.contractAmount), { money: true }),
|
field('存储项目', item.sampleTypeName), field('合同总额', money(item.contractAmount), { money: true }),
|
||||||
field('缴费方式', mode.label, { tag: true, tagType: mode.tagType }),
|
field('缴费方式', mode.label, { tag: true, tagType: mode.tagType }),
|
||||||
field('应收总额', money(item.receivableAmount), { money: true })
|
field('应收总额', money(item.receivableAmount), { money: true })
|
||||||
@@ -311,6 +339,7 @@ function freightSampleBlock(row, index) {
|
|||||||
field('母亲姓名', row?.motherName),
|
field('母亲姓名', row?.motherName),
|
||||||
field('子女姓名', row?.newbornName),
|
field('子女姓名', row?.newbornName),
|
||||||
field('样本编码', row?.sampleCode, { wide: true }),
|
field('样本编码', row?.sampleCode, { wide: true }),
|
||||||
|
sampleStatusField(row),
|
||||||
field('样本类型', row?.sampleTypeName, { wide: true })
|
field('样本类型', row?.sampleTypeName, { wide: true })
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ test('research donation protocol card matches excel-parity field set', () => {
|
|||||||
const labels = card.fields.map((f) => f.label)
|
const labels = card.fields.map((f) => f.label)
|
||||||
assert.equal(labels[2], '样本编码')
|
assert.equal(labels[2], '样本编码')
|
||||||
for (const label of [
|
for (const label of [
|
||||||
'样本编码', '当月核量号', '实验室流转编号', '废弃原因', '样本类型',
|
'样本编码', '样本状态', '当月核量号', '实验室流转编号', '废弃原因', '样本类型',
|
||||||
'采集地区', '采集医院', '分娩时间', '采集时间', '市场专员', '地区经理',
|
'采集地区', '采集医院', '分娩时间', '采集时间', '市场专员', '地区经理',
|
||||||
'运输方式', '新生儿性别', '新生儿体重', '分娩方式', '胎次', '母血采集时间',
|
'运输方式', '新生儿性别', '新生儿体重', '分娩方式', '胎次', '母血采集时间',
|
||||||
'知情同意书', '传染病检测报告', '协议书', '备注'
|
'知情同意书', '传染病检测报告', '协议书', '备注'
|
||||||
@@ -245,11 +245,70 @@ test('freight card shows the scope-safe visible count and collapsible sample blo
|
|||||||
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '母亲姓名').value, '周雨桐')
|
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '母亲姓名').value, '周雨桐')
|
||||||
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '子女姓名').value, '宝宝乙')
|
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '子女姓名').value, '宝宝乙')
|
||||||
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '样本编码').value, 'S-2')
|
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '样本编码').value, 'S-2')
|
||||||
|
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '样本状态').value, '—')
|
||||||
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '样本类型').value, '脐带')
|
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '样本类型').value, '脐带')
|
||||||
assert.ok(manager.fields.some((field) => field.label === '更新时间' && field.value === '2026-10-13 10:00:00'))
|
assert.ok(manager.fields.some((field) => field.label === '更新时间' && field.value === '2026-10-13 10:00:00'))
|
||||||
assert.ok(manager.fields.some((field) => field.label === '备注' && field.value === '同批送达'))
|
assert.ok(manager.fields.some((field) => field.label === '备注' && field.value === '同批送达'))
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test('sample-coded list cards show sample status and a void reason affordance', () => {
|
||||||
|
const cases = [
|
||||||
|
['protocol', { source: 'cell_storage', sampleCode: 'S-1', sampleStatus: 'yrk', sampleStatusLabel: '已入库' }],
|
||||||
|
['payment-chase', { sampleCode: 'S-1', sampleStatus: 'jcz' }],
|
||||||
|
['payment', { sampleCode: 'S-1', motherName: '周雨桐', sampleStatus: 'ycj', sampleStatusLabel: '已采集' }]
|
||||||
|
]
|
||||||
|
for (const [module, item] of cases) {
|
||||||
|
const card = buildMarketCard(module, 'specialist', item)
|
||||||
|
const status = card.fields.find((field) => field.label === '样本状态')
|
||||||
|
assert.ok(status, module)
|
||||||
|
assert.equal(status.tag, true)
|
||||||
|
assert.equal(status.helpTitle, undefined)
|
||||||
|
}
|
||||||
|
assert.equal(
|
||||||
|
buildMarketCard('protocol', 'specialist', {
|
||||||
|
source: 'cell_storage', sampleCode: 'S-1', sampleStatus: 'yrk', sampleStatusLabel: '已入库'
|
||||||
|
}).fields.find((field) => field.label === '样本状态').value,
|
||||||
|
'已入库'
|
||||||
|
)
|
||||||
|
const detecting = buildMarketCard('payment-chase', 'specialist', {
|
||||||
|
sampleCode: 'S-1', sampleStatus: 'jcz'
|
||||||
|
}).fields.find((field) => field.label === '样本状态')
|
||||||
|
assert.equal(detecting.value, '检测中')
|
||||||
|
assert.equal(detecting.helpTitle, undefined)
|
||||||
|
assert.equal(detecting.helpText, undefined)
|
||||||
|
|
||||||
|
const voided = buildMarketCard('payment', 'specialist', {
|
||||||
|
motherName: '作废客户',
|
||||||
|
sampleCode: 'S-VOID',
|
||||||
|
sampleStatus: 'yzf',
|
||||||
|
voidDesc: '客户放弃存储'
|
||||||
|
})
|
||||||
|
const voidField = voided.fields.find((field) => field.label === '样本状态')
|
||||||
|
assert.equal(voidField.value, '已作废')
|
||||||
|
assert.equal(voidField.tagType, 'danger')
|
||||||
|
assert.equal(voidField.helpTitle, '作废原因')
|
||||||
|
assert.equal(voidField.helpText, '客户放弃存储')
|
||||||
|
|
||||||
|
const donation = buildMarketCard('protocol', 'specialist', {
|
||||||
|
source: 'research_donation',
|
||||||
|
sampleCode: 'S-D',
|
||||||
|
sampleStatus: 'yzf',
|
||||||
|
sampleStatusLabel: '已作废',
|
||||||
|
voidDesc: '协议级废弃说明',
|
||||||
|
sampleVoidDesc: '样本溶血'
|
||||||
|
})
|
||||||
|
assert.equal(donation.fields.find((field) => field.label === '废弃原因').value, '协议级废弃说明')
|
||||||
|
assert.equal(donation.fields.find((field) => field.label === '样本状态').helpText, '样本溶血')
|
||||||
|
|
||||||
|
const freight = buildMarketCard('freight', 'manager', {
|
||||||
|
freightNo: 'YF-VOID',
|
||||||
|
items: [{ sampleCode: 'S-V', sampleStatus: 'yzf', voidDesc: '运输破损' }]
|
||||||
|
})
|
||||||
|
const sampleStatus = freight.sampleBlocks[0].fields.find((field) => field.label === '样本状态')
|
||||||
|
assert.equal(sampleStatus.value, '已作废')
|
||||||
|
assert.equal(sampleStatus.helpText, '运输破损')
|
||||||
|
})
|
||||||
|
|
||||||
test('action labels cover module-specific operations', () => {
|
test('action labels cover module-specific operations', () => {
|
||||||
assert.equal(actionLabel('link'), '关联样本')
|
assert.equal(actionLabel('link'), '关联样本')
|
||||||
assert.equal(actionLabel('unlink'), '取消样本关联')
|
assert.equal(actionLabel('unlink'), '取消样本关联')
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ test('market list visual contract keeps search white, tags filled and actions ri
|
|||||||
'./components/MarketDetailSection.vue',
|
'./components/MarketDetailSection.vue',
|
||||||
'./components/MarketDetailNestedCard.vue',
|
'./components/MarketDetailNestedCard.vue',
|
||||||
'./components/MarketListCard.vue',
|
'./components/MarketListCard.vue',
|
||||||
|
'./components/MarketListField.vue',
|
||||||
'./components/PresignOrderCard.vue',
|
'./components/PresignOrderCard.vue',
|
||||||
'./components/PresignTransferCard.vue',
|
'./components/PresignTransferCard.vue',
|
||||||
'./components/ProtocolSamplePaymentPanel.vue',
|
'./components/ProtocolSamplePaymentPanel.vue',
|
||||||
@@ -541,6 +542,16 @@ test('payment detail hosts PaymentDetailTransfersPanel and hides transfer bottom
|
|||||||
assert.match(panel, /应缴批次/)
|
assert.match(panel, /应缴批次/)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test('voided sample status uses a question icon and vant dialog', () => {
|
||||||
|
const field = source('./components/MarketListField.vue')
|
||||||
|
const card = source('./components/MarketListCard.vue')
|
||||||
|
assert.match(field, /name="question-o"/)
|
||||||
|
assert.match(field, /showDialog/)
|
||||||
|
assert.match(field, /field\.helpTitle/)
|
||||||
|
assert.match(field, /class="market-tag"/)
|
||||||
|
assert.match(card, /MarketListField/)
|
||||||
|
})
|
||||||
|
|
||||||
test('payment cards reproduce the Web Excel columns and operation labels', () => {
|
test('payment cards reproduce the Web Excel columns and operation labels', () => {
|
||||||
const presenter = source('./list-presenter.js')
|
const presenter = source('./list-presenter.js')
|
||||||
const card = source('./components/MarketListCard.vue')
|
const card = source('./components/MarketListCard.vue')
|
||||||
@@ -590,7 +601,7 @@ test('protocol cards expose the same business fields as the web list', async ()
|
|||||||
})
|
})
|
||||||
|
|
||||||
assert.deepEqual(card.fields.map((field) => field.label), [
|
assert.deepEqual(card.fields.map((field) => field.label), [
|
||||||
'所属项目', '项目组', '样本编码', '登记日期', '母亲电话', '母亲身份证号', '父亲姓名',
|
'所属项目', '项目组', '样本编码', '样本状态', '登记日期', '母亲电话', '母亲身份证号', '父亲姓名',
|
||||||
'新生儿性别', '分娩方式', '新生儿体重(克)', '采集地区', '采集医院',
|
'新生儿性别', '分娩方式', '新生儿体重(克)', '采集地区', '采集医院',
|
||||||
'市场专员', '样本采集时间', '创建时间'
|
'市场专员', '样本采集时间', '创建时间'
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -106,6 +106,14 @@ export const receptionSource = createRegistry({
|
|||||||
basic_experiment: { label: '基础实验', tagType: 'primary' }
|
basic_experiment: { label: '基础实验', tagType: 'primary' }
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** 协议/捐赠样本状态;与 Web sampleStatus 保持一致 */
|
||||||
|
export const sampleStatus = createRegistry({
|
||||||
|
ycj: { label: '已采集', tagType: 'primary' },
|
||||||
|
jcz: { label: '检测中', tagType: 'warning' },
|
||||||
|
yrk: { label: '已入库', tagType: 'success' },
|
||||||
|
yzf: { label: '已作废', tagType: 'danger' }
|
||||||
|
})
|
||||||
|
|
||||||
export const presignOrderStatus = createRegistry({
|
export const presignOrderStatus = createRegistry({
|
||||||
draft: { label: '草稿', tagType: 'info' },
|
draft: { label: '草稿', tagType: 'info' },
|
||||||
active: { label: '进行中', tagType: 'warning' },
|
active: { label: '进行中', tagType: 'warning' },
|
||||||
|
|||||||
@@ -8,10 +8,19 @@ import {
|
|||||||
payMode,
|
payMode,
|
||||||
presignOrderStatus,
|
presignOrderStatus,
|
||||||
receptionSource,
|
receptionSource,
|
||||||
|
sampleStatus,
|
||||||
transportType,
|
transportType,
|
||||||
auditStatus
|
auditStatus
|
||||||
} from './status-tag-registry.js'
|
} from './status-tag-registry.js'
|
||||||
|
|
||||||
|
test('sample status yzf is 已作废/danger', () => {
|
||||||
|
assert.deepEqual(resolveStatusTag(sampleStatus, 'yzf'), {
|
||||||
|
label: '已作废',
|
||||||
|
tagType: 'danger'
|
||||||
|
})
|
||||||
|
assert.equal(resolveStatusTag(sampleStatus, 'yrk').label, '已入库')
|
||||||
|
})
|
||||||
|
|
||||||
test('sample progress dfj is 待缴费/info not 待缴清', () => {
|
test('sample progress dfj is 待缴费/info not 待缴清', () => {
|
||||||
assert.deepEqual(resolveStatusTag(samplePaymentProgress, 'dfj'), {
|
assert.deepEqual(resolveStatusTag(samplePaymentProgress, 'dfj'), {
|
||||||
label: '待缴费',
|
label: '待缴费',
|
||||||
|
|||||||
@@ -216,7 +216,8 @@ async function ensureUserCache() {
|
|||||||
if (userCachePromise) return userCachePromise
|
if (userCachePromise) return userCachePromise
|
||||||
userCachePromise = (async () => {
|
userCachePromise = (async () => {
|
||||||
try {
|
try {
|
||||||
const res = await fetchUserOptions()
|
// 同部门优先:由后端按当前登录用户部门排序
|
||||||
|
const res = await fetchUserOptions({ prioritizeCallerDept: true })
|
||||||
const list = Array.isArray(res) ? res : res?.list || []
|
const list = Array.isArray(res) ? res : res?.list || []
|
||||||
const next = []
|
const next = []
|
||||||
const seen = new Set()
|
const seen = new Set()
|
||||||
|
|||||||
@@ -631,6 +631,29 @@ body.van-toast--unclickable .presign-order-page * {
|
|||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.market-list-card__value {
|
||||||
|
display: flex;
|
||||||
|
min-width: 0;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.market-list-card__help {
|
||||||
|
display: inline-flex;
|
||||||
|
width: 44px;
|
||||||
|
height: 44px;
|
||||||
|
flex: 0 0 44px;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
margin: -10px -8px -10px -4px;
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
background: transparent;
|
||||||
|
color: var(--market-primary-dark, #087f57);
|
||||||
|
font-size: 18px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
.market-list-card__samples {
|
.market-list-card__samples {
|
||||||
margin: 0 0 12px;
|
margin: 0 0 12px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|||||||
@@ -22,9 +22,12 @@ export function fetchGetRoleList() {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 流程设计器:用户下拉选项(label=昵称,value=用户ID) */
|
/** 用户下拉选项(label=昵称,value=用户ID;可选 deptId / prioritizeCallerDept) */
|
||||||
export function fetchUserOptions(params?: { roleName?: string }) {
|
export function fetchUserOptions(params?: {
|
||||||
return request.get<Array<{ label: string; value: string }>>({
|
roleName?: string
|
||||||
|
prioritizeCallerDept?: boolean
|
||||||
|
}) {
|
||||||
|
return request.get<Array<{ label: string; value: string; deptId?: string }>>({
|
||||||
url: '/web/admin/users/options',
|
url: '/web/admin/users/options',
|
||||||
params
|
params
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import request from '@/utils/http'
|
||||||
|
|
||||||
|
export type SampleVoidTarget = {
|
||||||
|
receptionSource: 'cell_storage' | 'research_donation'
|
||||||
|
sampleId?: string
|
||||||
|
sampleCode?: string
|
||||||
|
/** 仅弹窗展示,不参与作废请求 */
|
||||||
|
labStorageCode?: string
|
||||||
|
protocolId?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export type VoidBusinessSamplePayload = SampleVoidTarget & {
|
||||||
|
voidDesc: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export type VoidBusinessSampleResult = {
|
||||||
|
id: string
|
||||||
|
sampleCode: string
|
||||||
|
sampleStatus: string
|
||||||
|
voidDate: string
|
||||||
|
voidDesc: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fetchVoidBusinessSample(data: VoidBusinessSamplePayload) {
|
||||||
|
return request.put<VoidBusinessSampleResult>({
|
||||||
|
url: '/web/admin/business-samples/void',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -17,6 +17,10 @@ export interface ProductionWorkOrderItem {
|
|||||||
workOrderType?: string
|
workOrderType?: string
|
||||||
protocolNo?: string
|
protocolNo?: string
|
||||||
sampleCode?: string
|
sampleCode?: string
|
||||||
|
sampleStatus?: string
|
||||||
|
voidDesc?: string
|
||||||
|
protocolSampleId?: string
|
||||||
|
collectionProtocolId?: string
|
||||||
receptionSource?: string
|
receptionSource?: string
|
||||||
receptionSourceLabel?: string
|
receptionSourceLabel?: string
|
||||||
sampleTypeName?: string
|
sampleTypeName?: string
|
||||||
|
|||||||
@@ -100,6 +100,8 @@ export type QcWorkOrder = {
|
|||||||
collectionProtocolId: string
|
collectionProtocolId: string
|
||||||
protocolNo: string
|
protocolNo: string
|
||||||
sampleCode: string
|
sampleCode: string
|
||||||
|
sampleStatus?: string
|
||||||
|
voidDesc?: string
|
||||||
labStorageCode?: string
|
labStorageCode?: string
|
||||||
receptionSource?: string
|
receptionSource?: string
|
||||||
receptionSourceLabel?: string
|
receptionSourceLabel?: string
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ export type SampleFreightItem = {
|
|||||||
sampleId: string
|
sampleId: string
|
||||||
protocolId?: string
|
protocolId?: string
|
||||||
sampleCode?: string
|
sampleCode?: string
|
||||||
|
sampleStatus?: string
|
||||||
|
voidDesc?: string
|
||||||
protocolNo?: string
|
protocolNo?: string
|
||||||
sampleTypeName?: string
|
sampleTypeName?: string
|
||||||
motherName?: string
|
motherName?: string
|
||||||
|
|||||||
@@ -0,0 +1,71 @@
|
|||||||
|
<!-- 样本状态:标签;仅已作废时展示问号与作废原因 -->
|
||||||
|
<template>
|
||||||
|
<span class="sample-status-tag">
|
||||||
|
<el-tag :type="tagType" size="small">{{ label }}</el-tag>
|
||||||
|
<el-popover v-if="voided" placement="top" trigger="click" :width="240">
|
||||||
|
<template #reference>
|
||||||
|
<button type="button" class="sample-status-tag__q" aria-label="作废原因" @click.stop>
|
||||||
|
<el-icon><QuestionFilled /></el-icon>
|
||||||
|
</button>
|
||||||
|
</template>
|
||||||
|
<div class="sample-status-tag__reason">
|
||||||
|
<div class="sample-status-tag__reason-title">作废原因</div>
|
||||||
|
<div>{{ reasonText }}</div>
|
||||||
|
</div>
|
||||||
|
</el-popover>
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed } from 'vue'
|
||||||
|
import { QuestionFilled } from '@element-plus/icons-vue'
|
||||||
|
import { sampleStatusLabel, sampleStatusTagType } from '@/utils/status-tag-registry'
|
||||||
|
|
||||||
|
defineOptions({ name: 'SampleStatusTag' })
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
status?: string | null
|
||||||
|
voidDesc?: string | null
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const code = computed(() => String(props.status || '').trim())
|
||||||
|
const label = computed(() => (code.value ? sampleStatusLabel(code.value) : '—'))
|
||||||
|
const tagType = computed(() => (code.value ? sampleStatusTagType(code.value) : 'info'))
|
||||||
|
/** 问号仅已作废(yzf)展示 */
|
||||||
|
const voided = computed(() => code.value === 'yzf')
|
||||||
|
const reasonText = computed(() => String(props.voidDesc || '').trim() || '暂无作废原因')
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
.sample-status-tag {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 4px;
|
||||||
|
max-width: 100%;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sample-status-tag__q {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 0;
|
||||||
|
border: none;
|
||||||
|
background: transparent;
|
||||||
|
color: var(--mint-text-muted, #64748b);
|
||||||
|
cursor: pointer;
|
||||||
|
line-height: 1;
|
||||||
|
font-size: 14px;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
color: #059669;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.sample-status-tag__reason-title {
|
||||||
|
margin-bottom: 4px;
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--mint-text-muted, #64748b);
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,145 @@
|
|||||||
|
<!-- 样本废弃:填写作废原因后提交 -->
|
||||||
|
<template>
|
||||||
|
<el-dialog
|
||||||
|
v-model="dialogVisible"
|
||||||
|
title="样本废弃"
|
||||||
|
width="560px"
|
||||||
|
class="dialog-form-layout"
|
||||||
|
align-center
|
||||||
|
append-to-body
|
||||||
|
modal-class="protocol-dialog-mask"
|
||||||
|
destroy-on-close
|
||||||
|
:close-on-click-modal="false"
|
||||||
|
@close="handleClose"
|
||||||
|
>
|
||||||
|
<el-form
|
||||||
|
ref="formRef"
|
||||||
|
:model="form"
|
||||||
|
:rules="rules"
|
||||||
|
label-position="top"
|
||||||
|
class="biz-dialog-form"
|
||||||
|
>
|
||||||
|
<div class="form-grid-2">
|
||||||
|
<el-form-item label="实验室入库编码" class="form-col-span-2">
|
||||||
|
<span class="sample-void-dialog__code">{{ labStorageCodeDisplay }}</span>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="sampleCode" label="样本编码" class="form-col-span-2">
|
||||||
|
<span class="sample-void-dialog__code">{{ sampleCode }}</span>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="作废原因" prop="voidDesc" class="form-col-span-2">
|
||||||
|
<el-input
|
||||||
|
v-model="form.voidDesc"
|
||||||
|
type="textarea"
|
||||||
|
:rows="4"
|
||||||
|
maxlength="512"
|
||||||
|
show-word-limit
|
||||||
|
placeholder="请填写作废原因"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</div>
|
||||||
|
</el-form>
|
||||||
|
<template #footer>
|
||||||
|
<el-button class="btn-ghost" @click="handleClose">
|
||||||
|
<el-icon><Close /></el-icon>取消
|
||||||
|
</el-button>
|
||||||
|
<el-button class="btn-main" type="primary" :loading="submitting" @click="handleSubmit">
|
||||||
|
<el-icon><Check /></el-icon>确定
|
||||||
|
</el-button>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, reactive, ref, watch } from 'vue'
|
||||||
|
import { Check, Close } from '@element-plus/icons-vue'
|
||||||
|
import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
|
||||||
|
import { fetchVoidBusinessSample, type SampleVoidTarget } from '@/api/business-sample'
|
||||||
|
|
||||||
|
defineOptions({ name: 'SampleVoidDialog' })
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
visible: boolean
|
||||||
|
target: SampleVoidTarget | null
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
'update:visible': [visible: boolean]
|
||||||
|
success: []
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const dialogVisible = ref(false)
|
||||||
|
const submitting = ref(false)
|
||||||
|
const formRef = ref<FormInstance>()
|
||||||
|
const form = reactive({
|
||||||
|
voidDesc: ''
|
||||||
|
})
|
||||||
|
|
||||||
|
const rules: FormRules = {
|
||||||
|
voidDesc: [
|
||||||
|
{
|
||||||
|
required: true,
|
||||||
|
validator: (_rule, value, callback) => {
|
||||||
|
if (!String(value || '').trim()) callback(new Error('请填写作废原因'))
|
||||||
|
else callback()
|
||||||
|
},
|
||||||
|
trigger: 'blur'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
const labStorageCodeDisplay = computed(
|
||||||
|
() => String(props.target?.labStorageCode || '').trim() || '—'
|
||||||
|
)
|
||||||
|
const sampleCode = computed(() => String(props.target?.sampleCode || '').trim())
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => props.visible,
|
||||||
|
(visible) => {
|
||||||
|
dialogVisible.value = visible
|
||||||
|
if (visible) form.voidDesc = ''
|
||||||
|
},
|
||||||
|
{ immediate: true }
|
||||||
|
)
|
||||||
|
|
||||||
|
watch(dialogVisible, (visible) => {
|
||||||
|
emit('update:visible', visible)
|
||||||
|
})
|
||||||
|
|
||||||
|
function handleClose() {
|
||||||
|
dialogVisible.value = false
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleSubmit() {
|
||||||
|
const target = props.target
|
||||||
|
if (!target?.receptionSource || (!target.sampleId && !target.sampleCode)) {
|
||||||
|
ElMessage.warning('缺少样本信息,无法废弃')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const valid = await formRef.value?.validate().catch(() => false)
|
||||||
|
if (!valid) return
|
||||||
|
submitting.value = true
|
||||||
|
try {
|
||||||
|
await fetchVoidBusinessSample({
|
||||||
|
receptionSource: target.receptionSource,
|
||||||
|
sampleId: target.sampleId,
|
||||||
|
sampleCode: target.sampleCode,
|
||||||
|
protocolId: target.protocolId,
|
||||||
|
voidDesc: form.voidDesc.trim()
|
||||||
|
})
|
||||||
|
ElMessage.success('样本已废弃')
|
||||||
|
emit('success')
|
||||||
|
handleClose()
|
||||||
|
} finally {
|
||||||
|
submitting.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
.sample-void-dialog__code {
|
||||||
|
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #1e293b;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -255,7 +255,8 @@
|
|||||||
if (userCachePromise) return userCachePromise
|
if (userCachePromise) return userCachePromise
|
||||||
userCachePromise = (async () => {
|
userCachePromise = (async () => {
|
||||||
try {
|
try {
|
||||||
const res = await fetchUserOptions()
|
// 同部门优先:由后端按当前登录用户部门排序
|
||||||
|
const res = await fetchUserOptions({ prioritizeCallerDept: true })
|
||||||
const list = Array.isArray(res) ? res : []
|
const list = Array.isArray(res) ? res : []
|
||||||
const next: MentionUser[] = []
|
const next: MentionUser[] = []
|
||||||
const seen = new Set<string>()
|
const seen = new Set<string>()
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ export const LAB_PROCESS_TABS: Array<{
|
|||||||
|
|
||||||
const CELL_HSC_COLUMNS: LabColumn[] = [
|
const CELL_HSC_COLUMNS: LabColumn[] = [
|
||||||
{ prop: 'cellCode', label: '细胞编码', minWidth: 140 },
|
{ prop: 'cellCode', label: '细胞编码', minWidth: 140 },
|
||||||
|
{ prop: 'sampleStatus', label: '样本状态', minWidth: 140 },
|
||||||
{ prop: 'motherName', label: '准妈妈姓名', minWidth: 110 },
|
{ prop: 'motherName', label: '准妈妈姓名', minWidth: 110 },
|
||||||
{ prop: 'collectionTime', label: '采集时间', minWidth: 200 },
|
{ prop: 'collectionTime', label: '采集时间', minWidth: 200 },
|
||||||
{ prop: 'hospitalName', label: '采集医院', minWidth: 140 },
|
{ prop: 'hospitalName', label: '采集医院', minWidth: 140 },
|
||||||
@@ -72,6 +73,7 @@ const CELL_HSC_COLUMNS: LabColumn[] = [
|
|||||||
|
|
||||||
const DONATION_HSC_COLUMNS: LabColumn[] = [
|
const DONATION_HSC_COLUMNS: LabColumn[] = [
|
||||||
{ prop: 'cellCode', label: '细胞编码', minWidth: 140 },
|
{ prop: 'cellCode', label: '细胞编码', minWidth: 140 },
|
||||||
|
{ prop: 'sampleStatus', label: '样本状态', minWidth: 140 },
|
||||||
{ prop: 'motherName', label: '准妈妈姓名', minWidth: 110 },
|
{ prop: 'motherName', label: '准妈妈姓名', minWidth: 110 },
|
||||||
{ prop: 'labMaterialCode', label: '实验室物料编码', minWidth: 130 },
|
{ prop: 'labMaterialCode', label: '实验室物料编码', minWidth: 130 },
|
||||||
{ prop: 'inboundCode', label: '入库编码', minWidth: 140 },
|
{ prop: 'inboundCode', label: '入库编码', minWidth: 140 },
|
||||||
@@ -98,6 +100,7 @@ const DONATION_HSC_COLUMNS: LabColumn[] = [
|
|||||||
|
|
||||||
const MSC_COLUMNS: LabColumn[] = [
|
const MSC_COLUMNS: LabColumn[] = [
|
||||||
{ prop: 'labFlowCode', label: '实验室流转编码', minWidth: 140 },
|
{ prop: 'labFlowCode', label: '实验室流转编码', minWidth: 140 },
|
||||||
|
{ prop: 'sampleStatus', label: '样本状态', minWidth: 140 },
|
||||||
{ prop: 'motherName', label: '母亲姓名', minWidth: 110 },
|
{ prop: 'motherName', label: '母亲姓名', minWidth: 110 },
|
||||||
{ prop: 'cordCollectTime', label: '脐带采集时间', minWidth: 200 },
|
{ prop: 'cordCollectTime', label: '脐带采集时间', minWidth: 200 },
|
||||||
{ prop: 'transportTempC', label: '运输温度/℃', minWidth: 110 },
|
{ prop: 'transportTempC', label: '运输温度/℃', minWidth: 110 },
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import type { ProductionWorkOrderTabKey } from '@/utils/production-work-order-ta
|
|||||||
import { resolveTabKeyFromWorkOrder } from '@/utils/production-work-order-tabs'
|
import { resolveTabKeyFromWorkOrder } from '@/utils/production-work-order-tabs'
|
||||||
import { formatMoneyDisplay } from '@/utils/money-format'
|
import { formatMoneyDisplay } from '@/utils/money-format'
|
||||||
|
|
||||||
export type CardMetaFieldKind = 'text' | 'tag'
|
export type CardMetaFieldKind = 'text' | 'tag' | 'sample-status'
|
||||||
|
|
||||||
export type CardMetaField = {
|
export type CardMetaField = {
|
||||||
label: string
|
label: string
|
||||||
@@ -84,6 +84,11 @@ function buildInboundMetaFields(tabKey: ProductionWorkOrderTabKey): CardMetaFiel
|
|||||||
return [
|
return [
|
||||||
{ label: '实验室入库编码', getValue: (row) => row.labStorageCode || '—' },
|
{ label: '实验室入库编码', getValue: (row) => row.labStorageCode || '—' },
|
||||||
{ label: '样本类型', getValue: (row) => row.sampleTypeName || '—' },
|
{ label: '样本类型', getValue: (row) => row.sampleTypeName || '—' },
|
||||||
|
{
|
||||||
|
label: '样本状态',
|
||||||
|
kind: 'sample-status',
|
||||||
|
getValue: (row) => String(row.sampleStatus || '')
|
||||||
|
},
|
||||||
{ label: '接收经手人', getValue: (row) => row.handlerName || '—' },
|
{ label: '接收经手人', getValue: (row) => row.handlerName || '—' },
|
||||||
{ label: '接收时间', getValue: (row) => formatDisplayOrDash(row.receptionTime) },
|
{ label: '接收时间', getValue: (row) => formatDisplayOrDash(row.receptionTime) },
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -63,6 +63,19 @@ describe('flattenProtocolAuditRows', () => {
|
|||||||
assert.equal(rows[0].sampleCode, 'ZKZX34000199')
|
assert.equal(rows[0].sampleCode, 'ZKZX34000199')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('passes sample status and sample void reason from sample items', () => {
|
||||||
|
const rows = flattenProtocolAuditRows([
|
||||||
|
{
|
||||||
|
id: 'p-status',
|
||||||
|
voidDesc: '协议作废',
|
||||||
|
sampleItems: [{ sampleCode: 'S-VOID', sampleStatus: 'yzf', voidDesc: '样本破损' }]
|
||||||
|
}
|
||||||
|
])
|
||||||
|
assert.equal(rows[0].voidDesc, '协议作废')
|
||||||
|
assert.equal(rows[0].sampleStatus, 'yzf')
|
||||||
|
assert.equal(rows[0].sampleVoidDesc, '样本破损')
|
||||||
|
})
|
||||||
|
|
||||||
it('zero samples → one placeholder row, not co-stored', () => {
|
it('zero samples → one placeholder row, not co-stored', () => {
|
||||||
const rows = flattenProtocolAuditRows([{ id: 'p2', protocolNo: 'ZKZX2', sampleItems: [] }])
|
const rows = flattenProtocolAuditRows([{ id: 'p2', protocolNo: 'ZKZX2', sampleItems: [] }])
|
||||||
assert.equal(rows.length, 1)
|
assert.equal(rows.length, 1)
|
||||||
|
|||||||
@@ -34,6 +34,9 @@ export type ProtocolAuditFlatRow = {
|
|||||||
regionManagerUserName: string
|
regionManagerUserName: string
|
||||||
sampleTypeName: string
|
sampleTypeName: string
|
||||||
sampleCode: string
|
sampleCode: string
|
||||||
|
sampleStatus: string
|
||||||
|
/** 样本作废原因;协议作废原因仍用 voidDesc */
|
||||||
|
sampleVoidDesc: string
|
||||||
labStorageCode: string
|
labStorageCode: string
|
||||||
transportType: string
|
transportType: string
|
||||||
transportLabel: string
|
transportLabel: string
|
||||||
@@ -120,6 +123,8 @@ export function flattenProtocolAuditRows(
|
|||||||
regionManagerUserName: str(protocol.regionManagerUserName),
|
regionManagerUserName: str(protocol.regionManagerUserName),
|
||||||
sampleTypeName: str(rec.sampleTypeName),
|
sampleTypeName: str(rec.sampleTypeName),
|
||||||
sampleCode: str(rec.sampleCode),
|
sampleCode: str(rec.sampleCode),
|
||||||
|
sampleStatus: str(rec.sampleStatus),
|
||||||
|
sampleVoidDesc: str(rec.voidDesc),
|
||||||
labStorageCode: str(rec.labStorageCode),
|
labStorageCode: str(rec.labStorageCode),
|
||||||
transportType,
|
transportType,
|
||||||
transportLabel: '',
|
transportLabel: '',
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import {
|
|||||||
type QcWorkOrderProtocolGroupModel
|
type QcWorkOrderProtocolGroupModel
|
||||||
} from '@/utils/qc-work-order-groups'
|
} from '@/utils/qc-work-order-groups'
|
||||||
|
|
||||||
export type CardMetaFieldKind = 'text' | 'tag'
|
export type CardMetaFieldKind = 'text' | 'tag' | 'sample-status'
|
||||||
|
|
||||||
export type CardMetaField = {
|
export type CardMetaField = {
|
||||||
label: string
|
label: string
|
||||||
@@ -134,6 +134,12 @@ const inboundGroupedFields: CardMetaField[] = [
|
|||||||
visible: (row) => (row.triggerSource || 'reception') === 'production'
|
visible: (row) => (row.triggerSource || 'reception') === 'production'
|
||||||
},
|
},
|
||||||
{ label: '样本编码', getValue: (row) => row.sampleCode || '—', visible: isInboundUserInfoRow },
|
{ label: '样本编码', getValue: (row) => row.sampleCode || '—', visible: isInboundUserInfoRow },
|
||||||
|
{
|
||||||
|
label: '样本状态',
|
||||||
|
kind: 'sample-status',
|
||||||
|
getValue: (row) => String(row.sampleStatus || ''),
|
||||||
|
visible: isInboundUserInfoRow
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '样本类型',
|
label: '样本类型',
|
||||||
getValue: (row) => row.sampleTypeName || '—',
|
getValue: (row) => row.sampleTypeName || '—',
|
||||||
|
|||||||
@@ -21,6 +21,8 @@ export type SampleFreightFlatRow = {
|
|||||||
motherName?: string
|
motherName?: string
|
||||||
newbornName?: string
|
newbornName?: string
|
||||||
sampleCode?: string
|
sampleCode?: string
|
||||||
|
sampleStatus?: string
|
||||||
|
voidDesc?: string
|
||||||
sampleTypeName?: string
|
sampleTypeName?: string
|
||||||
sampleId?: string
|
sampleId?: string
|
||||||
protocolId?: string
|
protocolId?: string
|
||||||
@@ -53,6 +55,8 @@ export function flattenSampleFreights(list: SampleFreight[]): SampleFreightFlatR
|
|||||||
motherName: it?.motherName,
|
motherName: it?.motherName,
|
||||||
newbornName: it?.newbornName,
|
newbornName: it?.newbornName,
|
||||||
sampleCode: it?.sampleCode,
|
sampleCode: it?.sampleCode,
|
||||||
|
sampleStatus: it?.sampleStatus,
|
||||||
|
voidDesc: it?.voidDesc,
|
||||||
sampleTypeName: it?.sampleTypeName,
|
sampleTypeName: it?.sampleTypeName,
|
||||||
sampleId: it?.sampleId,
|
sampleId: it?.sampleId,
|
||||||
protocolId: it?.protocolId,
|
protocolId: it?.protocolId,
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
import { describe, it } from 'node:test'
|
||||||
|
import assert from 'node:assert/strict'
|
||||||
|
import { isSampleAlreadyVoided, resolveSampleVoidTarget } from './sample-void'
|
||||||
|
|
||||||
|
describe('resolveSampleVoidTarget', () => {
|
||||||
|
it('uses protocol sample id, code and protocol id', () => {
|
||||||
|
const target = resolveSampleVoidTarget({
|
||||||
|
receptionSource: 'cell_storage',
|
||||||
|
protocolSampleId: 'ps-1',
|
||||||
|
sampleCode: 'S1',
|
||||||
|
labStorageCode: 'B0000108',
|
||||||
|
collectionProtocolId: 'p-1'
|
||||||
|
})
|
||||||
|
assert.deepEqual(target, {
|
||||||
|
receptionSource: 'cell_storage',
|
||||||
|
sampleId: 'ps-1',
|
||||||
|
sampleCode: 'S1',
|
||||||
|
labStorageCode: 'B0000108',
|
||||||
|
protocolId: 'p-1'
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
it('falls back to tab source when row source is empty', () => {
|
||||||
|
const target = resolveSampleVoidTarget({
|
||||||
|
sampleCode: 'S2',
|
||||||
|
fallbackSource: 'research_donation'
|
||||||
|
})
|
||||||
|
assert.equal(target?.receptionSource, 'research_donation')
|
||||||
|
assert.equal(target?.sampleCode, 'S2')
|
||||||
|
})
|
||||||
|
|
||||||
|
it('returns null without a sample identifier', () => {
|
||||||
|
assert.equal(resolveSampleVoidTarget({ receptionSource: 'cell_storage' }), null)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('isSampleAlreadyVoided', () => {
|
||||||
|
it('matches yzf only', () => {
|
||||||
|
assert.equal(isSampleAlreadyVoided('yzf'), true)
|
||||||
|
assert.equal(isSampleAlreadyVoided(' yzf '), true)
|
||||||
|
assert.equal(isSampleAlreadyVoided('ycj'), false)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import type { SampleVoidTarget } from '../api/business-sample'
|
||||||
|
|
||||||
|
export function isSampleAlreadyVoided(status?: string | null): boolean {
|
||||||
|
return String(status || '').trim() === 'yzf'
|
||||||
|
}
|
||||||
|
|
||||||
|
export function resolveSampleVoidTarget(input: {
|
||||||
|
receptionSource?: string | null
|
||||||
|
protocolSampleId?: string | null
|
||||||
|
sampleCode?: string | null
|
||||||
|
labStorageCode?: string | null
|
||||||
|
collectionProtocolId?: string | null
|
||||||
|
fallbackSource?: string | null
|
||||||
|
}): SampleVoidTarget | null {
|
||||||
|
let source = String(input.receptionSource || '').trim()
|
||||||
|
if (source !== 'cell_storage' && source !== 'research_donation') {
|
||||||
|
source = String(input.fallbackSource || '').trim()
|
||||||
|
}
|
||||||
|
if (source !== 'cell_storage' && source !== 'research_donation') return null
|
||||||
|
const sampleId = String(input.protocolSampleId || '').trim()
|
||||||
|
const sampleCode = String(input.sampleCode || '').trim()
|
||||||
|
const labStorageCode = String(input.labStorageCode || '').trim()
|
||||||
|
const protocolId = String(input.collectionProtocolId || '').trim()
|
||||||
|
if (!sampleId && !sampleCode) return null
|
||||||
|
return {
|
||||||
|
receptionSource: source,
|
||||||
|
sampleId: sampleId || undefined,
|
||||||
|
sampleCode: sampleCode || undefined,
|
||||||
|
labStorageCode: labStorageCode || undefined,
|
||||||
|
protocolId: protocolId || undefined
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -82,6 +82,11 @@
|
|||||||
align="center"
|
align="center"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
/>
|
/>
|
||||||
|
<el-table-column label="样本状态" min-width="140" align="center">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.voidDesc" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="市场专员" min-width="110" align="center">
|
<el-table-column label="市场专员" min-width="110" align="center">
|
||||||
<template #default="{ row }">{{ row.salesUserName || '—' }}</template>
|
<template #default="{ row }">{{ row.salesUserName || '—' }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@@ -265,6 +270,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { Search, RefreshLeft, Document, Close } from '@element-plus/icons-vue'
|
import { Search, RefreshLeft, Document, Close } from '@element-plus/icons-vue'
|
||||||
import ProtocolViewDialog from '../protocol/ProtocolViewDialog.vue'
|
import ProtocolViewDialog from '../protocol/ProtocolViewDialog.vue'
|
||||||
|
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
|
||||||
import ProtocolAttachmentReadonly from '../protocol/ProtocolAttachmentReadonly.vue'
|
import ProtocolAttachmentReadonly from '../protocol/ProtocolAttachmentReadonly.vue'
|
||||||
import { downloadAttachmentFile } from '@/utils/download-attachment'
|
import { downloadAttachmentFile } from '@/utils/download-attachment'
|
||||||
import {
|
import {
|
||||||
|
|||||||
@@ -90,6 +90,11 @@
|
|||||||
align="center"
|
align="center"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
/>
|
/>
|
||||||
|
<el-table-column label="样本状态" min-width="140" align="center">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.voidDesc" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="签署日期" min-width="110" align="center">
|
<el-table-column label="签署日期" min-width="110" align="center">
|
||||||
<template #default="{ row }">{{ row.signDate || '—' }}</template>
|
<template #default="{ row }">{{ row.signDate || '—' }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@@ -295,6 +300,7 @@
|
|||||||
import ProtocolViewDialog from '../protocol/ProtocolViewDialog.vue'
|
import ProtocolViewDialog from '../protocol/ProtocolViewDialog.vue'
|
||||||
import ProtocolAttachmentReadonly from '../protocol/ProtocolAttachmentReadonly.vue'
|
import ProtocolAttachmentReadonly from '../protocol/ProtocolAttachmentReadonly.vue'
|
||||||
import SamplePaymentDetailDialog from '@/components/business/sample-payment-detail-dialog/index.vue'
|
import SamplePaymentDetailDialog from '@/components/business/sample-payment-detail-dialog/index.vue'
|
||||||
|
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
|
||||||
import { downloadAttachmentFile } from '@/utils/download-attachment'
|
import { downloadAttachmentFile } from '@/utils/download-attachment'
|
||||||
import { fetchSamplePaymentList, fetchSamplePaymentDetail } from '@/api/protocol-sample-payment'
|
import { fetchSamplePaymentList, fetchSamplePaymentDetail } from '@/api/protocol-sample-payment'
|
||||||
import { type CollectionProtocolRow } from '@/api/collection-protocol'
|
import { type CollectionProtocolRow } from '@/api/collection-protocol'
|
||||||
|
|||||||
@@ -175,6 +175,11 @@
|
|||||||
<span class="mono">{{ row.labStorageCode || '—' }}</span>
|
<span class="mono">{{ row.labStorageCode || '—' }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="样本状态" min-width="140" align="center" header-align="center">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.sampleVoidDesc" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="协议状态" min-width="100" align="center" header-align="center">
|
<el-table-column label="协议状态" min-width="100" align="center" header-align="center">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<el-tag :type="donationStatusTagType(row.donationStatus)" size="small">
|
<el-tag :type="donationStatusTagType(row.donationStatus)" size="small">
|
||||||
@@ -415,6 +420,7 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import ProjectSelect from '@/components/business/ProjectSelect.vue'
|
import ProjectSelect from '@/components/business/ProjectSelect.vue'
|
||||||
|
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
|
||||||
const projectFilter = ref('')
|
const projectFilter = ref('')
|
||||||
const teamFilter = ref('')
|
const teamFilter = ref('')
|
||||||
import { formatDisplayOrDash } from '@/utils/datetime-display'
|
import { formatDisplayOrDash } from '@/utils/datetime-display'
|
||||||
|
|||||||
@@ -197,6 +197,11 @@
|
|||||||
<span class="mono">{{ row.sampleCode || '—' }}</span>
|
<span class="mono">{{ row.sampleCode || '—' }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="样本状态" min-width="140" align="center" header-align="center">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.sampleVoidDesc" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="sampleTypeName"
|
prop="sampleTypeName"
|
||||||
label="样本类型"
|
label="样本类型"
|
||||||
@@ -383,6 +388,7 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import ProjectSelect from '@/components/business/ProjectSelect.vue'
|
import ProjectSelect from '@/components/business/ProjectSelect.vue'
|
||||||
|
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
|
||||||
const projectFilter = ref('')
|
const projectFilter = ref('')
|
||||||
const teamFilter = ref('')
|
const teamFilter = ref('')
|
||||||
import { formatDisplayOrDash } from '@/utils/datetime-display'
|
import { formatDisplayOrDash } from '@/utils/datetime-display'
|
||||||
|
|||||||
@@ -206,6 +206,11 @@
|
|||||||
<span class="cell-wrap-text">{{ row.sampleCode || '—' }}</span>
|
<span class="cell-wrap-text">{{ row.sampleCode || '—' }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="样本状态" min-width="140" align="center" header-align="center">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.voidDesc" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="sampleTypeName"
|
prop="sampleTypeName"
|
||||||
label="样本类型"
|
label="样本类型"
|
||||||
@@ -320,6 +325,7 @@
|
|||||||
sampleFreightSpanMethod,
|
sampleFreightSpanMethod,
|
||||||
type SampleFreightFlatRow
|
type SampleFreightFlatRow
|
||||||
} from '@/utils/sample-freight-flatten'
|
} from '@/utils/sample-freight-flatten'
|
||||||
|
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
|
||||||
import FreightConfigDialog from './FreightConfigDialog.vue'
|
import FreightConfigDialog from './FreightConfigDialog.vue'
|
||||||
import FreightEditDialog from './FreightEditDialog.vue'
|
import FreightEditDialog from './FreightEditDialog.vue'
|
||||||
|
|
||||||
|
|||||||
@@ -207,6 +207,11 @@
|
|||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="样本状态" min-width="140" align="center">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.voidDesc" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column prop="motherName" label="母亲姓名" min-width="100" align="center" />
|
<el-table-column prop="motherName" label="母亲姓名" min-width="100" align="center" />
|
||||||
<el-table-column prop="motherPhone" label="母亲电话" min-width="120" align="center">
|
<el-table-column prop="motherPhone" label="母亲电话" min-width="120" align="center">
|
||||||
<template #default="{ row }">{{ row.motherPhone || '—' }}</template>
|
<template #default="{ row }">{{ row.motherPhone || '—' }}</template>
|
||||||
@@ -368,6 +373,11 @@
|
|||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="样本状态" min-width="140" align="center">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.voidDesc" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column prop="labStorageCode" label="实验室入库编码" min-width="150" align="center">
|
<el-table-column prop="labStorageCode" label="实验室入库编码" min-width="150" align="center">
|
||||||
<template #default="{ row }">{{ row.labStorageCode || '—' }}</template>
|
<template #default="{ row }">{{ row.labStorageCode || '—' }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@@ -503,6 +513,7 @@
|
|||||||
import ProtocolViewDialog from '@/views/cell-storage/protocol/ProtocolViewDialog.vue'
|
import ProtocolViewDialog from '@/views/cell-storage/protocol/ProtocolViewDialog.vue'
|
||||||
import DonationViewDialog from '@/views/research-donation/list/DonationViewDialog.vue'
|
import DonationViewDialog from '@/views/research-donation/list/DonationViewDialog.vue'
|
||||||
import SampleCodeWithSpecialDisplay from '@/components/business/sample-code-with-special-display/index.vue'
|
import SampleCodeWithSpecialDisplay from '@/components/business/sample-code-with-special-display/index.vue'
|
||||||
|
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
|
||||||
import SampleInfoQuickRegisterDialog from './SampleInfoQuickRegisterDialog.vue'
|
import SampleInfoQuickRegisterDialog from './SampleInfoQuickRegisterDialog.vue'
|
||||||
import SampleCodeCorrectionDialog from './SampleCodeCorrectionDialog.vue'
|
import SampleCodeCorrectionDialog from './SampleCodeCorrectionDialog.vue'
|
||||||
import {
|
import {
|
||||||
|
|||||||
+58
-1
@@ -105,6 +105,13 @@
|
|||||||
>
|
>
|
||||||
<el-icon><EditPen /></el-icon>样本接收信息填写
|
<el-icon><EditPen /></el-icon>样本接收信息填写
|
||||||
</el-button>
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
v-if="showSampleVoidButton(row)"
|
||||||
|
class="btn-op-item"
|
||||||
|
@click="openSampleVoidDialog(row)"
|
||||||
|
>
|
||||||
|
<el-icon><Delete /></el-icon>样本废弃
|
||||||
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
v-if="showCardComplete(row) && canComplete(row)"
|
v-if="showCardComplete(row) && canComplete(row)"
|
||||||
class="btn-op-item"
|
class="btn-op-item"
|
||||||
@@ -169,8 +176,13 @@
|
|||||||
>
|
>
|
||||||
<dt>{{ field.label }}</dt>
|
<dt>{{ field.label }}</dt>
|
||||||
<dd>
|
<dd>
|
||||||
|
<SampleStatusTag
|
||||||
|
v-if="field.kind === 'sample-status'"
|
||||||
|
:status="row.sampleStatus"
|
||||||
|
:void-desc="row.voidDesc"
|
||||||
|
/>
|
||||||
<el-tag
|
<el-tag
|
||||||
v-if="field.kind === 'tag'"
|
v-else-if="field.kind === 'tag'"
|
||||||
:type="field.getTagType?.(row) || 'info'"
|
:type="field.getTagType?.(row) || 'info'"
|
||||||
size="small"
|
size="small"
|
||||||
:class="{
|
:class="{
|
||||||
@@ -319,6 +331,11 @@
|
|||||||
:sample-code="storageCertQcSampleCode"
|
:sample-code="storageCertQcSampleCode"
|
||||||
:sample-type-name="storageCertQcSampleTypeName"
|
:sample-type-name="storageCertQcSampleTypeName"
|
||||||
/>
|
/>
|
||||||
|
<SampleVoidDialog
|
||||||
|
v-model:visible="sampleVoidVisible"
|
||||||
|
:target="sampleVoidTarget"
|
||||||
|
@success="emit('sample-voided')"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -342,7 +359,11 @@
|
|||||||
import type { OutboundQcDetailProduct } from '@/api/qc-work-order'
|
import type { OutboundQcDetailProduct } from '@/api/qc-work-order'
|
||||||
import type { ProductionWorkOrderCardMetaConfig } from '@/utils/production-work-order-card-meta'
|
import type { ProductionWorkOrderCardMetaConfig } from '@/utils/production-work-order-card-meta'
|
||||||
import SampleCodeWithSpecialDisplay from '@/components/business/sample-code-with-special-display/index.vue'
|
import SampleCodeWithSpecialDisplay from '@/components/business/sample-code-with-special-display/index.vue'
|
||||||
|
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
|
||||||
|
import SampleVoidDialog from '@/components/business/sample-void-dialog/index.vue'
|
||||||
|
import type { SampleVoidTarget } from '@/api/business-sample'
|
||||||
import StorageCertQcDialog from '@/components/business/storage-cert-qc-dialog/index.vue'
|
import StorageCertQcDialog from '@/components/business/storage-cert-qc-dialog/index.vue'
|
||||||
|
import { isSampleAlreadyVoided, resolveSampleVoidTarget } from '@/utils/sample-void'
|
||||||
import { supportsStorageCertQc } from '@/utils/storage-cert-qc-fields'
|
import { supportsStorageCertQc } from '@/utils/storage-cert-qc-fields'
|
||||||
import {
|
import {
|
||||||
getCardMetaConfigForLegacyTab,
|
getCardMetaConfigForLegacyTab,
|
||||||
@@ -411,6 +432,8 @@
|
|||||||
const storageCertQcVisible = ref(false)
|
const storageCertQcVisible = ref(false)
|
||||||
const storageCertQcSampleCode = ref('')
|
const storageCertQcSampleCode = ref('')
|
||||||
const storageCertQcSampleTypeName = ref('')
|
const storageCertQcSampleTypeName = ref('')
|
||||||
|
const sampleVoidVisible = ref(false)
|
||||||
|
const sampleVoidTarget = ref<SampleVoidTarget | null>(null)
|
||||||
|
|
||||||
function showStorageCertQcButton(row: ProductionWorkOrderItem) {
|
function showStorageCertQcButton(row: ProductionWorkOrderItem) {
|
||||||
const tabKey = resolveEffectiveRowTabKey(listTabKey.value, row)
|
const tabKey = resolveEffectiveRowTabKey(listTabKey.value, row)
|
||||||
@@ -463,6 +486,39 @@
|
|||||||
return INBOUND_SAMPLE_TITLE_TAB_KEYS.has(effectiveTabKey)
|
return INBOUND_SAMPLE_TITLE_TAB_KEYS.has(effectiveTabKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function productionVoidFallbackSource(row: ProductionWorkOrderItem) {
|
||||||
|
const tabKey = resolveEffectiveRowTabKey(listTabKey.value, row)
|
||||||
|
if (tabKey === 'inbound_research_donation') return 'research_donation'
|
||||||
|
if (tabKey === 'inbound_cell_storage') return 'cell_storage'
|
||||||
|
return ''
|
||||||
|
}
|
||||||
|
|
||||||
|
function showSampleVoidButton(row: ProductionWorkOrderItem) {
|
||||||
|
if (!isInboundSampleTitle(row) || isSampleAlreadyVoided(row.sampleStatus)) return false
|
||||||
|
return !!resolveSampleVoidTarget({
|
||||||
|
receptionSource: row.receptionSource,
|
||||||
|
protocolSampleId: row.protocolSampleId,
|
||||||
|
sampleCode: row.sampleCode,
|
||||||
|
labStorageCode: row.labStorageCode,
|
||||||
|
collectionProtocolId: row.collectionProtocolId,
|
||||||
|
fallbackSource: productionVoidFallbackSource(row)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function openSampleVoidDialog(row: ProductionWorkOrderItem) {
|
||||||
|
const target = resolveSampleVoidTarget({
|
||||||
|
receptionSource: row.receptionSource,
|
||||||
|
protocolSampleId: row.protocolSampleId,
|
||||||
|
sampleCode: row.sampleCode,
|
||||||
|
labStorageCode: row.labStorageCode,
|
||||||
|
collectionProtocolId: row.collectionProtocolId,
|
||||||
|
fallbackSource: productionVoidFallbackSource(row)
|
||||||
|
})
|
||||||
|
if (!target) return
|
||||||
|
sampleVoidTarget.value = target
|
||||||
|
sampleVoidVisible.value = true
|
||||||
|
}
|
||||||
|
|
||||||
function inboundCardTitleLab(row: ProductionWorkOrderItem) {
|
function inboundCardTitleLab(row: ProductionWorkOrderItem) {
|
||||||
return (row.labStorageCode || '').trim() || '—'
|
return (row.labStorageCode || '').trim() || '—'
|
||||||
}
|
}
|
||||||
@@ -500,6 +556,7 @@
|
|||||||
'page-change': [page: number]
|
'page-change': [page: number]
|
||||||
'page-size-change': [size: number]
|
'page-size-change': [size: number]
|
||||||
'open-sample-reception': [row: ProductionWorkOrderItem]
|
'open-sample-reception': [row: ProductionWorkOrderItem]
|
||||||
|
'sample-voided': []
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const showCardOpsRow = computed(() => true)
|
const showCardOpsRow = computed(() => true)
|
||||||
|
|||||||
+6
@@ -198,6 +198,7 @@
|
|||||||
@tasks-changed="onTasksChanged"
|
@tasks-changed="onTasksChanged"
|
||||||
@counts-changed="onCountsChanged"
|
@counts-changed="onCountsChanged"
|
||||||
@open-sample-reception="handleOpenSampleReception"
|
@open-sample-reception="handleOpenSampleReception"
|
||||||
|
@sample-voided="handleSampleVoided"
|
||||||
@page-change="onWorkOrderPageChange"
|
@page-change="onWorkOrderPageChange"
|
||||||
@page-size-change="onWorkOrderPageSizeChange"
|
@page-size-change="onWorkOrderPageSizeChange"
|
||||||
/>
|
/>
|
||||||
@@ -371,6 +372,11 @@
|
|||||||
emit('data-changed')
|
emit('data-changed')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleSampleVoided() {
|
||||||
|
loadData()
|
||||||
|
emit('data-changed')
|
||||||
|
}
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
reload: loadData,
|
reload: loadData,
|
||||||
bumpTaskRefresh,
|
bumpTaskRefresh,
|
||||||
|
|||||||
@@ -93,9 +93,16 @@
|
|||||||
:min-width="col.minWidth || 120"
|
:min-width="col.minWidth || 120"
|
||||||
align="center"
|
align="center"
|
||||||
header-align="center"
|
header-align="center"
|
||||||
show-overflow-tooltip
|
:show-overflow-tooltip="col.prop !== 'sampleStatus'"
|
||||||
>
|
>
|
||||||
<template #default="{ row }">{{ displayCell(row[col.prop]) }}</template>
|
<template #default="{ row }">
|
||||||
|
<SampleStatusTag
|
||||||
|
v-if="col.prop === 'sampleStatus'"
|
||||||
|
:status="String(row.sampleStatus || '')"
|
||||||
|
:void-desc="String(row.voidDesc || '')"
|
||||||
|
/>
|
||||||
|
<template v-else>{{ displayCell(row[col.prop]) }}</template>
|
||||||
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="操作"
|
label="操作"
|
||||||
@@ -178,11 +185,13 @@
|
|||||||
saveLabSampleProcessSupplement,
|
saveLabSampleProcessSupplement,
|
||||||
type LabSampleProcessTabKey
|
type LabSampleProcessTabKey
|
||||||
} from '@/api/lab-sample-process'
|
} from '@/api/lab-sample-process'
|
||||||
|
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
|
||||||
import {
|
import {
|
||||||
LAB_PROCESS_COLUMNS,
|
LAB_PROCESS_COLUMNS,
|
||||||
LAB_PROCESS_TABS,
|
LAB_PROCESS_TABS,
|
||||||
SUPPLEMENT_FIELD_LABELS
|
SUPPLEMENT_FIELD_LABELS
|
||||||
} from '@/utils/lab-sample-process-columns'
|
} from '@/utils/lab-sample-process-columns'
|
||||||
|
import { sampleStatusLabel } from '@/utils/status-tag-registry'
|
||||||
|
|
||||||
defineOptions({ name: 'QualityInspectionLabSampleProcess' })
|
defineOptions({ name: 'QualityInspectionLabSampleProcess' })
|
||||||
|
|
||||||
@@ -274,9 +283,9 @@
|
|||||||
supplementForm.receptionSource = meta.source
|
supplementForm.receptionSource = meta.source
|
||||||
supplementForm.sampleTypeName = meta.sampleTypeName
|
supplementForm.sampleTypeName = meta.sampleTypeName
|
||||||
supplementForm.remark = ''
|
supplementForm.remark = ''
|
||||||
const keys = supplementKeys.value.length
|
const keys = (
|
||||||
? supplementKeys.value
|
supplementKeys.value.length ? supplementKeys.value : currentColumns.value.map((c) => c.prop)
|
||||||
: currentColumns.value.map((c) => c.prop)
|
).filter((k) => k !== 'sampleStatus' && k !== 'voidDesc')
|
||||||
const payload: Record<string, string> = {}
|
const payload: Record<string, string> = {}
|
||||||
keys.forEach((k) => {
|
keys.forEach((k) => {
|
||||||
payload[k] = ''
|
payload[k] = ''
|
||||||
@@ -324,6 +333,10 @@
|
|||||||
}
|
}
|
||||||
cols.forEach((c) => {
|
cols.forEach((c) => {
|
||||||
const v = row[c.prop]
|
const v = row[c.prop]
|
||||||
|
if (c.prop === 'sampleStatus') {
|
||||||
|
line[c.label] = v ? sampleStatusLabel(String(v)) : ''
|
||||||
|
return
|
||||||
|
}
|
||||||
line[c.label] = v === null || v === undefined || v === '' ? '' : String(v)
|
line[c.label] = v === null || v === undefined || v === '' ? '' : String(v)
|
||||||
})
|
})
|
||||||
return line
|
return line
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
@command="(cmd, row) => emit('command', cmd, row)"
|
@command="(cmd, row) => emit('command', cmd, row)"
|
||||||
@tasks-changed="emit('tasks-changed')"
|
@tasks-changed="emit('tasks-changed')"
|
||||||
@sample-special-changed="emit('sample-special-changed')"
|
@sample-special-changed="emit('sample-special-changed')"
|
||||||
|
@sample-voided="emit('sample-voided')"
|
||||||
/>
|
/>
|
||||||
<QcWorkOrderSampleGroup
|
<QcWorkOrderSampleGroup
|
||||||
v-for="ins in insertedCardsAfter(allTabInboundAnchorId(item.group))"
|
v-for="ins in insertedCardsAfter(allTabInboundAnchorId(item.group))"
|
||||||
@@ -49,6 +50,7 @@
|
|||||||
@command="(cmd, row) => emit('command', cmd, row)"
|
@command="(cmd, row) => emit('command', cmd, row)"
|
||||||
@tasks-changed="emit('tasks-changed')"
|
@tasks-changed="emit('tasks-changed')"
|
||||||
@sample-special-changed="emit('sample-special-changed')"
|
@sample-special-changed="emit('sample-special-changed')"
|
||||||
|
@sample-voided="emit('sample-voided')"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<QcWorkOrderSingleCard
|
<QcWorkOrderSingleCard
|
||||||
@@ -69,6 +71,7 @@
|
|||||||
@command="(cmd, row) => emit('command', cmd, row)"
|
@command="(cmd, row) => emit('command', cmd, row)"
|
||||||
@tasks-changed="emit('tasks-changed')"
|
@tasks-changed="emit('tasks-changed')"
|
||||||
@sample-special-changed="emit('sample-special-changed')"
|
@sample-special-changed="emit('sample-special-changed')"
|
||||||
|
@sample-voided="emit('sample-voided')"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
@@ -96,6 +99,7 @@
|
|||||||
@command="(cmd, row) => emit('command', cmd, row)"
|
@command="(cmd, row) => emit('command', cmd, row)"
|
||||||
@tasks-changed="emit('tasks-changed')"
|
@tasks-changed="emit('tasks-changed')"
|
||||||
@sample-special-changed="emit('sample-special-changed')"
|
@sample-special-changed="emit('sample-special-changed')"
|
||||||
|
@sample-voided="emit('sample-voided')"
|
||||||
/>
|
/>
|
||||||
<QcWorkOrderSampleGroup
|
<QcWorkOrderSampleGroup
|
||||||
v-for="ins in insertedCardsAfter(item.cardAnchorId)"
|
v-for="ins in insertedCardsAfter(item.cardAnchorId)"
|
||||||
@@ -120,6 +124,7 @@
|
|||||||
@command="(cmd, row) => emit('command', cmd, row)"
|
@command="(cmd, row) => emit('command', cmd, row)"
|
||||||
@tasks-changed="emit('tasks-changed')"
|
@tasks-changed="emit('tasks-changed')"
|
||||||
@sample-special-changed="emit('sample-special-changed')"
|
@sample-special-changed="emit('sample-special-changed')"
|
||||||
|
@sample-voided="emit('sample-voided')"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
@@ -141,6 +146,7 @@
|
|||||||
@command="(cmd, row) => emit('command', cmd, row)"
|
@command="(cmd, row) => emit('command', cmd, row)"
|
||||||
@tasks-changed="emit('tasks-changed')"
|
@tasks-changed="emit('tasks-changed')"
|
||||||
@sample-special-changed="emit('sample-special-changed')"
|
@sample-special-changed="emit('sample-special-changed')"
|
||||||
|
@sample-voided="emit('sample-voided')"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
@@ -163,6 +169,7 @@
|
|||||||
@command="(cmd, row) => emit('command', cmd, row)"
|
@command="(cmd, row) => emit('command', cmd, row)"
|
||||||
@tasks-changed="emit('tasks-changed')"
|
@tasks-changed="emit('tasks-changed')"
|
||||||
@sample-special-changed="emit('sample-special-changed')"
|
@sample-special-changed="emit('sample-special-changed')"
|
||||||
|
@sample-voided="emit('sample-voided')"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<el-empty
|
<el-empty
|
||||||
@@ -252,6 +259,7 @@
|
|||||||
command: [cmd: string, row: QcWorkOrder]
|
command: [cmd: string, row: QcWorkOrder]
|
||||||
'tasks-changed': []
|
'tasks-changed': []
|
||||||
'sample-special-changed': []
|
'sample-special-changed': []
|
||||||
|
'sample-voided': []
|
||||||
'page-change': [page: number]
|
'page-change': [page: number]
|
||||||
'page-size-change': [size: number]
|
'page-size-change': [size: number]
|
||||||
'sibling-navigate': [payload: InboundSiblingNavigatePayload]
|
'sibling-navigate': [payload: InboundSiblingNavigatePayload]
|
||||||
|
|||||||
@@ -115,6 +115,7 @@
|
|||||||
@command="(cmd, row) => emit('command', cmd, row)"
|
@command="(cmd, row) => emit('command', cmd, row)"
|
||||||
@tasks-changed="emit('tasks-changed')"
|
@tasks-changed="emit('tasks-changed')"
|
||||||
@sample-special-changed="emit('sample-special-changed')"
|
@sample-special-changed="emit('sample-special-changed')"
|
||||||
|
@sample-voided="emit('sample-voided')"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<SampleSpecialMarkDialog
|
<SampleSpecialMarkDialog
|
||||||
@@ -181,6 +182,7 @@
|
|||||||
command: [cmd: string, row: QcWorkOrder]
|
command: [cmd: string, row: QcWorkOrder]
|
||||||
'tasks-changed': []
|
'tasks-changed': []
|
||||||
'sample-special-changed': []
|
'sample-special-changed': []
|
||||||
|
'sample-voided': []
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const sampleSpecialDialogVisible = ref(false)
|
const sampleSpecialDialogVisible = ref(false)
|
||||||
|
|||||||
@@ -117,6 +117,7 @@
|
|||||||
@command="(cmd, row) => emit('command', cmd, row)"
|
@command="(cmd, row) => emit('command', cmd, row)"
|
||||||
@tasks-changed="emit('tasks-changed')"
|
@tasks-changed="emit('tasks-changed')"
|
||||||
@sample-special-changed="emit('sample-special-changed')"
|
@sample-special-changed="emit('sample-special-changed')"
|
||||||
|
@sample-voided="emit('sample-voided')"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<SampleSpecialMarkDialog
|
<SampleSpecialMarkDialog
|
||||||
@@ -201,6 +202,7 @@
|
|||||||
command: [cmd: string, row: QcWorkOrder]
|
command: [cmd: string, row: QcWorkOrder]
|
||||||
'tasks-changed': []
|
'tasks-changed': []
|
||||||
'sample-special-changed': []
|
'sample-special-changed': []
|
||||||
|
'sample-voided': []
|
||||||
'sibling-navigate': [payload: InboundSiblingNavigatePayload]
|
'sibling-navigate': [payload: InboundSiblingNavigatePayload]
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
|
|||||||
@@ -64,8 +64,13 @@
|
|||||||
>
|
>
|
||||||
<dt>{{ field.label }}</dt>
|
<dt>{{ field.label }}</dt>
|
||||||
<dd>
|
<dd>
|
||||||
|
<SampleStatusTag
|
||||||
|
v-if="field.kind === 'sample-status'"
|
||||||
|
:status="row.sampleStatus"
|
||||||
|
:void-desc="row.voidDesc"
|
||||||
|
/>
|
||||||
<el-tag
|
<el-tag
|
||||||
v-if="field.kind === 'tag'"
|
v-else-if="field.kind === 'tag'"
|
||||||
:type="field.getTagType?.(row) || 'info'"
|
:type="field.getTagType?.(row) || 'info'"
|
||||||
size="small"
|
size="small"
|
||||||
>
|
>
|
||||||
@@ -162,6 +167,13 @@
|
|||||||
>
|
>
|
||||||
<el-icon><EditPen /></el-icon>特殊样本
|
<el-icon><EditPen /></el-icon>特殊样本
|
||||||
</el-button>
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
v-if="showSampleVoidButton"
|
||||||
|
class="btn-op-item"
|
||||||
|
@click="openSampleVoidDialog"
|
||||||
|
>
|
||||||
|
<el-icon><Delete /></el-icon>样本废弃
|
||||||
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
v-if="showStorageCertQcButton"
|
v-if="showStorageCertQcButton"
|
||||||
class="btn-op-item"
|
class="btn-op-item"
|
||||||
@@ -190,6 +202,13 @@
|
|||||||
>
|
>
|
||||||
<el-icon><EditPen /></el-icon>特殊样本
|
<el-icon><EditPen /></el-icon>特殊样本
|
||||||
</el-button>
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
v-if="showSampleVoidButton"
|
||||||
|
class="btn-op-item"
|
||||||
|
@click="openSampleVoidDialog"
|
||||||
|
>
|
||||||
|
<el-icon><Delete /></el-icon>样本废弃
|
||||||
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
v-if="showStorageCertQcButton"
|
v-if="showStorageCertQcButton"
|
||||||
class="btn-op-item"
|
class="btn-op-item"
|
||||||
@@ -254,6 +273,11 @@
|
|||||||
:target="sampleSpecialMarkTarget"
|
:target="sampleSpecialMarkTarget"
|
||||||
@success="emit('sample-special-changed')"
|
@success="emit('sample-special-changed')"
|
||||||
/>
|
/>
|
||||||
|
<SampleVoidDialog
|
||||||
|
v-model:visible="sampleVoidDialogVisible"
|
||||||
|
:target="sampleVoidTarget"
|
||||||
|
@success="emit('sample-voided')"
|
||||||
|
/>
|
||||||
<StorageCertQcDialog
|
<StorageCertQcDialog
|
||||||
v-model:visible="storageCertQcVisible"
|
v-model:visible="storageCertQcVisible"
|
||||||
mode="edit"
|
mode="edit"
|
||||||
@@ -302,7 +326,11 @@
|
|||||||
import QcWorkOrderProtocolPaymentPanel from './QcWorkOrderProtocolPaymentPanel.vue'
|
import QcWorkOrderProtocolPaymentPanel from './QcWorkOrderProtocolPaymentPanel.vue'
|
||||||
import SampleCodeWithSpecialDisplay from '@/components/business/sample-code-with-special-display/index.vue'
|
import SampleCodeWithSpecialDisplay from '@/components/business/sample-code-with-special-display/index.vue'
|
||||||
import SampleSpecialMarkDialog from '@/components/business/sample-special-mark-dialog/index.vue'
|
import SampleSpecialMarkDialog from '@/components/business/sample-special-mark-dialog/index.vue'
|
||||||
|
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
|
||||||
|
import SampleVoidDialog from '@/components/business/sample-void-dialog/index.vue'
|
||||||
|
import type { SampleVoidTarget } from '@/api/business-sample'
|
||||||
import { resolveInboundSampleSpecialMarkTargetFromRow } from '@/utils/inbound-sample-special-mark'
|
import { resolveInboundSampleSpecialMarkTargetFromRow } from '@/utils/inbound-sample-special-mark'
|
||||||
|
import { isSampleAlreadyVoided, resolveSampleVoidTarget } from '@/utils/sample-void'
|
||||||
import QcWorkOrderSelectCheckbox from './QcWorkOrderSelectCheckbox.vue'
|
import QcWorkOrderSelectCheckbox from './QcWorkOrderSelectCheckbox.vue'
|
||||||
|
|
||||||
defineOptions({ name: 'QcWorkOrderSingleCard' })
|
defineOptions({ name: 'QcWorkOrderSingleCard' })
|
||||||
@@ -340,9 +368,12 @@
|
|||||||
command: [cmd: string, row: QcWorkOrder]
|
command: [cmd: string, row: QcWorkOrder]
|
||||||
'tasks-changed': []
|
'tasks-changed': []
|
||||||
'sample-special-changed': []
|
'sample-special-changed': []
|
||||||
|
'sample-voided': []
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const sampleSpecialDialogVisible = ref(false)
|
const sampleSpecialDialogVisible = ref(false)
|
||||||
|
const sampleVoidDialogVisible = ref(false)
|
||||||
|
const sampleVoidTarget = ref<SampleVoidTarget | null>(null)
|
||||||
const storageCertQcVisible = ref(false)
|
const storageCertQcVisible = ref(false)
|
||||||
|
|
||||||
const showStorageCertQcButton = computed(() => {
|
const showStorageCertQcButton = computed(() => {
|
||||||
@@ -377,6 +408,33 @@
|
|||||||
resolveEffectiveRowTabKey(props.cardMetaConfig.tabKey, props.row)
|
resolveEffectiveRowTabKey(props.cardMetaConfig.tabKey, props.row)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
function inboundVoidFallbackSource() {
|
||||||
|
if (effectiveRowTabKey.value === 'inbound_research_donation') return 'research_donation'
|
||||||
|
if (effectiveRowTabKey.value === 'inbound_cell_storage') return 'cell_storage'
|
||||||
|
return ''
|
||||||
|
}
|
||||||
|
|
||||||
|
const sampleVoidResolved = computed(() =>
|
||||||
|
resolveSampleVoidTarget({
|
||||||
|
receptionSource: props.row.receptionSource,
|
||||||
|
protocolSampleId: props.row.protocolSampleId,
|
||||||
|
sampleCode: props.row.sampleCode,
|
||||||
|
labStorageCode: props.row.labStorageCode,
|
||||||
|
collectionProtocolId: props.row.collectionProtocolId,
|
||||||
|
fallbackSource: inboundVoidFallbackSource()
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
const showSampleVoidButton = computed(
|
||||||
|
() => !!sampleVoidResolved.value && !isSampleAlreadyVoided(props.row.sampleStatus)
|
||||||
|
)
|
||||||
|
|
||||||
|
function openSampleVoidDialog() {
|
||||||
|
if (!sampleVoidResolved.value) return
|
||||||
|
sampleVoidTarget.value = sampleVoidResolved.value
|
||||||
|
sampleVoidDialogVisible.value = true
|
||||||
|
}
|
||||||
|
|
||||||
const visibleMetaFields = computed(() =>
|
const visibleMetaFields = computed(() =>
|
||||||
effectiveCardMeta.value.metaFields.filter((field) => !field.visible || field.visible(props.row))
|
effectiveCardMeta.value.metaFields.filter((field) => !field.visible || field.visible(props.row))
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -362,6 +362,7 @@
|
|||||||
@command="handleCommand"
|
@command="handleCommand"
|
||||||
@tasks-changed="onWorkOrderTasksChanged"
|
@tasks-changed="onWorkOrderTasksChanged"
|
||||||
@sample-special-changed="onSampleSpecialChanged"
|
@sample-special-changed="onSampleSpecialChanged"
|
||||||
|
@sample-voided="onSampleVoided"
|
||||||
@page-change="handleWorkOrderPageChange"
|
@page-change="handleWorkOrderPageChange"
|
||||||
@page-size-change="handleWorkOrderPageSizeChange"
|
@page-size-change="handleWorkOrderPageSizeChange"
|
||||||
/>
|
/>
|
||||||
@@ -560,6 +561,11 @@
|
|||||||
emit('data-changed')
|
emit('data-changed')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function onSampleVoided() {
|
||||||
|
await loadData()
|
||||||
|
emit('data-changed')
|
||||||
|
}
|
||||||
|
|
||||||
function handleCommand(command: string, row: QcWorkOrder) {
|
function handleCommand(command: string, row: QcWorkOrder) {
|
||||||
if (command === 'view') {
|
if (command === 'view') {
|
||||||
handleView(row)
|
handleView(row)
|
||||||
|
|||||||
Reference in new issue
Block a user