lxd/inspect-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加项目状态标识

Browse Source
This commit is contained in:
Euni4U 2025-03-25 10:18:45 +08:00
parent ecd5bcc1f2
commit 5881174898
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java
View File

@ -634,6 +634,7 @@ public class InspectPatientController {
itemData.setInspectdoctor(item.getInspectdoctor());
itemData.setInspecttime(item.getInspecttime());
itemData.setType(item.getItemName());
itemData.setItemStatus(item.getItemStatus());
// 尝试转换数值结果
if (item.getItemResult() != null) {
@ -748,19 +749,31 @@ public class InspectPatientController {
// 根据项目代码匹配
if (itemCode != null) {
String upperItemCode = itemCode.toUpperCase();
// 原有匹配逻辑
if (pacsType.equals("XC") && upperItemCode.contains("XCG")) return true;
if (pacsType.equals("NC") && upperItemCode.contains("NCG")) return true;
if ((pacsType.equals("EC") || pacsType.equals("ECG")) && upperItemCode.contains("ECG")) return true;
if (pacsType.equals("US") && upperItemCode.contains("US")) return true;
// 添加新的匹配逻辑
if (pacsType.equals("CBC") && upperItemCode.contains("XCG")) return true;
if (pacsType.equals("RT") && upperItemCode.contains("NCG")) return true;
if (pacsType.equals("BT") && upperItemCode.contains("SHQX")) return true;
}
// 根据项目名称匹配
if (itemName != null) {
String upperItemName = itemName.toUpperCase();
// 原有匹配逻辑
if (pacsType.equals("XC") && upperItemName.contains("血常规")) return true;
if (pacsType.equals("NC") && upperItemName.contains("尿常规")) return true;
if ((pacsType.equals("EC") || pacsType.equals("ECG")) && upperItemName.contains("心电图")) return true;
if (pacsType.equals("US") && upperItemName.contains("超声")) return true;
// 添加新的匹配逻辑
if (pacsType.equals("CBC") && upperItemName.contains("血常规")) return true;
if (pacsType.equals("RT") && upperItemName.contains("尿常规")) return true;
if (pacsType.equals("BT") && (upperItemName.contains("生化") || upperItemName.contains("SHQX"))) return true;
}
return false;
@ -773,14 +786,11 @@ public class InspectPatientController {
if (pacsType == null) return "未知检查";
switch (pacsType.toUpperCase()) {
case "XC":
case "XCG": return "血常规";
case "NC":
case "NCG": return "尿常规";
case "EC":
case "ECG": return "心电图";
case "US": return "超声检查";
case "BT": return "生化全项";
case "BT": return "生化";
case "RT": return "尿常规";
case "CBC": return "血常规";
default: return pacsType;

3
yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientReportDataVO.java
View File

@ -31,6 +31,9 @@ public class InspectPatientReportDataVO {
@Schema(description = "检查值", example = "1.00")
private Double itemValue;
@Schema(description = "项目状态", example = "0")
private String itemStatus;
@Schema(description = "根据检查结论分析")
private String analyse;