From 3af811456bf5045b79eaad7bb22b6b813c50d9d0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 05 十一月 2024 08:40:49 +0800
Subject: [PATCH] zjh20241105
---
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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 6dd49b0..f4d4e2b 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,16 +87,15 @@
hashMap.put("examNo", examNo);
hashMap.put("name", name);
log.info("浣滃簾妫�鏌� ->{}", JSONUtil.toJsonStr(hashMap));
- // TODO 鏆備笉鍙戝嚭pacs璇锋眰
-// return getMethodService.getPacsData("updatePacsApply", hashMap);
- JSONObject object = JSONUtil.createObj();
- object.putOpt("ResultCode","1");
- return AjaxResult.success().put("data",JSONUtil.toJsonStr(object));
+ 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;
+// if (true)
+// return true;
JSONArray array = JSONUtil.createArray();
ArrayList<SavePacsApply> errorPacsList = new ArrayList<>();
ArrayList<SavePacsApply> successPacsList = new ArrayList<>();
@@ -141,7 +141,7 @@
savePacsApply.setCardNumber(tjCustomer.getCusIdcard());
savePacsApply.setTel(tjCustomer.getCusPhone());
Date date = new Date();
- String regNo = "jk_" + DateFormatUtils.format(date, "yyyyMMddHHmmss") + "_" + project.getHisXmbm();
+ String regNo = "M_jk" + tjOrder.getCardId() +"_" + project.getHisXmbm();
savePacsApply.setRegNo(regNo);
JSONObject jsonObject = JSONUtil.createObj();
jsonObject.putOpt("cardId", tjOrder.getCardId());
@@ -151,7 +151,7 @@
savePacsApply.setCheckItemID(project.getHisXmbm());
savePacsApply.setCheckItem(project.getHisXmmc());
// TODO 妫�鏌ラ儴浣�
- savePacsApply.setCheckPosition("");
+ savePacsApply.setCheckPosition("-");
savePacsApply.setAmount(project.getProPrice());
savePacsApply.setApplyDate(DateFormatUtils.format(date, "yyyy-MM-dd HH:mm:ss"));
savePacsApply.setApplyDepment("0101");
@@ -162,14 +162,15 @@
savePacsApply.setExecDepmentName("浣撴涓績");
savePacsApply.setCreateTime(savePacsApply.getApplyDate());
// TODO 妫�鏌ヨ澶�
- savePacsApply.setDevice("");
+ savePacsApply.setDevice("-");
// TODO 妫�鏌ヨ澶囩被鍨�
- savePacsApply.setDeviceType("");
- log.info("妫�鏌ョ敵璇� ->{}", JSONUtil.toJsonStr(savePacsApply));
+ savePacsApply.setDeviceType("-");
+ log.info("PACS妫�鏌ョ敵璇� ->{}", JSONUtil.toJsonStr(savePacsApply));
AjaxResult ajaxResult = savePacsApply(savePacsApply);
+ log.info("杩斿洖 ->{}",JSONUtil.toJsonStr(ajaxResult));
String result = ajaxResult.get("data").toString();
- JSONObject object = JSONUtil.parseObj(JSONUtil.parseObj(result).getStr("Response"));
- log.info("璇锋眰杩斿洖 ->{}", object);
+ JSONObject object = JSONUtil.parseObj(JSONUtil.parseObj(result));
+ log.info("PACS璇锋眰杩斿洖 ->{}", object);
String code = object.getStr("ResultCode");
allTotal++;
if (code.equals("1")) {
@@ -181,6 +182,7 @@
tree.setFyhj(String.valueOf(project.getProPrice()));
tree.setHisXmdm(project.getHisXmbm());
tree.setType("妫�鏌�");
+ tree.setService("pacs");
tree.setTjPrice(String.valueOf(project.getProPrice()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (project.getSfzhfy().equals("Y"))
--
Gitblit v1.8.0