From 35bf4a558e23d5016bccaa2145c4bed20aed920f Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 02 十二月 2024 00:18:13 +0800
Subject: [PATCH] zjh20241202-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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..6a9786b 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;
@@ -14,6 +15,7 @@
import com.ltkj.hosp.hisDto.OutpintestapplyDetailsDto;
import com.ltkj.hosp.pacsDto.SavePacsApply;
import com.ltkj.hosp.service.*;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import lombok.extern.slf4j.Slf4j;
@@ -47,6 +49,8 @@
private LtkjEjjfxmzdService ltkjEjjfxmzdService;
@Autowired
private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
+ @Autowired
+ private ISysConfigService configService;
/**
@@ -87,9 +91,14 @@
hashMap.put("name", name);
log.info("浣滃簾妫�鏌� ->{}", JSONUtil.toJsonStr(hashMap));
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<>();
@@ -121,6 +130,8 @@
public int saveProjects(TjOrder tjOrder, TjCustomer tjCustomer, List<TjProject> projects, JSONArray array, ArrayList<SavePacsApply> successPacsList, ArrayList<SavePacsApply> errorPacsList) {
int allTotal = 0;
if (projects != null && !projects.isEmpty()) {
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
for (TjProject project : projects) {
if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
if (null != project.getHisXmbm()) {
@@ -135,7 +146,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());
@@ -145,28 +156,29 @@
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");
+ savePacsApply.setApplyDepment(dept);
savePacsApply.setApplyDepmentName("浣撴涓績");
- savePacsApply.setApplyDoctor("00029");
+ savePacsApply.setApplyDoctor(ysbm);
savePacsApply.setApplyDoctorName("鐜嬪仴钀�");
- savePacsApply.setExecDepment("0101");
+ savePacsApply.setExecDepment(dept);
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("0")) {
+ if (code.equals("1")) {
successPacsList.add(savePacsApply);
LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
tree.setCardId(tjOrder.getCardId());
@@ -175,6 +187,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