diff --git a/backend/app/services/protocol_reception_discard_sync.py b/backend/app/services/protocol_reception_discard_sync.py index b225335f..4a565f95 100644 --- a/backend/app/services/protocol_reception_discard_sync.py +++ b/backend/app/services/protocol_reception_discard_sync.py @@ -1,8 +1,9 @@ """市场协议无效态 ↔ 样本接收废弃 / 样本状态作废联动。 规则(细胞存储 / 科研捐赠): -1. 单条样本接收结论为废弃(bj)时:仅该样本 `sample_status` 置为已作废(yzf)并写 `void_date`; - 协议状态保持不变。接收结论改回接收(js)且协议仍有效时:若该样本为 yzf,则清空状态与 void_date。 +1. 单条样本接收结论为废弃(bj)时:仅该样本 `sample_status` 置为已作废(yzf), + 写 `void_date`,并将接收备注写入 `void_desc`(备注为空则作废原因为空); + 协议状态保持不变。接收结论改回接收(js)且协议仍有效时:若该样本为 yzf,则清空状态、void_date 与 void_desc。 2. 协议变为已作废(yzf)或属地废弃(sdfq)时: - 协议下全部样本接收结论自动为废弃(bj); - 协议下全部有效样本 `sample_status` 置为已作废(yzf),并写入 `void_date`。 @@ -585,13 +586,17 @@ def void_sample_for_discarded_reception( 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() + reason = (reception.remark or "").strip() + if len(reason) > 512: + reason = reason[:512] sample.sample_status = SAMPLE_VOID_STATUS 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_time = now db.add(sample) diff --git a/backend/tests/test_protocol_reception_discard_sync.py b/backend/tests/test_protocol_reception_discard_sync.py index bb2021b4..62217b98 100644 --- a/backend/tests/test_protocol_reception_discard_sync.py +++ b/backend/tests/test_protocol_reception_discard_sync.py @@ -440,6 +440,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase): accept_conclusion="bj", reception_source="cell_storage", sample_code="ZKA", + remark="母血乙肝阳性", tenant_no="tenant-a", create_dept_id="", 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"].void_date, "20261105") + self.assertEqual(by_id["sa"].void_desc, "母血乙肝阳性") self.assertEqual(by_id["sb"].sample_status, "ycj") self.assertEqual(by_id["sc"].sample_status, "ycj") @@ -496,6 +498,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase): sample_code="ZKCLR", sample_status=SAMPLE_VOID_STATUS, void_date="20261101", + void_desc="旧作废原因", tenant_no="tenant-a", create_dept_id="", create_time=now, @@ -535,6 +538,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase): sample = db.query(BizProtocolSample).filter(BizProtocolSample.id == "s-clear").one() self.assertFalse((sample.sample_status or "").strip()) self.assertFalse((sample.void_date or "").strip()) + self.assertFalse((sample.void_desc or "").strip()) if __name__ == "__main__":