Compare commits

...
Author SHA1 Message Date
zlwuandCursor 71424ff576 feat(sample): 样本废弃弹窗展示实验室入库编码
在样本编码前展示实验室入库编码;生产/质检工单打开弹窗时传入该字段(#140)。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 15:04:51 +08:00
cykj fbe62c7a9b fix(market): 催缴/运费/实验室处理列表返回样本状态 (#138) (#139)
fix(market): 催缴/运费/实验室处理列表返回样本状态 (#138)
2026-11-19 07:00:48 +00:00
zlwuandCursor 034a4da1ad fix(market): 催缴/运费/实验室处理列表返回样本状态
Web 三处列表 CRUD 补齐 sampleStatus/voidDesc,与缴费信息修复同类缺口(#138)。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 14:59:56 +08:00
cykj dbc4a24543 fix(payment): 缴费信息列表返回样本状态与作废原因 (#136) (#137)
fix(payment): 缴费信息列表返回样本状态与作废原因 (#136)
2026-11-19 06:52:16 +00:00
zlwuandCursor b59c921b50 fix(payment): 缴费信息列表返回样本状态与作废原因
Web 列表走 list_sample_payments_page,补齐 sampleStatus/voidDesc(#136)。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 14:51:29 +08:00
cykj b57898fabb fix(sample): 样本状态问号仅已作废时展示 (#134) (#135)
fix(sample): 样本状态问号仅已作废时展示 (#134)
2026-11-19 06:30:49 +00:00
zlwuandCursor 9fd1cc4370 fix(sample): 样本状态问号仅已作废时展示
Web SampleStatusTag 仅在 sampleStatus=yzf 时显示问号;移动市场部回归断言非作废无 help(#134)。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 14:29:07 +08:00
cykj af02e2cdd2 Merge pull request 'feat(sample): 展示样本状态并支持样本废弃与作废原因 (#131)' (#133)
feat(sample): 展示样本状态并支持样本废弃与作废原因 (#131)
2026-11-19 06:26:05 +00:00
cykj 6ddd07dbb5 feat(oa): 评论@人员优先展示同部门用户 (#117)
feat(oa): 评论@人员优先展示同部门用户 (#117)
2026-11-19 06:25:21 +00:00
zlwuandCursor f9aa16ef31 feat(oa): 评论@人员优先展示同部门用户
OA 评论选人列表改为请求 users/options 时按当前登录用户部门优先排序,Web 与移动 OA 共用后端稳定排序,便于先选到同部门同事。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 14:24:21 +08:00
20 changed files with 338 additions and 20 deletions

No files matched your search

+15 -2
View File
@@ -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)
+6
View File
@@ -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),
+57 -1
View File
@@ -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 "", ""
+29 -2
View File
@@ -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
@@ -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,
)
+61
View File
@@ -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()
+14
View File
@@ -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()
+27
View File
@@ -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") == []
@@ -270,12 +270,12 @@ test('sample-coded list cards show sample status and a void reason affordance',
}).fields.find((field) => field.label === '样本状态').value, }).fields.find((field) => field.label === '样本状态').value,
'已入库' '已入库'
) )
assert.equal( const detecting = buildMarketCard('payment-chase', 'specialist', {
buildMarketCard('payment-chase', 'specialist', { sampleCode: 'S-1', sampleStatus: 'jcz'
sampleCode: 'S-1', sampleStatus: 'jcz' }).fields.find((field) => field.label === '样本状态')
}).fields.find((field) => field.label === '样本状态').value, assert.equal(detecting.value, '检测中')
'检测中' assert.equal(detecting.helpTitle, undefined)
) assert.equal(detecting.helpText, undefined)
const voided = buildMarketCard('payment', 'specialist', { const voided = buildMarketCard('payment', 'specialist', {
motherName: '作废客户', motherName: '作废客户',
@@ -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()
+6 -3
View File
@@ -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
}) })
+2
View File
@@ -4,6 +4,8 @@ export type SampleVoidTarget = {
receptionSource: 'cell_storage' | 'research_donation' receptionSource: 'cell_storage' | 'research_donation'
sampleId?: string sampleId?: string
sampleCode?: string sampleCode?: string
/** 仅弹窗展示,不参与作废请求 */
labStorageCode?: string
protocolId?: string protocolId?: string
} }
@@ -1,8 +1,8 @@
<!-- 样本状态:标签 + 作废原因 --> <!-- 样本状态:标签;仅已作废时展示问号与作废原因 -->
<template> <template>
<span class="sample-status-tag"> <span class="sample-status-tag">
<el-tag :type="tagType" size="small">{{ label }}</el-tag> <el-tag :type="tagType" size="small">{{ label }}</el-tag>
<el-popover placement="top" trigger="click" :width="240"> <el-popover v-if="voided" placement="top" trigger="click" :width="240">
<template #reference> <template #reference>
<button type="button" class="sample-status-tag__q" aria-label="作废原因" @click.stop> <button type="button" class="sample-status-tag__q" aria-label="作废原因" @click.stop>
<el-icon><QuestionFilled /></el-icon> <el-icon><QuestionFilled /></el-icon>
@@ -31,6 +31,8 @@
const code = computed(() => String(props.status || '').trim()) const code = computed(() => String(props.status || '').trim())
const label = computed(() => (code.value ? sampleStatusLabel(code.value) : '—')) const label = computed(() => (code.value ? sampleStatusLabel(code.value) : '—'))
const tagType = computed(() => (code.value ? sampleStatusTagType(code.value) : 'info')) const tagType = computed(() => (code.value ? sampleStatusTagType(code.value) : 'info'))
/** 问号仅已作废(yzf)展示 */
const voided = computed(() => code.value === 'yzf')
const reasonText = computed(() => String(props.voidDesc || '').trim() || '暂无作废原因') const reasonText = computed(() => String(props.voidDesc || '').trim() || '暂无作废原因')
</script> </script>
@@ -20,6 +20,9 @@
class="biz-dialog-form" class="biz-dialog-form"
> >
<div class="form-grid-2"> <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"> <el-form-item v-if="sampleCode" label="样本编码" class="form-col-span-2">
<span class="sample-void-dialog__code">{{ sampleCode }}</span> <span class="sample-void-dialog__code">{{ sampleCode }}</span>
</el-form-item> </el-form-item>
@@ -84,6 +87,9 @@
] ]
} }
const labStorageCodeDisplay = computed(
() => String(props.target?.labStorageCode || '').trim() || '—'
)
const sampleCode = computed(() => String(props.target?.sampleCode || '').trim()) const sampleCode = computed(() => String(props.target?.sampleCode || '').trim())
watch( watch(
@@ -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>()
+2
View File
@@ -8,12 +8,14 @@ describe('resolveSampleVoidTarget', () => {
receptionSource: 'cell_storage', receptionSource: 'cell_storage',
protocolSampleId: 'ps-1', protocolSampleId: 'ps-1',
sampleCode: 'S1', sampleCode: 'S1',
labStorageCode: 'B0000108',
collectionProtocolId: 'p-1' collectionProtocolId: 'p-1'
}) })
assert.deepEqual(target, { assert.deepEqual(target, {
receptionSource: 'cell_storage', receptionSource: 'cell_storage',
sampleId: 'ps-1', sampleId: 'ps-1',
sampleCode: 'S1', sampleCode: 'S1',
labStorageCode: 'B0000108',
protocolId: 'p-1' protocolId: 'p-1'
}) })
}) })
+3
View File
@@ -8,6 +8,7 @@ export function resolveSampleVoidTarget(input: {
receptionSource?: string | null receptionSource?: string | null
protocolSampleId?: string | null protocolSampleId?: string | null
sampleCode?: string | null sampleCode?: string | null
labStorageCode?: string | null
collectionProtocolId?: string | null collectionProtocolId?: string | null
fallbackSource?: string | null fallbackSource?: string | null
}): SampleVoidTarget | null { }): SampleVoidTarget | null {
@@ -18,12 +19,14 @@ export function resolveSampleVoidTarget(input: {
if (source !== 'cell_storage' && source !== 'research_donation') return null if (source !== 'cell_storage' && source !== 'research_donation') return null
const sampleId = String(input.protocolSampleId || '').trim() const sampleId = String(input.protocolSampleId || '').trim()
const sampleCode = String(input.sampleCode || '').trim() const sampleCode = String(input.sampleCode || '').trim()
const labStorageCode = String(input.labStorageCode || '').trim()
const protocolId = String(input.collectionProtocolId || '').trim() const protocolId = String(input.collectionProtocolId || '').trim()
if (!sampleId && !sampleCode) return null if (!sampleId && !sampleCode) return null
return { return {
receptionSource: source, receptionSource: source,
sampleId: sampleId || undefined, sampleId: sampleId || undefined,
sampleCode: sampleCode || undefined, sampleCode: sampleCode || undefined,
labStorageCode: labStorageCode || undefined,
protocolId: protocolId || undefined protocolId: protocolId || undefined
} }
} }
@@ -499,6 +499,7 @@
receptionSource: row.receptionSource, receptionSource: row.receptionSource,
protocolSampleId: row.protocolSampleId, protocolSampleId: row.protocolSampleId,
sampleCode: row.sampleCode, sampleCode: row.sampleCode,
labStorageCode: row.labStorageCode,
collectionProtocolId: row.collectionProtocolId, collectionProtocolId: row.collectionProtocolId,
fallbackSource: productionVoidFallbackSource(row) fallbackSource: productionVoidFallbackSource(row)
}) })
@@ -509,6 +510,7 @@
receptionSource: row.receptionSource, receptionSource: row.receptionSource,
protocolSampleId: row.protocolSampleId, protocolSampleId: row.protocolSampleId,
sampleCode: row.sampleCode, sampleCode: row.sampleCode,
labStorageCode: row.labStorageCode,
collectionProtocolId: row.collectionProtocolId, collectionProtocolId: row.collectionProtocolId,
fallbackSource: productionVoidFallbackSource(row) fallbackSource: productionVoidFallbackSource(row)
}) })
@@ -419,6 +419,7 @@
receptionSource: props.row.receptionSource, receptionSource: props.row.receptionSource,
protocolSampleId: props.row.protocolSampleId, protocolSampleId: props.row.protocolSampleId,
sampleCode: props.row.sampleCode, sampleCode: props.row.sampleCode,
labStorageCode: props.row.labStorageCode,
collectionProtocolId: props.row.collectionProtocolId, collectionProtocolId: props.row.collectionProtocolId,
fallbackSource: inboundVoidFallbackSource() fallbackSource: inboundVoidFallbackSource()
}) })