From 0c89b885bfa36df4e4013916c2a2dfa3273ac7aa Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期五, 01 十一月 2024 08:38:15 +0800
Subject: [PATCH] 2024-11-01
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java | 104 ++++++++++++++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 78 ------------------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 5 +
4 files changed, 113 insertions(+), 76 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java
new file mode 100644
index 0000000..3731a47
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java
@@ -0,0 +1,104 @@
+package com.ltkj.web.controller.system;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.hosp.domain.TjOrder;
+import com.ltkj.hosp.domain.TjSampling;
+import com.ltkj.hosp.service.ITjCustomerService;
+import com.ltkj.hosp.service.ITjOrderService;
+import com.ltkj.hosp.service.ITjSamplingService;
+import com.ltkj.web.controller.lis.LisApiMethod;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class SamplingServiceApi {
+ @Autowired
+ private ITjSamplingService tjSamplingService;
+ @Autowired
+ private ITjOrderService orderService;
+ @Autowired
+ private ITjCustomerService customerService;
+ @Autowired
+ private LisApiMethod lisApiMethod;
+
+ /**
+ * 纭閲囨牱鎺ュ彛
+ */
+ public Boolean confirmSamplingApi(List<String> ids, String sfkqdyhis, String mergeRequest) {
+ AjaxResult confirm = confirm(ids, sfkqdyhis, mergeRequest);
+ log.info("纭閲囨牱杩斿洖 ->{}",confirm);
+ return confirm.get("code").toString().equals("200");
+ }
+
+ public AjaxResult confirm(List<String> ids,String config,String mergeRequest) {
+ if (null == ids || ids.isEmpty()) {
+ return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
+ }
+ List<TjSampling> tjSamplings = tjSamplingService.listByIds(ids);
+ if (tjSamplings.isEmpty())
+ return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
+ String errorMsg = "";
+ for (TjSampling sampling : tjSamplings) {
+ if (sampling.getJyxmdm() == null)
+ errorMsg+=sampling.getProName()+"鍦╨is绯荤粺鏈壘鍒板搴旂紪鐮佹棤娉曞彂鍑虹敵璇�";
+ sampling.setIsSignFor("0");
+// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjProject::getProParentId, sampling.getProId());
+// List<TjProject> projectList = projectService.list(wq);
+// List<String> collect = new ArrayList<>();
+// for (TjProject project : projectList) {
+// Long proId = project.getProId();
+// collect.add(String.valueOf(proId));
+// }
+// LambdaQueryWrapper<TjSampling> wq1 = new LambdaQueryWrapper<>();
+// wq1.eq(TjSampling::getTjNum, sampling.getTjNum());
+// wq1.in(TjSampling::getProId, collect);
+// List<TjSampling> samplingList = tjSamplingService.list(wq1);
+// if (null != samplingList && samplingList.size() > 0) {
+// for (TjSampling tjSampling : samplingList) {
+// tjSampling.setIsSignFor("0");
+// tjSamplingService.updateById(tjSampling);
+// }
+// }
+ TjOrder tjOrder = orderService.getOrderByTjNum(sampling.getTjNum());
+ if(null==tjOrder) return AjaxResult.error("浣撴璁板綍涓嶅瓨鍦�");
+ TjCustomer tjCustomer = customerService.getById(tjOrder.getUserId());
+ boolean updChild;
+ Boolean save;
+ if (null != config && config.equals("Y") && !mergeRequest.equals("Y")) {
+ save = lisApiMethod.save(sampling, tjOrder, tjCustomer);
+ }else {
+ save = true;
+ }
+ if (save) {
+ if (sampling.getIsMerge() == 1) {
+ LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjSampling::getParentId, sampling.getId());
+ List<TjSampling> list = tjSamplingService.list(wrapper);
+ for (TjSampling tjSampling : list) {
+ tjSampling.setIsSignFor("0");
+ }
+ updChild = tjSamplingService.updateBatchById(list);
+ } else {
+ updChild = true;
+ }
+ if (!tjSamplingService.updateById(sampling) && !updChild) {
+// lisApiMethod.cancel(sampling.getJyxh(), tjOrder.getCardId(), PinyinUtil.getFirstLetter(tjCustomer.getCusName(), ""));
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触璇烽噸璇�");
+ }
+ } else {
+ return AjaxResult.error("鎿嶄綔澶辫触璇烽噸璇�");
+ }
+ }
+ if (StrUtil.isNotBlank(errorMsg)) return AjaxResult.error(errorMsg);
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
+ }
+}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index 0f529eb..70336a9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -69,6 +69,8 @@
private LisApiMethod lisApiMethod;
@Autowired
private ISysConfigService configService;
+ @Autowired
+ private SamplingServiceApi samplingService;
/**
* 鏌ヨ浣撴閲囨牱绠＄悊鍒楄〃
@@ -361,80 +363,6 @@
public AjaxResult confirmSampling(@RequestBody List<String> ids) {
String config = configService.selectConfigByKey("sfkqdyhis");
String mergeRequest = configService.selectConfigByKey("use_lis_pacs_is_auto_merge_request");
- return confirm(ids,config,mergeRequest);
- }
-
- /**
- * 纭閲囨牱鎺ュ彛
- */
- public Boolean confirmSamplingApi(List<String> ids,String sfkqdyhis,String mergeRequest) {
- AjaxResult confirm = confirm(ids, sfkqdyhis, mergeRequest);
- log.info("纭閲囨牱杩斿洖 ->{}",confirm);
- return confirm.get("code").toString().equals("200");
- }
-
- private AjaxResult confirm(List<String> ids,String config,String mergeRequest) {
- if (null == ids || ids.isEmpty()) {
- return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
- }
- List<TjSampling> tjSamplings = tjSamplingService.listByIds(ids);
- if (tjSamplings.isEmpty())
- return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
- String errorMsg = "";
- for (TjSampling sampling : tjSamplings) {
- if (sampling.getJyxmdm() == null)
- errorMsg+=sampling.getProName()+"鍦╨is绯荤粺鏈壘鍒板搴旂紪鐮佹棤娉曞彂鍑虹敵璇�";
- sampling.setIsSignFor("0");
-// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
-// wq.eq(TjProject::getProParentId, sampling.getProId());
-// List<TjProject> projectList = projectService.list(wq);
-// List<String> collect = new ArrayList<>();
-// for (TjProject project : projectList) {
-// Long proId = project.getProId();
-// collect.add(String.valueOf(proId));
-// }
-// LambdaQueryWrapper<TjSampling> wq1 = new LambdaQueryWrapper<>();
-// wq1.eq(TjSampling::getTjNum, sampling.getTjNum());
-// wq1.in(TjSampling::getProId, collect);
-// List<TjSampling> samplingList = tjSamplingService.list(wq1);
-// if (null != samplingList && samplingList.size() > 0) {
-// for (TjSampling tjSampling : samplingList) {
-// tjSampling.setIsSignFor("0");
-// tjSamplingService.updateById(tjSampling);
-// }
-// }
- TjOrder tjOrder = orderService.getOrderByTjNum(sampling.getTjNum());
- if(null==tjOrder) return AjaxResult.error("浣撴璁板綍涓嶅瓨鍦�");
- TjCustomer tjCustomer = customerService.getById(tjOrder.getUserId());
- boolean updChild;
- Boolean save;
- if (null != config && config.equals("Y") && !mergeRequest.equals("Y")) {
- save = lisApiMethod.save(sampling, tjOrder, tjCustomer);
- }else {
- save = true;
- }
- if (save) {
- if (sampling.getIsMerge() == 1) {
- LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjSampling::getParentId, sampling.getId());
- List<TjSampling> list = tjSamplingService.list(wrapper);
- for (TjSampling tjSampling : list) {
- tjSampling.setIsSignFor("0");
- }
- updChild = tjSamplingService.updateBatchById(list);
- } else {
- updChild = true;
- }
- if (!tjSamplingService.updateById(sampling) && !updChild) {
-// lisApiMethod.cancel(sampling.getJyxh(), tjOrder.getCardId(), PinyinUtil.getFirstLetter(tjCustomer.getCusName(), ""));
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("鎿嶄綔澶辫触璇烽噸璇�");
- }
- } else {
- return AjaxResult.error("鎿嶄綔澶辫触璇烽噸璇�");
- }
- }
- if (StrUtil.isNotBlank(errorMsg)) return AjaxResult.error(errorMsg);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return samplingService.confirm(ids,config,mergeRequest);
}
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index f9cc0ae..ca75e1e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -146,6 +146,11 @@
Boolean delHuoQuJcsqdh(String cardId);
List<String> getHuoQuJysqdh(String cardId);
+
+ List<String> getHuoQuJysqdhNotBuLu(String cardId);
+
+ List<String> getHuoQuJysqdhBuLu(String cardId);
+
Boolean delHuoQuJysqdh(String cardId);
List<String> getHuoQuZlsqdh(String cardId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java
index 110b93d..0e77f1c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java
@@ -35,7 +35,7 @@
void updateOrdeltile2(TjOrderDetail tjOrderDetail, SysUser sysUser);
//鍗曢」鏀惰垂
- void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser);
+ Boolean iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser);
//鍖荤敓妫�鏌ュ悜缂撳瓨涓坊鍔犳暟鎹�(鏁翠綋瀛樺叆)
--
Gitblit v1.8.0