| | |
| | | } |
| | | |
| | | } |
| | | if (StrUtil.isNotBlank(jxbz)){ |
| | | tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()),jxbz); |
| | | }else { |
| | | tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId())); |
| | | } |
| | | } |
| | | |
| | | |
| | |
| | | @ApiOperation(value = "根据体检号获取汇总和明细的数据") |
| | | public AjaxResult getTransitionInfo(@RequestParam("tjNumber") String tjNumber) { |
| | | QueryWrapper<TbTransition> wrapper = new QueryWrapper<>(); |
| | | wrapper.select("parent_pro_id", "parent_pro_name", "sum(ord_price) as ord_price") |
| | | wrapper.select("parent_pro_id", "parent_pro_name", "sum(now_price) as ord_price") |
| | | .eq("tj_num", tjNumber) |
| | | .groupBy("parent_pro_name"); |
| | | .groupBy("parent_pro_id"); |
| | | List<TbTransition> list = transitionService.list(wrapper); |
| | | List<Long> parentProIds = list.stream().map(item -> item.getParentProId()).collect(Collectors.toList()); |
| | | LambdaQueryWrapper<TjProject> projectQueryWrapper = new LambdaQueryWrapper<>(); |
| | |
| | | if (null != order.getFinishTime()) return AjaxResult.error("该人员已签离,不可撤销!!!"); |
| | | |
| | | String s = configService.selectConfigByKey("is_request_common_his_api"); |
| | | if (null != s && s.equals("Y") && "2".equals(order.getTjType())) { |
| | | // if (null != s && s.equals("Y") && "2".equals(order.getTjType())) { |
| | | if (null != s && s.equals("Y")) { |
| | | String apiUrl = configService.selectConfigByKey("common_api_url"); |
| | | String hospbm = configService.selectConfigByKey("common_api_service_hospbm"); |
| | | |
| | |
| | | } |
| | | } |
| | | String s = configService.selectConfigByKey("is_request_common_his_api"); |
| | | if (null != s && s.equals("Y") && "2".equals(order.getTjType())) { |
| | | // if (null != s && s.equals("Y") && "2".equals(order.getTjType())) { |
| | | if (null != s && s.equals("Y")) { |
| | | ArrayList<TjFlowingWater> weizhifu = new ArrayList<>(); |
| | | ArrayList<TjFlowingWater> yizhifu = new ArrayList<>(); |
| | | for (String bldh : dto.getBldhs()) { |
| | |
| | | } |
| | | |
| | | |
| | | @GetMapping(value = "newgetTransitionList") |
| | | @ApiOperation(value = "最新查询过渡表数据") |
| | | public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "客户id") String cusId) { |
| | | List<TbTransition> list= transitionService.newgetTransitionList(cusId); |
| | | return AjaxResult.success(list); |
| | | } |
| | | |
| | | |
| | | } |
| | | |