Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
71424ff576 | ||
|
|
fbe62c7a9b | ||
|
|
034a4da1ad | ||
|
|
dbc4a24543 | ||
|
|
b59c921b50 | ||
|
|
b57898fabb |
No files matched your search
@@ -269,10 +269,13 @@ def _build_cell_system(
|
||||
clear_flag = checked
|
||||
break
|
||||
|
||||
sample_status = str(getattr(sample, "sample_status", None) or "").strip()
|
||||
base: Dict[str, Any] = {
|
||||
"receptionId": rec.id,
|
||||
"sampleCode": (rec.sample_code or sample.sample_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 "",
|
||||
"collectionTime": ledger.format_cn_datetime(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],
|
||||
) -> Dict[str, Any]:
|
||||
prod = prod or {}
|
||||
sample_status = str(getattr(sample, "sample_status", None) or "").strip()
|
||||
base: Dict[str, Any] = {
|
||||
"receptionId": rec.id,
|
||||
"sampleCode": (rec.sample_code or sample.sample_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 "",
|
||||
"receptionTime": ledger.format_cn_datetime(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:
|
||||
s = str(v or "").strip()
|
||||
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
|
||||
discount = meta.get("discountAmount")
|
||||
sample_status = str(meta.get("sampleStatus") or "").strip()
|
||||
row: Dict[str, Any] = {
|
||||
"id": sp.id,
|
||||
"collectionProtocolId": sp.collection_protocol_id,
|
||||
@@ -1891,6 +1900,10 @@ def _build_list_summary_row(
|
||||
"motherName": (party.mother_name if party else "") or "",
|
||||
"motherPhone": (party.mother_phone if party else "") 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 "",
|
||||
"contractAmount": float(sp.contract_amount)
|
||||
if sp.contract_amount is not None
|
||||
@@ -2020,10 +2033,14 @@ def list_sample_payments_page(
|
||||
discount = None
|
||||
if orig is not None and price is not None and orig > price:
|
||||
discount = round(orig - price, 2)
|
||||
status = str(s.sample_status or "").strip()
|
||||
sample_meta_by_key[key] = {
|
||||
"storageYears": s.storage_years,
|
||||
"sampleTypeName": type_name_map.get(s.sample_type_id or "", ""),
|
||||
"discountAmount": discount,
|
||||
"sampleStatus": status,
|
||||
"sampleStatusLabel": _SAMPLE_STATUS_LABELS.get(status, ""),
|
||||
"voidDesc": str(getattr(s, "void_desc", None) or "").strip(),
|
||||
}
|
||||
rows: List[Dict[str, Any]] = []
|
||||
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():
|
||||
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()
|
||||
rows: List[Dict[str, Any]] = []
|
||||
for sch, sp, proto, party, ci in candidates:
|
||||
@@ -2257,6 +2308,8 @@ def list_payment_chase_page(
|
||||
continue
|
||||
days_overdue = (today_d - due_d).days if 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(
|
||||
{
|
||||
"scheduleId": sch.id,
|
||||
@@ -2265,7 +2318,10 @@ def list_payment_chase_page(
|
||||
"protocolNo": (proto.protocol_no if proto else "") or "",
|
||||
"motherName": (party.mother_name 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 "",
|
||||
"salesUserName": sales_name_map.get(
|
||||
(ci.sales_user_id if ci else "") or "", ""
|
||||
|
||||
@@ -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(
|
||||
item: BizSampleFreightItem,
|
||||
*,
|
||||
@@ -201,12 +209,19 @@ def _item_to_dict_enriched(
|
||||
sample_type_name: str = "",
|
||||
mother_name: str = "",
|
||||
newborn_name: str = "",
|
||||
sample_status: str = "",
|
||||
void_desc: str = "",
|
||||
) -> Dict[str, Any]:
|
||||
data = _item_to_dict(item)
|
||||
data["protocolNo"] = protocol_no or ""
|
||||
data["sampleTypeName"] = sample_type_name or ""
|
||||
data["motherName"] = mother_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
|
||||
|
||||
|
||||
@@ -257,6 +272,8 @@ def _enrich_items_maps(
|
||||
BizCellSampleType.type_name,
|
||||
BizProtocolPartyCustomer.mother_name,
|
||||
BizProtocolPartyCustomer.newborn_name,
|
||||
BizProtocolSample.sample_status,
|
||||
BizProtocolSample.void_desc,
|
||||
)
|
||||
.outerjoin(
|
||||
BizCollectionProtocol,
|
||||
@@ -287,12 +304,14 @@ def _enrich_items_maps(
|
||||
)
|
||||
.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}"] = {
|
||||
"protocolNo": pno or "",
|
||||
"sampleTypeName": tname or "",
|
||||
"motherName": mname or "",
|
||||
"newbornName": nname or "",
|
||||
"sampleStatus": str(status or "").strip(),
|
||||
"voidDesc": str(void_desc or "").strip(),
|
||||
}
|
||||
|
||||
if donation_ids:
|
||||
@@ -303,6 +322,8 @@ def _enrich_items_maps(
|
||||
BizCellSampleType.type_name,
|
||||
BizResearchDonationParty.mother_name,
|
||||
BizResearchDonationParty.newborn_name,
|
||||
BizResearchDonationSample.sample_status,
|
||||
BizResearchDonationSample.void_desc,
|
||||
)
|
||||
.outerjoin(
|
||||
BizResearchDonation,
|
||||
@@ -334,12 +355,14 @@ def _enrich_items_maps(
|
||||
)
|
||||
.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}"] = {
|
||||
"protocolNo": dno or "",
|
||||
"sampleTypeName": tname or "",
|
||||
"motherName": mname or "",
|
||||
"newbornName": nname or "",
|
||||
"sampleStatus": str(status or "").strip(),
|
||||
"voidDesc": str(void_desc or "").strip(),
|
||||
}
|
||||
|
||||
return out
|
||||
@@ -541,6 +564,8 @@ def list_freights(
|
||||
sample_type_name=info.get("sampleTypeName", ""),
|
||||
mother_name=info.get("motherName", ""),
|
||||
newborn_name=info.get("newbornName", ""),
|
||||
sample_status=info.get("sampleStatus", ""),
|
||||
void_desc=info.get("voidDesc", ""),
|
||||
)
|
||||
)
|
||||
data["items"] = enriched
|
||||
@@ -584,6 +609,8 @@ def get_freight_detail(
|
||||
sample_type_name=info.get("sampleTypeName", ""),
|
||||
mother_name=info.get("motherName", ""),
|
||||
newborn_name=info.get("newbornName", ""),
|
||||
sample_status=info.get("sampleStatus", ""),
|
||||
void_desc=info.get("voidDesc", ""),
|
||||
)
|
||||
)
|
||||
data["items"] = enriched
|
||||
|
||||
@@ -3,6 +3,7 @@ from __future__ import annotations
|
||||
|
||||
import unittest
|
||||
from datetime import datetime
|
||||
from types import SimpleNamespace
|
||||
|
||||
from app.services.lab_sample_process import (
|
||||
format_cn_datetime,
|
||||
@@ -38,5 +39,65 @@ class LabSampleProcessServiceTests(unittest.TestCase):
|
||||
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__":
|
||||
unittest.main()
|
||||
@@ -79,12 +79,26 @@ class TestFreightListHelpers(unittest.TestCase):
|
||||
sample_type_name="脐带血",
|
||||
mother_name="张三",
|
||||
newborn_name="张小宝",
|
||||
sample_status="ycj",
|
||||
void_desc="",
|
||||
)
|
||||
self.assertEqual(d["protocolNo"], "CP001")
|
||||
self.assertEqual(d["sampleTypeName"], "脐带血")
|
||||
self.assertEqual(d["sampleSource"], "cell_storage")
|
||||
self.assertEqual(d["motherName"], "张三")
|
||||
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):
|
||||
from app.crud.sample_freight import _row_to_dict
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
"""样本缴费列表:进度过滤与分页顺序"""
|
||||
"""样本缴费列表:进度过滤与分页顺序、样本状态汇总字段"""
|
||||
|
||||
from types import SimpleNamespace
|
||||
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):
|
||||
@@ -33,5 +37,73 @@ class TestFilterAndPageProgress(unittest.TestCase):
|
||||
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__":
|
||||
unittest.main()
|
||||
@@ -4,6 +4,8 @@ export type SampleVoidTarget = {
|
||||
receptionSource: 'cell_storage' | 'research_donation'
|
||||
sampleId?: string
|
||||
sampleCode?: string
|
||||
/** 仅弹窗展示,不参与作废请求 */
|
||||
labStorageCode?: string
|
||||
protocolId?: string
|
||||
}
|
||||
|
||||
|
||||
@@ -20,6 +20,9 @@
|
||||
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>
|
||||
@@ -84,6 +87,9 @@
|
||||
]
|
||||
}
|
||||
|
||||
const labStorageCodeDisplay = computed(
|
||||
() => String(props.target?.labStorageCode || '').trim() || '—'
|
||||
)
|
||||
const sampleCode = computed(() => String(props.target?.sampleCode || '').trim())
|
||||
|
||||
watch(
|
||||
|
||||
@@ -8,12 +8,14 @@ describe('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'
|
||||
})
|
||||
})
|
||||
|
||||
@@ -8,6 +8,7 @@ export function resolveSampleVoidTarget(input: {
|
||||
receptionSource?: string | null
|
||||
protocolSampleId?: string | null
|
||||
sampleCode?: string | null
|
||||
labStorageCode?: string | null
|
||||
collectionProtocolId?: string | null
|
||||
fallbackSource?: string | null
|
||||
}): SampleVoidTarget | null {
|
||||
@@ -18,12 +19,14 @@ export function resolveSampleVoidTarget(input: {
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -499,6 +499,7 @@
|
||||
receptionSource: row.receptionSource,
|
||||
protocolSampleId: row.protocolSampleId,
|
||||
sampleCode: row.sampleCode,
|
||||
labStorageCode: row.labStorageCode,
|
||||
collectionProtocolId: row.collectionProtocolId,
|
||||
fallbackSource: productionVoidFallbackSource(row)
|
||||
})
|
||||
@@ -509,6 +510,7 @@
|
||||
receptionSource: row.receptionSource,
|
||||
protocolSampleId: row.protocolSampleId,
|
||||
sampleCode: row.sampleCode,
|
||||
labStorageCode: row.labStorageCode,
|
||||
collectionProtocolId: row.collectionProtocolId,
|
||||
fallbackSource: productionVoidFallbackSource(row)
|
||||
})
|
||||
|
||||
@@ -419,6 +419,7 @@
|
||||
receptionSource: props.row.receptionSource,
|
||||
protocolSampleId: props.row.protocolSampleId,
|
||||
sampleCode: props.row.sampleCode,
|
||||
labStorageCode: props.row.labStorageCode,
|
||||
collectionProtocolId: props.row.collectionProtocolId,
|
||||
fallbackSource: inboundVoidFallbackSource()
|
||||
})
|
||||
|
||||
Reference in new issue
Block a user