总检页面查询数据接口弃检结果去重

zhaowenxuan

2 天以前 6d8d2a1483a5b9decba783b5d0259fc1849a6f20

总检页面查询数据接口弃检结果去重

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java

@@ -14,6 +14,7 @@
import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.common.core.domain.entity.SysRole;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
@@ -34,6 +35,7 @@
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysDictDataService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.controller.his.HisApiMethodService;
@@ -130,6 +132,8 @@
    private SysConfigController configController;
    @Autowired
    private  TjReportController reportController;
    @Autowired
    private ISysDictDataService sysDictDataService;

    @GetMapping("/ceshicc")
    @ApiOperation(value = "测试调用存储过程耗时接口")
@@ -1630,6 +1634,28 @@
                parent.put("zhiyejg", one.getZhiyeJg());
                List<TjOrderDetail> dels = new ArrayList<>();
                if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
                    Map<String, List<TjOrderDetail>> listMap = tjOrderDetails.stream()
                            .filter(i -> StrUtil.isNotBlank(i.getProResult()) && remark.getProsId().equals(i.getProsId()))
                            .collect(Collectors.groupingBy(TjOrderDetail::getProResult));
                    boolean isGroupOnce = false;
                    String groupOnceProResult = "";
                    if (listMap.size() == 1){
                        String firstKey = listMap.keySet().stream().findFirst().orElse(null);
                        LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
                        wrapper.eq(SysDictData::getDictType,"qj_type");
                        wrapper.eq(SysDictData::getDictLabel,firstKey);
                        List<SysDictData> dictList = sysDictDataService.list();
                        if (!dictList.isEmpty()) {
                            isGroupOnce = true;
                            groupOnceProResult = firstKey;
                        }
                    }
                    if (isGroupOnce){
                        TjOrderDetail tjOrderDetail = new TjOrderDetail();
                        tjOrderDetail.setProName(remark.getProName());
                        tjOrderDetail.setProResult(groupOnceProResult);
                        dels.add(tjOrderDetail);
                    }else{
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                        if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                            String ckfw = tjOrderDetail.getStanId();
@@ -1685,6 +1711,7 @@
                            }
                        }
                    }
                    }
                    String summary = remark.getSummary();
                    if (null != summary) {
                        String[] split = summary.split(";");