From fe9f16a02c89eb6c5264c06bf76e748a0d809647 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 01 十一月 2024 18:03:58 +0800
Subject: [PATCH] 2024-11-01
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 169 +++++++++++++++++++++++++++-----------------------------
1 files changed, 82 insertions(+), 87 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 0d237f9..136cd37 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -587,20 +587,20 @@
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
List<TjSampling> list = tjSamplingService.list(wrapper);
- log.info("閲囨牱鏁版嵁 ->{}",list);
+ log.info("閲囨牱鏁版嵁 ->{}",JSONUtil.toJsonStr(list));
if (!list.isEmpty()) {
Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
-// log.info("鍒嗙粍鍚� ->{}",JSONUtil.toJsonStr(listMap));
+ log.info("鍒嗙粍鍚� ->{}",JSONUtil.toJsonStr(listMap));
ArrayList<String> ids = new ArrayList<>();
for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) {
-// log.info("key ->{},val ->{}",entry.getKey(),entry.getValue());
+ log.info("key ->{},val ->{}",entry.getKey(),entry.getValue());
// Lis鏍囨湰浠ｇ爜
String specimenTypeCode = entry.getKey();
List<TjSampling> samplings = entry.getValue();
- if (samplings.size() > 1) {
+ if (samplings.size() >= 2) {
// 杩涜鍚堝苟
List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList());
-// log.info("鎻愬彇id ->{}",stringList);
+ log.info("鎻愬彇id ->{}",stringList);
for (int i = 0; i < stringList.size(); i++) {
String s = stringList.get(i);
if (tjSamplingService.isMergeItem(s) != 0) {
@@ -608,8 +608,12 @@
ids.add(s);
}
}
- String id = tjSamplingService.mergeCaiYangApi(stringList);
- ids.add(id);
+ if (stringList.size() > 1) {
+ String id = tjSamplingService.mergeCaiYangApi(stringList);
+ ids.add(id);
+ }else {
+ ids.add(stringList.get(0));
+ }
} else {
ids.add(samplings.get(0).getId());
}
@@ -791,10 +795,6 @@
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
- List<String> jcsqdh = orderService.getHuoQuJcsqdh(order.getCardId());
-
- List<String> jysqdh = orderService.getHuoQuJysqdh(order.getCardId());
-
List<String> zlsqdh = orderService.getHuoQuZlsqdh(order.getCardId());
@@ -807,52 +807,42 @@
JSONObject object1 = null;
String code1 = null;
- if (isUseLisAndPacsRegister){
+// if (isUseLisAndPacsRegister){
TjCustomer customer1 = customerService.getById(order.getUserId());
// 浣滃簾妫�鏌ョ敵璇�
- if (jcsqdh != null && !jcsqdh.isEmpty()){
- for (String sqdh : jcsqdh) {
- AjaxResult cancelPacsAjaxResult = pacsApiMethodService.updatePacsApply(sqdh, order.getCardId(), customer1.getCusName());
- String result = cancelPacsAjaxResult.get("data").toString();
- JSONObject object = JSONUtil.parseObj(result);
- String code = object.getStr("ResultCode");
- if(code.equals("1")){
- orderService.delHuoQuJcsqdh(order.getCardId());
- }
+ List<String> bljcsqdhByPacs = orderService.getBljcsqdhByPacs(order.getCardId());
+ if (bljcsqdhByPacs != null && !bljcsqdhByPacs.isEmpty()){
+ for (String sqdh : bljcsqdhByPacs) {
+ AjaxResult cancelPacsAjaxResult = pacsApiMethodService.updatePacsApply(sqdh, order.getCardId(), customer1.getCusName());
+ String result = cancelPacsAjaxResult.get("data").toString();
+ JSONObject object = JSONUtil.parseObj(result);
+ String code = object.getStr("ResultCode");
+ if(code.equals("1")){
+ orderService.delHuoQuJcsqdh(order.getCardId());
}
}
- // 浣滃簾妫�楠岀敵璇� TODO
- if (jysqdh != null && !jysqdh.isEmpty()){
- List<String> huoQuJysqdhNotBuLu = orderService.getHuoQuJysqdhNotBuLu(order.getCardId());
- List<String> huoQuJysqdhBuLu = orderService.getHuoQuJysqdhBuLu(order.getCardId());
- for (String sqdh : huoQuJysqdhNotBuLu) {
- AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName());
- log.info("lis璇锋眰杩斿洖 ->{}",JSONUtil.toJsonStr(cancelLisAjaxResult));
- if (cancelLisAjaxResult.get("code").toString().equals("200")){
- String result = cancelLisAjaxResult.get("data").toString();
- JSONObject object = JSONUtil.parseObj(result);
- String code= object.getStr("ResultCode");
- if(code.equals("1")){
- orderService.delHuoQuJysqdh(order.getCardId());
- }
- } else {
- String str = JSONUtil.parseObj(cancelLisAjaxResult.get("result").toString()).getJSONObject("Response").getStr("ResultContent");
- if (str.contains("鐢宠宸蹭綔搴�"))
- orderService.delHuoQuJysqdh(order.getCardId());
- }
- }
- for (String s : huoQuJysqdhBuLu) {
- ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", s);
- result2 = getAjaxResult(ajaxResult);
- object1 = getJSONObject(result2);
- code1 = object1.getStr("ResultCode");
- if (code1.equals("0")) {
+ }
+ // 浣滃簾妫�楠岀敵璇�
+ List<String> bljysqdhByLis = orderService.getBljysqdhByLis(order.getCardId());
+ if (bljysqdhByLis != null && !bljysqdhByLis.isEmpty()){
+ for (String sqdh : bljysqdhByLis) {
+ AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName());
+ log.info("lis璇锋眰杩斿洖 ->{}",JSONUtil.toJsonStr(cancelLisAjaxResult));
+ if (cancelLisAjaxResult.get("code").toString().equals("200")){
+ String result = cancelLisAjaxResult.get("data").toString();
+ JSONObject object = JSONUtil.parseObj(result);
+ String code= object.getStr("ResultCode");
+ if(code.equals("1")){
orderService.delHuoQuJysqdh(order.getCardId());
}
}
}
+ }
- }else {
+// }else {
+ List<String> jcsqdh = orderService.getHuoQuJcsqdh(order.getCardId());
+
+ List<String> jysqdh = orderService.getHuoQuJysqdh(order.getCardId());
//2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
if (null != jcsqdh && jcsqdh.size()>0) {
for (String s : jcsqdh) {
@@ -910,7 +900,7 @@
}
}
}
- }
+// }
//2.1.3 闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖
ajaxResult = controller.Outpinunconapply(order.getCardId(), date, "00029");
@@ -927,14 +917,11 @@
//浣滃簾琛ュ綍椤圭洰
public boolean ZfBlXm(List<String> bldhs, TjOrder order) {
-
+ log.info("bldhs ->{}",JSONUtil.toJsonStr(bldhs));
if(null !=bldhs && bldhs.size()>0){
+ log.info("杩涘叆鍒ゆ柇");
try {
for (String bldh : bldhs) {
- List<String> jcsqdh = orderService.getHuoQuBlJcsqdh(order.getCardId(),bldh);
-
- List<String> jysqdh = orderService.getHuoQuBlJysqdh(order.getCardId(),bldh);
-
List<String> zlsqdh = orderService.getHuoQuBlZlsqdh(order.getCardId(),bldh);
@@ -945,42 +932,50 @@
String result2 = null;
JSONObject object1 = null;
String code1 = null;
-
- if (lisApiMethod.isUseLisAndPacsRegister(order)) {
- TjCustomer customer1 = customerService.getById(order.getUserId());
- // 浣滃簾妫�鏌ョ敵璇�
- if (jcsqdh != null && !jcsqdh.isEmpty()){
- for (String sqdh : jcsqdh) {
- AjaxResult cancelPacsAjaxResult = pacsApiMethodService.updatePacsApply(sqdh, order.getCardId(), customer1.getCusName());
- log.info("浣滃簾妫�鏌� pacs杩斿洖 ->{}",JSONUtil.toJsonStr(cancelPacsAjaxResult));
- String result = cancelPacsAjaxResult.get("data").toString();
- JSONObject object = JSONUtil.parseObj(result);
- String code = object.getStr("ResultCode");
- if(code.equals("1")){
- orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh);
- }else {
- return false;
- }
+ log.info("鏌ヨ鍓�");
+// if (lisApiMethod.isUseLisAndPacsRegister(order)) {
+ TjCustomer customer1 = customerService.getById(order.getUserId());
+ log.info("customer1 ->{}",customer1);
+ List<String> bljcsqdhByPacs = orderService.getBljcsqdhByPacs(order.getCardId(), bldh);
+ log.info("bljcsqdhByPacs ->{}",bljcsqdhByPacs);
+ // 浣滃簾妫�鏌ョ敵璇�
+ if (bljcsqdhByPacs != null && !bljcsqdhByPacs.isEmpty()){
+ for (String sqdh : bljcsqdhByPacs) {
+ AjaxResult cancelPacsAjaxResult = pacsApiMethodService.updatePacsApply(sqdh, order.getCardId(), customer1.getCusName());
+ log.info("浣滃簾妫�鏌� pacs杩斿洖 ->{}",JSONUtil.toJsonStr(cancelPacsAjaxResult));
+ String result = cancelPacsAjaxResult.get("data").toString();
+ JSONObject object = JSONUtil.parseObj(result);
+ String code = object.getStr("ResultCode");
+ if(code.equals("1")){
+ orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh);
+ }else {
+ return false;
}
}
- // 浣滃簾妫�楠岀敵璇�
- if (jysqdh != null && !jysqdh.isEmpty()){
- for (String sqdh : jysqdh) {
- AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName());
- log.info("浣滃簾妫�楠� pacs杩斿洖 ->{}",JSONUtil.toJsonStr(cancelLisAjaxResult));
- String result = cancelLisAjaxResult.get("data").toString();
- JSONObject object = JSONUtil.parseObj(result);
- String code= object.getStr("ResultCode");
- if(code.equals("1")){
- orderService.delHuoQuBlJysqdh(order.getCardId(),bldh);
- }else {
- return false;
- }
+ }
+ List<String> bljysqdhByLis = orderService.getBljysqdhByLis(order.getCardId(), bldh);
+ log.info("bljysqdhByLis ->{}",bljysqdhByLis);
+ // 浣滃簾妫�楠岀敵璇�
+ if (bljysqdhByLis != null && !bljysqdhByLis.isEmpty()){
+ for (String sqdh : bljysqdhByLis) {
+ AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName());
+ log.info("浣滃簾妫�楠� pacs杩斿洖 ->{}",JSONUtil.toJsonStr(cancelLisAjaxResult));
+ String result = cancelLisAjaxResult.get("data").toString();
+ JSONObject object = JSONUtil.parseObj(result);
+ String code= object.getStr("ResultCode");
+ if(code.equals("1")){
+ orderService.delHuoQuBlJysqdh(order.getCardId(),bldh);
+ }else {
+ return false;
}
}
+ }
- }else {
- //2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
+ List<String> jcsqdh = orderService.getHuoQuBlJcsqdh(order.getCardId(),bldh);
+
+ List<String> jysqdh = orderService.getHuoQuBlJysqdh(order.getCardId(),bldh);
+// }else {
+// 2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
if (null != jcsqdh && jcsqdh.size()>0) {
for (String s : jcsqdh) {
AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", s);
@@ -1039,11 +1034,11 @@
}
}
}
- }
+// }
return true;
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage());
return false;
}
}
--
Gitblit v1.8.0