From b8bf9a10ca1c65e94d75a2db5550e6263b582512 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 16 十二月 2024 15:01:41 +0800
Subject: [PATCH] 调整结果项目状态判断结论增加非空判断
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 149 +++++++++++++++++++++++++++++++------------------
1 files changed, 93 insertions(+), 56 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 fec54ca..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
@@ -1,26 +1,30 @@
package com.ltkj.web.controller.system;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
+import javax.servlet.ServletSecurityElement;
import javax.servlet.http.HttpServletResponse;
import javax.swing.plaf.basic.BasicScrollPaneUI;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.core.redis.RedisCache;
+import com.ltkj.common.utils.IdUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.controller.lis.LisApiMethod;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
import org.aspectj.weaver.AjAttribute;
+import org.springframework.beans.BeanUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -39,9 +43,10 @@
* @author ltkj_璧典匠璞�&鏉庢牸
* @date 2023-04-11
*/
+@Slf4j
@RestController
@RequestMapping("/sampling/sampling")
-@Api(tags = "浣撴閲囨牱绠＄悊")
+@Api(tags = "PC绔� 浣撴閲囨牱绠＄悊")
public class TjSamplingController extends BaseController {
@Resource
private ITjSamplingService tjSamplingService;
@@ -59,6 +64,10 @@
private ITbTransitionService tbTransitionService;
@Autowired
private LisApiMethod lisApiMethod;
+ @Autowired
+ private ISysConfigService configService;
+ @Autowired
+ private SamplingServiceApi samplingService;
/**
* 鏌ヨ浣撴閲囨牱绠＄悊鍒楄〃
@@ -184,6 +193,7 @@
/**
* 鑾峰彇閲囨牱瀹㈡埛鍒楄〃
+ *
* @param isSignFor
* @param tjNum
* @param name
@@ -194,20 +204,21 @@
* @return
*/
@GetMapping("/getCusList")
+ @ApiOperation(value = "鑾峰彇閲囨牱瀹㈡埛鍒楄〃")
public AjaxResult getCusList(@RequestParam(defaultValue = "1") @ApiParam(value = "0鏄�1鍚�") Integer isSignFor,
@RequestParam(required = false) @ApiParam(value = "浣撴鍙�") String tjNum,
@RequestParam(required = false) @ApiParam(value = "瀹㈡埛濮撳悕") String name,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
@ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
- @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime){
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
Page<TjSampling> samplingPage = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjSampling::getIsSignFor,isSignFor);
+ wrapper.eq(TjSampling::getIsSignFor, isSignFor);
if (null != tjNum && StrUtil.isNotBlank(tjNum))
- wrapper.eq(TjSampling::getTjNum,tjNum);
+ wrapper.eq(TjSampling::getTjNum, tjNum);
if (null != name && StrUtil.isNotBlank(name))
- wrapper.eq(TjSampling::getCusName,name);
+ wrapper.eq(TjSampling::getCusName, name);
if (null != beginTime && null != endTime && StrUtil.isNotBlank(beginTime) && StrUtil.isNotBlank(endTime))
wrapper.between(TjSampling::getApplicationTime, beginTime, endTime);
wrapper.groupBy(TjSampling::getCusId);
@@ -217,7 +228,7 @@
ArrayList<TjCustomer> tjCustomers = new ArrayList<>();
for (TjSampling tjSampling : list) {
TjCustomer customer = customerService.getById(tjSampling.getCusId());
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+ customer.setCusName(customer.getCusName());
customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
customer.setTjNumber(tjSampling.getTjNum());
@@ -225,36 +236,92 @@
tjCustomers.add(customer);
}
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("list",tjCustomers);
- hashMap.put("total",page.getTotal());
+ hashMap.put("list", tjCustomers);
+ hashMap.put("total", page.getTotal());
return AjaxResult.success(hashMap);
}
/**
* 鏍规嵁瀹㈡埛鑾峰彇閲囨牱鍒楄〃
- * @param cusId
+ *
+ * @param tjNumber
* @return
*/
@GetMapping("/getCusCyList")
- public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId){
- if (cusId == null || StrUtil.isBlank(cusId))
- return AjaxResult.error("鍙傛暟閿欒");
+ @ApiOperation(value = "鏍规嵁瀹㈡埛鑾峰彇閲囨牱鍒楄〃")
+ public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "瀹㈡埛id") String tjNumber,
+ @RequestParam(defaultValue = "1") @ApiParam(value = "0鏄�1鍚�") Integer isSignFor) {
+ if (tjNumber == null || StrUtil.isBlank(tjNumber))
+ return AjaxResult.error("鍙傛暟閿欒,鏈紶鍙傛暟");
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjSampling::getCusId,cusId);
- wrapper.isNull(TjSampling::getParentId);
+ 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())
- return AjaxResult.error("鍙傛暟閿欒");
+ if (list.isEmpty()){
+ 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);
+// }
+
+ if (list.size() >= 2) {
+ // 杩涜鍚堝苟
+ List<String> stringList = list.stream().map(TjSampling::getId).collect(Collectors.toList());
+ log.info("鎻愬彇id ->{}",stringList);
+ for (String s : stringList) {
+ if (tjSamplingService.isMergeItem(s) != 0) {
+ list.removeIf(item -> Objects.equals(item.getId(), s));
+ }
+ }
+ 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::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) {
- sampling.setCusName(MatchUtils.hideCusName(sampling.getCusName()));
+ 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);
}
@PostMapping("/mergeCaiYang")
- public AjaxResult mergeCaiYang(@RequestBody List<String> ids){
- return AjaxResult.success();
+ @ApiOperation(value = "閲囨牱鐧昏鍚堝苟椤圭洰鎺ュ彛")
+ public AjaxResult mergeCaiYang(@RequestBody List<String> ids) {
+ return tjSamplingService.mergeCaiYangTran(ids);
}
+
+
+ @PostMapping("/chexiaoCaiYang")
+ @ApiOperation(value = "鎾ら攢閲囨牱鐧昏鍚堝苟椤圭洰鎺ュ彛")
+ @Transactional
+ public AjaxResult chexiaoCaiYang(@RequestBody List<String> ids) {
+ if (null != ids && !ids.isEmpty()) {
+ int pdsfczhbxm = tjSamplingService.pdsfczhbxm(ids);
+ if (pdsfczhbxm != ids.size()) return AjaxResult.error("瀛樺湪鏈悎骞剁殑椤圭洰涓嶅彲鎾ら攢!!!");
+ tjSamplingService.deletedTjSamplingListByHb(ids);
+ tjSamplingService.updateHeBingXm(ids);
+ return AjaxResult.success("鎾ら攢鎴愬姛!!!");
+ }
+ return AjaxResult.error("璇烽�夋嫨浣犺鎾ら攢鐨勯」鐩�!!!");
+ }
+
/**
* 瀵煎嚭浣撴閲囨牱绠＄悊鍒楄〃
@@ -320,38 +387,8 @@
@ApiOperation(value = "纭閲囨牱鎺ュ彛")
@Transactional
public AjaxResult confirmSampling(@RequestBody List<String> ids) {
- if (null == ids || ids.size() == 0) {
- return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
- }
- for (String id : ids) {
- TjSampling sampling = tjSamplingService.getById(id);
- if (null != sampling) {
- 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);
- }
- }
- }
- if (!tjSamplingService.updateById(sampling)) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("鎿嶄綔澶辫触,璇烽噸璇�");
- }
- }
-
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ String config = configService.selectConfigByKey("sfkqdyhis");
+ String mergeRequest = configService.selectConfigByKey("use_lis_pacs_is_auto_merge_request");
+ return samplingService.confirm(ids,config,mergeRequest);
}
}
--
Gitblit v1.8.0