From 14f9208da19b7030a1c65a40897f9f4146a74d44 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期五, 01 十一月 2024 08:37:14 +0800
Subject: [PATCH] 增加申请业务类型
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 85 ++++++++++++++++++++++++++----------------
1 files changed, 53 insertions(+), 32 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 77ca503..0d237f9 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
@@ -18,7 +18,7 @@
import com.ltkj.web.controller.lis.LisApiMethod;
import com.ltkj.web.controller.pacs.PacsApiMethodService;
import com.ltkj.web.controller.service.TjSysAsyncServiceImpl;
-import com.ltkj.web.controller.system.TjSamplingController;
+import com.ltkj.web.controller.system.SamplingServiceApi;
import jdk.nashorn.internal.runtime.logging.Logger;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -81,7 +81,7 @@
@Autowired
private ITjSamplingService tjSamplingService;
@Autowired
- private TjSamplingController samplingController;
+ private SamplingServiceApi samplingService;
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
@@ -276,6 +276,7 @@
String mxfyxmbm = detail.getMxfyxmbm();
tree.setHisXmdm(mxfyxmbm);
tree.setType("妫�楠�");
+ tree.setService("his");
tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
@@ -383,6 +384,7 @@
String mxfyxmbm = detail.getMxfyxmbm();
tree.setHisXmdm(mxfyxmbm);
tree.setType("妫�鏌�");
+ tree.setService("his");
tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
@@ -585,36 +587,38 @@
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
List<TjSampling> list = tjSamplingService.list(wrapper);
-// log.info("閲囨牱鏁版嵁 ->{}",list);
- Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
+ log.info("閲囨牱鏁版嵁 ->{}",list);
+ if (!list.isEmpty()) {
+ Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
// log.info("鍒嗙粍鍚� ->{}",JSONUtil.toJsonStr(listMap));
- ArrayList<String> ids = new ArrayList<>();
- for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) {
+ ArrayList<String> ids = new ArrayList<>();
+ for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) {
// log.info("key ->{},val ->{}",entry.getKey(),entry.getValue());
- // Lis鏍囨湰浠ｇ爜
- String specimenTypeCode = entry.getKey();
- List<TjSampling> samplings = entry.getValue();
- if (samplings.size() > 1){
- // 杩涜鍚堝苟
- List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList());
+ // Lis鏍囨湰浠ｇ爜
+ String specimenTypeCode = entry.getKey();
+ List<TjSampling> samplings = entry.getValue();
+ if (samplings.size() > 1) {
+ // 杩涜鍚堝苟
+ List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList());
// log.info("鎻愬彇id ->{}",stringList);
- for (int i = 0; i < stringList.size(); i++) {
- String s = stringList.get(i);
- if (tjSamplingService.isMergeItem(s) != 0) {
- stringList.remove(s);
- ids.add(s);
+ for (int i = 0; i < stringList.size(); i++) {
+ String s = stringList.get(i);
+ if (tjSamplingService.isMergeItem(s) != 0) {
+ stringList.remove(s);
+ ids.add(s);
+ }
}
+ String id = tjSamplingService.mergeCaiYangApi(stringList);
+ ids.add(id);
+ } else {
+ ids.add(samplings.get(0).getId());
}
- String id = tjSamplingService.mergeCaiYangApi(stringList);
- ids.add(id);
- }else {
- ids.add(samplings.get(0).getId());
}
- }
- Boolean confirmed = samplingController.confirmSamplingApi(ids, "Y", "Y");
- if (!confirmed){
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("澶勭悊澶辫触");
+ Boolean confirmed = samplingService.confirmSamplingApi(ids, "Y", "N");
+ if (!confirmed) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("澶勭悊澶辫触");
+ }
}
}
@@ -817,15 +821,32 @@
}
}
}
- // 浣滃簾妫�楠岀敵璇�
+ // 浣滃簾妫�楠岀敵璇� TODO
if (jysqdh != null && !jysqdh.isEmpty()){
- for (String sqdh : jysqdh) {
+ 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));
- String result = cancelLisAjaxResult.get("data").toString();
- JSONObject object = JSONUtil.parseObj(result);
- String code= object.getStr("ResultCode");
- if(code.equals("1")){
+ 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")) {
orderService.delHuoQuJysqdh(order.getCardId());
}
}
--
Gitblit v1.8.0