From cc25bc0eec2d50da39d62f9896ed4d5e66805366 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 11 七月 2025 18:04:05 +0800
Subject: [PATCH] zjh20250711

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java |   12 ++++++++++--
 1 files changed, 10 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 555bbb2..ad9017e 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
@@ -14,6 +14,7 @@
 import com.ltkj.common.core.domain.entity.SysDept;
 import com.ltkj.common.utils.AgeResult;
 import com.ltkj.common.utils.DateUtils;
+import com.ltkj.common.utils.StringUtils;
 import com.ltkj.hosp.domain.*;
 import com.ltkj.hosp.hisDto.OutpintestapplyDetailsDto;
 import com.ltkj.hosp.pacsDto.SavePacsApply;
@@ -180,7 +181,14 @@
             savePacsApply.setCardNumber(tjCustomer.getCusIdcard());
             savePacsApply.setTel(tjCustomer.getCusPhone());
             Date date = new Date();
-            String regNo = "M_jk" + tjOrder.getCardId() +"_" + project.getHisXmbm();
+            String checkBw = project.getCheckBw();
+            String regNo ="";
+            if(StringUtils.isNotBlank(checkBw)){
+                regNo = "M_jk" + tjOrder.getCardId() +"_" + project.getHisXmbm()+checkBw;
+            }else {
+                regNo = "M_jk" + tjOrder.getCardId() +"_" + project.getHisXmbm();
+            }
+
             savePacsApply.setRegNo(regNo);
             JSONObject jsonObject = JSONUtil.createObj();
             jsonObject.putOpt("cardId", tjOrder.getCardId());
@@ -188,7 +196,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