Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d7b2ada59 | ||
|
|
332711ad36 | ||
|
|
03acf5115a | ||
|
|
12cf373a49 | ||
|
|
0434999603 | ||
|
|
f40d33b07a | ||
|
|
e5f84b4693 |
No files matched your search
@@ -1394,6 +1394,7 @@ def list_collection_protocols(
|
|||||||
"sampleTypeName": type_name,
|
"sampleTypeName": type_name,
|
||||||
"sampleCode": code,
|
"sampleCode": code,
|
||||||
"sampleStatus": (s.sample_status or "").strip(),
|
"sampleStatus": (s.sample_status or "").strip(),
|
||||||
|
"voidDesc": (getattr(s, "void_desc", None) or "").strip(),
|
||||||
"labStorageCode": lab_code_map.get(code, "") if code else "",
|
"labStorageCode": lab_code_map.get(code, "") if code else "",
|
||||||
"transport": transport_dict,
|
"transport": transport_dict,
|
||||||
"freight": freight_by_sample.get(s.id),
|
"freight": freight_by_sample.get(s.id),
|
||||||
|
|||||||
@@ -410,7 +410,8 @@ def list_protocol_sample_collections(
|
|||||||
item["newbornDeliveryTime"] = _fmt_dt(party.newborn_delivery_time) if party else ""
|
item["newbornDeliveryTime"] = _fmt_dt(party.newborn_delivery_time) if party else ""
|
||||||
item["protocolRemark"] = (proto.remark or "") if proto else ""
|
item["protocolRemark"] = (proto.remark or "") if proto else ""
|
||||||
item["voidType"] = (proto.void_type or "") if proto else ""
|
item["voidType"] = (proto.void_type or "") if proto else ""
|
||||||
item["voidDesc"] = (proto.void_desc or "") if proto else ""
|
# 样本状态问号展示样本作废原因,不用协议作废描述
|
||||||
|
item["voidDesc"] = (getattr(psample, "void_desc", None) or "").strip()
|
||||||
item["protocolAttachments"] = (proto.protocol_attachments or "") if proto else ""
|
item["protocolAttachments"] = (proto.protocol_attachments or "") if proto else ""
|
||||||
item["consentFormUrls"] = (proto.consent_form_urls or "") if proto else ""
|
item["consentFormUrls"] = (proto.consent_form_urls or "") if proto else ""
|
||||||
item["healthSurveyFormUrls"] = (proto.health_survey_form_urls or "") if proto else ""
|
item["healthSurveyFormUrls"] = (proto.health_survey_form_urls or "") if proto else ""
|
||||||
|
|||||||
@@ -976,6 +976,7 @@ def list_donations(
|
|||||||
"sampleTypeName": type_name,
|
"sampleTypeName": type_name,
|
||||||
"sampleCode": code,
|
"sampleCode": code,
|
||||||
"sampleStatus": (s.sample_status or "").strip(),
|
"sampleStatus": (s.sample_status or "").strip(),
|
||||||
|
"voidDesc": (getattr(s, "void_desc", None) or "").strip(),
|
||||||
"labStorageCode": lab_code_map.get(code, "") if code else "",
|
"labStorageCode": lab_code_map.get(code, "") if code else "",
|
||||||
"transport": transport_dict,
|
"transport": transport_dict,
|
||||||
"freight": freight_by_sample.get(s.id),
|
"freight": freight_by_sample.get(s.id),
|
||||||
|
|||||||
@@ -444,6 +444,7 @@ def _rows_to_sample_list_items(
|
|||||||
"sampleTypeName": type_map.get(sample.sample_type_id or "", ""),
|
"sampleTypeName": type_map.get(sample.sample_type_id or "", ""),
|
||||||
"collectAmount": _dec(sample.collect_amount),
|
"collectAmount": _dec(sample.collect_amount),
|
||||||
"sampleStatus": sample.sample_status or "",
|
"sampleStatus": sample.sample_status or "",
|
||||||
|
"voidDesc": (getattr(sample, "void_desc", None) or "").strip(),
|
||||||
"motherName": (party.mother_name if party else "") or "",
|
"motherName": (party.mother_name if party else "") or "",
|
||||||
"newbornName": (party.newborn_name if party else "") or "",
|
"newbornName": (party.newborn_name if party else "") or "",
|
||||||
"sampleCollectTime": (
|
"sampleCollectTime": (
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
"""市场协议无效态 ↔ 样本接收废弃 / 样本状态作废联动。
|
"""市场协议无效态 ↔ 样本接收废弃 / 样本状态作废联动。
|
||||||
|
|
||||||
规则(细胞存储 / 科研捐赠):
|
规则(细胞存储 / 科研捐赠):
|
||||||
1. 单条样本接收结论为废弃(bj)时:仅该样本 `sample_status` 置为已作废(yzf)并写 `void_date`;
|
1. 单条样本接收结论为废弃(bj)时:仅该样本 `sample_status` 置为已作废(yzf),
|
||||||
协议状态保持不变。接收结论改回接收(js)且协议仍有效时:若该样本为 yzf,则清空状态与 void_date。
|
写 `void_date`,并将接收备注写入 `void_desc`(备注为空则作废原因为空);
|
||||||
|
协议状态保持不变。接收结论改回接收(js)且协议仍有效时:若该样本为 yzf,则清空状态、void_date 与 void_desc。
|
||||||
2. 协议变为已作废(yzf)或属地废弃(sdfq)时:
|
2. 协议变为已作废(yzf)或属地废弃(sdfq)时:
|
||||||
- 协议下全部样本接收结论自动为废弃(bj);
|
- 协议下全部样本接收结论自动为废弃(bj);
|
||||||
- 协议下全部有效样本 `sample_status` 置为已作废(yzf),并写入 `void_date`。
|
- 协议下全部有效样本 `sample_status` 置为已作废(yzf),并写入 `void_date`。
|
||||||
@@ -585,13 +586,17 @@ def void_sample_for_discarded_reception(
|
|||||||
tenant_no: str,
|
tenant_no: str,
|
||||||
user_id: Optional[str] = None,
|
user_id: Optional[str] = None,
|
||||||
) -> bool:
|
) -> bool:
|
||||||
"""单条接收废弃:仅将该样本置为已作废。"""
|
"""单条接收废弃:将该样本置为已作废,作废原因取接收备注。"""
|
||||||
_source, sample = _find_sample_for_reception(db, reception=reception, tenant_no=tenant_no)
|
_source, sample = _find_sample_for_reception(db, reception=reception, tenant_no=tenant_no)
|
||||||
if not sample:
|
if not sample:
|
||||||
return False
|
return False
|
||||||
now = datetime.now()
|
now = datetime.now()
|
||||||
|
reason = (reception.remark or "").strip()
|
||||||
|
if len(reason) > 512:
|
||||||
|
reason = reason[:512]
|
||||||
sample.sample_status = SAMPLE_VOID_STATUS
|
sample.sample_status = SAMPLE_VOID_STATUS
|
||||||
sample.void_date = _void_date_yyyymmdd(void_time=reception.reception_time or now)
|
sample.void_date = _void_date_yyyymmdd(void_time=reception.reception_time or now)
|
||||||
|
sample.void_desc = reason or None
|
||||||
sample.update_by = user_id
|
sample.update_by = user_id
|
||||||
sample.update_time = now
|
sample.update_time = now
|
||||||
db.add(sample)
|
db.add(sample)
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
"""协议/捐赠列表 sampleItems 须返回样本 voidDesc,供审核列表问号展示。"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import inspect
|
||||||
|
import re
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
|
||||||
|
_SAMPLE_ITEM_VOID_DESC = re.compile(
|
||||||
|
r'"sampleStatus"\s*:\s*\(s\.sample_status[^)]*\)\.strip\(\),\s*'
|
||||||
|
r'"voidDesc"\s*:\s*\(getattr\(s,\s*"void_desc"',
|
||||||
|
re.S,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestProtocolListSampleVoidDesc(unittest.TestCase):
|
||||||
|
def test_collection_protocol_list_includes_sample_void_desc(self):
|
||||||
|
from app.crud import collection_protocol as cp
|
||||||
|
|
||||||
|
src = inspect.getsource(cp.list_collection_protocols)
|
||||||
|
self.assertRegex(src, _SAMPLE_ITEM_VOID_DESC)
|
||||||
|
|
||||||
|
def test_research_donation_list_includes_sample_void_desc(self):
|
||||||
|
from app.crud import research_donation as rd
|
||||||
|
|
||||||
|
# 捐赠列表函数名
|
||||||
|
fn = None
|
||||||
|
for name, obj in inspect.getmembers(rd, inspect.isfunction):
|
||||||
|
if "list" in name and "donation" in name:
|
||||||
|
src = inspect.getsource(obj)
|
||||||
|
if "sample_items.append" in src and '"sampleStatus"' in src:
|
||||||
|
fn = obj
|
||||||
|
break
|
||||||
|
self.assertIsNotNone(fn, "未找到组装 sampleItems 的捐赠列表函数")
|
||||||
|
self.assertRegex(inspect.getsource(fn), _SAMPLE_ITEM_VOID_DESC)
|
||||||
|
|
||||||
|
def test_sample_collection_list_uses_sample_void_desc(self):
|
||||||
|
from app.crud import protocol_sample_collection as psc
|
||||||
|
|
||||||
|
src = inspect.getsource(psc)
|
||||||
|
self.assertIn('getattr(psample, "void_desc"', src)
|
||||||
|
self.assertNotIn('item["voidDesc"] = (proto.void_desc or "") if proto else ""', src)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -440,6 +440,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
accept_conclusion="bj",
|
accept_conclusion="bj",
|
||||||
reception_source="cell_storage",
|
reception_source="cell_storage",
|
||||||
sample_code="ZKA",
|
sample_code="ZKA",
|
||||||
|
remark="母血乙肝阳性",
|
||||||
tenant_no="tenant-a",
|
tenant_no="tenant-a",
|
||||||
create_dept_id="",
|
create_dept_id="",
|
||||||
create_time=now,
|
create_time=now,
|
||||||
@@ -471,6 +472,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
}
|
}
|
||||||
self.assertEqual(by_id["sa"].sample_status, SAMPLE_VOID_STATUS)
|
self.assertEqual(by_id["sa"].sample_status, SAMPLE_VOID_STATUS)
|
||||||
self.assertEqual(by_id["sa"].void_date, "20261105")
|
self.assertEqual(by_id["sa"].void_date, "20261105")
|
||||||
|
self.assertEqual(by_id["sa"].void_desc, "母血乙肝阳性")
|
||||||
self.assertEqual(by_id["sb"].sample_status, "ycj")
|
self.assertEqual(by_id["sb"].sample_status, "ycj")
|
||||||
self.assertEqual(by_id["sc"].sample_status, "ycj")
|
self.assertEqual(by_id["sc"].sample_status, "ycj")
|
||||||
|
|
||||||
@@ -496,6 +498,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
sample_code="ZKCLR",
|
sample_code="ZKCLR",
|
||||||
sample_status=SAMPLE_VOID_STATUS,
|
sample_status=SAMPLE_VOID_STATUS,
|
||||||
void_date="20261101",
|
void_date="20261101",
|
||||||
|
void_desc="旧作废原因",
|
||||||
tenant_no="tenant-a",
|
tenant_no="tenant-a",
|
||||||
create_dept_id="",
|
create_dept_id="",
|
||||||
create_time=now,
|
create_time=now,
|
||||||
@@ -535,6 +538,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
sample = db.query(BizProtocolSample).filter(BizProtocolSample.id == "s-clear").one()
|
sample = db.query(BizProtocolSample).filter(BizProtocolSample.id == "s-clear").one()
|
||||||
self.assertFalse((sample.sample_status or "").strip())
|
self.assertFalse((sample.sample_status or "").strip())
|
||||||
self.assertFalse((sample.void_date or "").strip())
|
self.assertFalse((sample.void_date or "").strip())
|
||||||
|
self.assertFalse((sample.void_desc or "").strip())
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
@@ -141,9 +141,10 @@
|
|||||||
<span class="sample-card__seq">{{ sIdx + 1 }}</span>
|
<span class="sample-card__seq">{{ sIdx + 1 }}</span>
|
||||||
{{ sampleTypeName(row.sampleTypeId) }}
|
{{ sampleTypeName(row.sampleTypeId) }}
|
||||||
</div>
|
</div>
|
||||||
<el-tag :type="sampleStatusTagType(String(row.sampleStatus || ''))" size="small">
|
<SampleStatusTag
|
||||||
{{ sampleStatusLabel(String(row.sampleStatus || '')) }}
|
:status="row.sampleStatus"
|
||||||
</el-tag>
|
:void-desc="row.voidDesc"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="sample-card__body">
|
<div class="sample-card__body">
|
||||||
<div class="sample-card__section">
|
<div class="sample-card__section">
|
||||||
@@ -1254,6 +1255,7 @@
|
|||||||
import SampleQcInfoGroupedPanel from '@/components/business/sample-qc-info-grouped-panel/index.vue'
|
import SampleQcInfoGroupedPanel from '@/components/business/sample-qc-info-grouped-panel/index.vue'
|
||||||
import SampleReceptionDualReadonlyPanel from '@/components/business/sample-reception-dual-readonly-panel/index.vue'
|
import SampleReceptionDualReadonlyPanel from '@/components/business/sample-reception-dual-readonly-panel/index.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 SampleProductionInfoCards from '@/components/business/sample-production-info-cards/index.vue'
|
import SampleProductionInfoCards from '@/components/business/sample-production-info-cards/index.vue'
|
||||||
import SampleStorageReleaseInfo from '@/components/business/sample-storage-release-info/index.vue'
|
import SampleStorageReleaseInfo from '@/components/business/sample-storage-release-info/index.vue'
|
||||||
import ProtocolHandlePanel from '@/components/business/protocol-handle-panel/index.vue'
|
import ProtocolHandlePanel from '@/components/business/protocol-handle-panel/index.vue'
|
||||||
@@ -1284,8 +1286,6 @@
|
|||||||
payModeTagType,
|
payModeTagType,
|
||||||
newbornSexLabel,
|
newbornSexLabel,
|
||||||
deliveryModeLabel,
|
deliveryModeLabel,
|
||||||
sampleStatusLabel,
|
|
||||||
sampleStatusTagType,
|
|
||||||
transportTypeLabel,
|
transportTypeLabel,
|
||||||
payStatusLabel,
|
payStatusLabel,
|
||||||
payStatusTagType
|
payStatusTagType
|
||||||
|
|||||||
Reference in new issue
Block a user