feat(sample): 展示样本状态并支持样本废弃与作废原因
生产/质检入库卡片展示样本状态并支持【样本废弃】;市场 Web 列表与移动市场部卡片补充样本状态及问号查看作废原因;样本表新增 void_desc,人工作废不联动接收但全部作废时自动作废协议(#131)。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
7751cc0f4a
commit
0b4c8dfda8
53 files changed
+1527
-82
No files matched your search
@@ -3604,6 +3604,10 @@ def test_protocol_list_contains_mobile_card_fields():
|
||||
assert items[0]['deliveryMode'] == 'sc'
|
||||
assert items[0]['newbornWeightGram'] == 3200
|
||||
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(
|
||||
db, ctx=_ctx('specialist'), user_info=_user(), keyword='李安然'
|
||||
@@ -3626,6 +3630,54 @@ def test_protocol_list_contains_mobile_card_fields():
|
||||
} == {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'])
|
||||
def test_protocol_list_and_detail_resolve_tenant_void_type_label(source):
|
||||
from app.services.market_protocol import get_protocol, list_protocols
|
||||
|
||||
Reference in new issue
Block a user