From 8b477267727b0fe9ca60c98be57ae5a387a6a272 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 31 十月 2024 11:45:01 +0800
Subject: [PATCH] zjh20241031
---
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 1974bc4..d3e5590 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
@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -86,10 +87,16 @@
hashMap.put("examNo", examNo);
hashMap.put("name", name);
log.info("浣滃簾妫�鏌� ->{}", JSONUtil.toJsonStr(hashMap));
- return getMethodService.getPacsData("updatePacsApply", hashMap);
+ // TODO 鏆備笉鍙戝嚭pacs璇锋眰
+// return getMethodService.getPacsData("updatePacsApply", hashMap);
+ JSONObject object = JSONUtil.createObj();
+ object.putOpt("ResultCode","1");
+ return AjaxResult.success().put("data",JSONUtil.toJsonStr(object));
}
public Boolean save(TjOrder tjOrder, TjCustomer tjCustomer, List<TbTransition> detailList) {
+ if (true)
+ return true;
JSONArray array = JSONUtil.createArray();
ArrayList<SavePacsApply> errorPacsList = new ArrayList<>();
ArrayList<SavePacsApply> successPacsList = new ArrayList<>();
@@ -135,7 +142,7 @@
savePacsApply.setCardNumber(tjCustomer.getCusIdcard());
savePacsApply.setTel(tjCustomer.getCusPhone());
Date date = new Date();
- String regNo = "jk_" + DateFormatUtils.format(date, "yyyyMMddHHmmss") + "_" + project.getHisXmbm();
+ String regNo = "jk" + DateFormatUtils.format(date, "yyyyMMddHHmmss")+ StrUtil.subSuf(tjOrder.getCardId(),4) + project.getHisXmbm();
savePacsApply.setRegNo(regNo);
JSONObject jsonObject = JSONUtil.createObj();
jsonObject.putOpt("cardId", tjOrder.getCardId());
@@ -159,14 +166,14 @@
savePacsApply.setDevice("");
// TODO 妫�鏌ヨ澶囩被鍨�
savePacsApply.setDeviceType("");
- log.info("妫�鏌ョ敵璇� ->{}", JSONUtil.toJsonStr(savePacsApply));
+ log.info("PACS妫�鏌ョ敵璇� ->{}", JSONUtil.toJsonStr(savePacsApply));
AjaxResult ajaxResult = savePacsApply(savePacsApply);
String result = ajaxResult.get("data").toString();
JSONObject object = JSONUtil.parseObj(JSONUtil.parseObj(result).getStr("Response"));
- log.info("璇锋眰杩斿洖 ->{}", object);
+ log.info("PACS璇锋眰杩斿洖 ->{}", object);
String code = object.getStr("ResultCode");
allTotal++;
- if (code.equals("0")) {
+ if (code.equals("1")) {
successPacsList.add(savePacsApply);
LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
tree.setCardId(tjOrder.getCardId());
--
Gitblit v1.8.0