467
[住院医生工作站-检验申请] 列表显示信息不规范:标题术语错误且单据名称未展示具体检验项目 466 [住院医生工作站-检验申请] 申请单界面缺失核心质控字段(申请类型、标本类型、执行时间)及联动逻辑
This commit is contained in:
@@ -42,4 +42,7 @@ public class SurgeryItemDto {
|
||||
|
||||
/** 单位编码字典文本(前端用于显示单位) */
|
||||
private String unitCodeDictText;
|
||||
|
||||
/** 所需标本编码(来自诊疗目录配置,对应字典 specimen_code 的 dictValue) */
|
||||
private String specimenCode;
|
||||
}
|
||||
|
||||
@@ -157,9 +157,14 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
|
||||
} else {
|
||||
// 根据申请单类型生成不同前缀的单号
|
||||
String dateStr = new java.text.SimpleDateFormat("yyMMdd").format(new Date());
|
||||
AssignSeqEnum seqEnum = ActivityDefCategory.PROCEDURE.getCode().equals(typeCode)
|
||||
? AssignSeqEnum.SURGERY_APPLY_NO
|
||||
: AssignSeqEnum.CHECK_APPLY_NO;
|
||||
AssignSeqEnum seqEnum;
|
||||
if (ActivityDefCategory.PROCEDURE.getCode().equals(typeCode)) {
|
||||
seqEnum = AssignSeqEnum.SURGERY_APPLY_NO;
|
||||
} else if (ActivityDefCategory.PROOF.getCode().equals(typeCode)) {
|
||||
seqEnum = AssignSeqEnum.LAB_APPLY_NO;
|
||||
} else {
|
||||
seqEnum = AssignSeqEnum.CHECK_APPLY_NO;
|
||||
}
|
||||
int seq = assignSeqUtil.getSeqNoByDay(seqEnum.getPrefix());
|
||||
prescriptionNo = seqEnum.getPrefix() + dateStr + String.format("%05d", seq);
|
||||
}
|
||||
|
||||
@@ -920,7 +920,8 @@
|
||||
t2.ID AS charge_item_definition_id,
|
||||
t2.price AS price,
|
||||
t1.permitted_unit_code AS unit_code,
|
||||
t1.permitted_unit_code AS unit_code_dict_text
|
||||
t1.permitted_unit_code AS unit_code_dict_text,
|
||||
t1.specimen_code AS specimen_code
|
||||
FROM wor_activity_definition t1
|
||||
LEFT JOIN adm_charge_item_definition t2
|
||||
ON t2.instance_id = t1.ID
|
||||
|
||||
@@ -278,6 +278,10 @@ public enum AssignSeqEnum {
|
||||
* 手术申请单号(住院)
|
||||
*/
|
||||
SURGERY_APPLY_NO("73", "手术申请单号", "SSZ"),
|
||||
/**
|
||||
* 检验申请单号(住院)
|
||||
*/
|
||||
LAB_APPLY_NO("74", "检验申请单号", "JYZ"),
|
||||
/**
|
||||
* b 病历文书
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user