From edd22f77d054237b32628a91f217fd18288b13d6 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期三, 08 一月 2025 10:11:45 +0800
Subject: [PATCH] 泾川his补录调整
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 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 adc092e..23e430e 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);
@@ -257,10 +260,14 @@
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("jtNum ->{}",tjNumber);
+// return AjaxResult.error("鏈煡璇㈠埌鏁版嵁锛屼汉鍛樻湭缂磋垂鎴栨病鏈夋湭閲囨牱椤圭洰");
return AjaxResult.error("鍙傛暟閿欒,鏈煡璇㈠埌鏁版嵁");
}
// for (TjSampling sampling : list) {
@@ -279,10 +286,11 @@
list.removeIf(item -> Objects.equals(item.getId(), s));
}
}
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
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()));
+ tjSamplingService.mergeCaiYangTran(entryValue.stream().map(TjSampling::getId).collect(Collectors.toList()),lis_tmh_prefix);
}
}
wrapper = new LambdaQueryWrapper<>();
@@ -304,7 +312,8 @@
@PostMapping("/mergeCaiYang")
@ApiOperation(value = "閲囨牱鐧昏鍚堝苟椤圭洰鎺ュ彛")
public AjaxResult mergeCaiYang(@RequestBody List<String> ids) {
- return tjSamplingService.mergeCaiYangTran(ids);
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+ return tjSamplingService.mergeCaiYangTran(ids,lis_tmh_prefix);
}
--
Gitblit v1.8.0