From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
index ae166e1..28a48a6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
@@ -22,6 +22,7 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -167,7 +168,7 @@
}
private int getAllTotal(TjOrder tjOrder, TjCustomer tjCustomer, JSONArray array, ArrayList<SavePacsApply> successPacsList, ArrayList<SavePacsApply> errorPacsList, TjProject project, String dept, String ysbm, String ysmc, int allTotal) {
- if (null != project.getHisXmbm()) {
+ if (StringUtil.isNotBlank(project.getHisXmbm())) {
SavePacsApply savePacsApply = new SavePacsApply();
savePacsApply.setExamNo(tjOrder.getCardId());
savePacsApply.setName(tjCustomer.getCusName());
@@ -187,7 +188,7 @@
jsonObject.putOpt("name", tjCustomer.getCusName());
array.add(jsonObject);
savePacsApply.setCheckItemID(project.getHisXmbm());
- savePacsApply.setCheckItem(project.getHisXmmc());
+ savePacsApply.setCheckItem(project.getProName());
// TODO 妫�鏌ラ儴浣�
savePacsApply.setCheckPosition("-");
savePacsApply.setAmount(project.getProPrice());
--
Gitblit v1.8.0