From 4761f2bc70814bde9929f1081a213a9ab38a7393 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 02 一月 2025 18:15:38 +0800
Subject: [PATCH] 采样管理确认采样增加调用lis请求
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 deletions(-)
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 0bca0d3..c7e531f 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
@@ -216,24 +216,27 @@
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjSampling::getIsSignFor, isSignFor);
if (null != tjNum && StrUtil.isNotBlank(tjNum))
- wrapper.eq(TjSampling::getTjNum, tjNum);
+ wrapper.like(TjSampling::getTjNum, tjNum);
if (null != name && StrUtil.isNotBlank(name))
- wrapper.eq(TjSampling::getCusName, name);
+ wrapper.like(TjSampling::getCusName, name);
if (null != beginTime && null != endTime && StrUtil.isNotBlank(beginTime) && StrUtil.isNotBlank(endTime))
wrapper.between(TjSampling::getApplicationTime, beginTime, endTime);
wrapper.groupBy(TjSampling::getCusId);
+ wrapper.orderByDesc(TjSampling::getCreateTime);
// wrapper.last("LIMIT " + (pageNum - 1) * pageSize + "," + pageSize);
Page<TjSampling> page = tjSamplingService.page(samplingPage, wrapper);
List<TjSampling> list = page.getRecords();
ArrayList<TjCustomer> tjCustomers = new ArrayList<>();
for (TjSampling tjSampling : list) {
TjCustomer customer = customerService.getById(tjSampling.getCusId());
- customer.setCusName(customer.getCusName());
- customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- customer.setTjNumber(tjSampling.getTjNum());
- customer.setApplicationTime(tjSampling.getApplicationTime());
- tjCustomers.add(customer);
+ if(null !=customer){
+ customer.setCusName(customer.getCusName());
+ customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+ customer.setTjNumber(tjSampling.getTjNum());
+ customer.setApplicationTime(tjSampling.getApplicationTime());
+ tjCustomers.add(customer);
+ }
}
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("list", tjCustomers);
@@ -244,31 +247,35 @@
/**
* 鏍规嵁瀹㈡埛鑾峰彇閲囨牱鍒楄〃
*
- * @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.eq(TjSampling::getIsPay,1);
+// if (isSignFor == 1)
+// wrapper.eq(TjSampling::getIsApply,0);
wrapper.orderByDesc(TjSampling::getIsMerge);
List<TjSampling> list = tjSamplingService.list(wrapper);
if (list.isEmpty()){
- logger.info("cusId鍙傛暟浼犵殑鏄�:"+cusId);
+ logger.info("jtNum ->{}",tjNumber);
+// return AjaxResult.error("鏈煡璇㈠埌鏁版嵁锛屼汉鍛樻湭缂磋垂鎴栨病鏈夋湭閲囨牱椤圭洰");
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,18 +286,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.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