From 5222547bc18ae20144547e2d60af5a6c26988cc2 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 05 十二月 2024 11:58:46 +0800
Subject: [PATCH] 采样调整
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java | 19 +++++++++++++++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 32 +++++++++++++++++++-------------
2 files changed, 36 insertions(+), 15 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
index 3731a47..640dbc8 100644
--- 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
@@ -9,6 +9,8 @@
import com.ltkj.hosp.service.ITjCustomerService;
import com.ltkj.hosp.service.ITjOrderService;
import com.ltkj.hosp.service.ITjSamplingService;
+import com.ltkj.system.mapper.SysConfigMapper;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.controller.lis.LisApiMethod;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +29,10 @@
private ITjCustomerService customerService;
@Autowired
private LisApiMethod lisApiMethod;
+ @Autowired
+ private SysConfigMapper sysConfigMapper;
+ @Autowired
+ private ISysConfigService sysConfigService;
/**
* 纭閲囨牱鎺ュ彛
@@ -38,6 +44,9 @@
}
public AjaxResult confirm(List<String> ids,String config,String mergeRequest) {
+
+
+ // sfkqdshitulianjie
if (null == ids || ids.isEmpty()) {
return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
}
@@ -46,9 +55,15 @@
return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
String errorMsg = "";
for (TjSampling sampling : tjSamplings) {
- if (sampling.getJyxmdm() == null)
- errorMsg+=sampling.getProName()+"鍦╨is绯荤粺鏈壘鍒板搴旂紪鐮佹棤娉曞彂鍑虹敵璇�";
+ if (!sysConfigService.selectConfigByKey("sfkqdshitulianjie").toLowerCase().equals("y")) {
+ 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);
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 88addad..adc092e 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
@@ -244,31 +244,31 @@
/**
* 鏍规嵁瀹㈡埛鑾峰彇閲囨牱鍒楄〃
*
- * @param cusId
+ * @param tjNumber
* @return
*/
@GetMapping("/getCusCyList")
@ApiOperation(value = "鏍规嵁瀹㈡埛鑾峰彇閲囨牱鍒楄〃")
- public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId,
+ public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "瀹㈡埛id") String tjNumber,
@RequestParam(defaultValue = "1") @ApiParam(value = "0鏄�1鍚�") Integer isSignFor) {
- if (cusId == null || StrUtil.isBlank(cusId))
+ if (tjNumber == null || StrUtil.isBlank(tjNumber))
return AjaxResult.error("鍙傛暟閿欒,鏈紶鍙傛暟");
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjSampling::getCusId, cusId);
+ wrapper.eq(TjSampling::getTjNum, tjNumber);
wrapper.eq(TjSampling::getIsSignFor,isSignFor);
wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
wrapper.orderByDesc(TjSampling::getIsMerge);
List<TjSampling> list = tjSamplingService.list(wrapper);
if (list.isEmpty()){
- logger.info("cusId鍙傛暟浼犵殑鏄�:"+cusId);
+ logger.info("jtNum ->{}",tjNumber);
return AjaxResult.error("鍙傛暟閿欒,鏈煡璇㈠埌鏁版嵁");
}
- for (TjSampling sampling : list) {
- TjCustomer customer = customerService.getById(sampling.getCusId());
- TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
- if(null !=order)sampling.setCardId(order.getCardId());
- sampling.setCustomer(customer);
- }
+// for (TjSampling sampling : list) {
+// TjCustomer customer = customerService.getById(sampling.getCusId());
+// TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
+// if(null !=order)sampling.setCardId(order.getCardId());
+// sampling.setCustomer(customer);
+// }
if (list.size() >= 2) {
// 杩涜鍚堝苟
@@ -279,19 +279,25 @@
list.removeIf(item -> Objects.equals(item.getId(), s));
}
}
- Map<String, List<TjSampling>> map = list.stream().collect(Collectors.groupingBy(item -> item.getSpecimenTypeCode()));
+ Map<String, List<TjSampling>> map = list.stream().filter(i->StrUtil.isNotBlank(i.getSpecimenTypeCode())).collect(Collectors.groupingBy(item -> item.getSpecimenTypeCode()));
for (Map.Entry<String, List<TjSampling>> entry : map.entrySet()) {
List<TjSampling> entryValue = entry.getValue();
tjSamplingService.mergeCaiYangTran(entryValue.stream().map(TjSampling::getId).collect(Collectors.toList()));
}
}
wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjSampling::getCusId, cusId);
+ wrapper.eq(TjSampling::getTjNum, tjNumber);
wrapper.eq(TjSampling::getIsSignFor,isSignFor);
wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
// wrapper.orderByDesc(TjSampling::getIsMerge);
wrapper.orderByAsc(TjSampling::getSpecimenTypeCode,TjSampling::getIsMerge);
list = tjSamplingService.list(wrapper);
+ for (TjSampling sampling : list) {
+ TjCustomer customer = customerService.getById(sampling.getCusId());
+ TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
+ if(null !=order)sampling.setCardId(order.getCardId());
+ sampling.setCustomer(customer);
+ }
return AjaxResult.success(list);
}
--
Gitblit v1.8.0