zjh 2023/10/31--1

zjh

2023-10-31 47aed74050e956919f2eee588fbab15607cf4029

zjh 2023/10/31--1

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -886,7 +886,6 @@
    @Override
    @Async("async")
    public void saveNewReservationConfirm(List<TjReservation> rightList) {
        long l = System.currentTimeMillis();
        if(null !=rightList && rightList.size()>0){
            //创建线程池
            ExecutorService threadPool = Executors.newFixedThreadPool(rightList.size());
@@ -908,15 +907,11 @@
                });
            }
        }
        long ll = System.currentTimeMillis();

        System.out.println("这段代码执行时间为"+ (ll-l));
    }

    @Override
    @Async("async")
    public void updateCheckType(String tjNum) {
//        AjaxResult ajaxResult = getAjaxResult(tjNum);
        redisCache.setCacheMapValue("updateCheckType"+tjNum,tjNum,getAjaxResult(tjNum));
    }

@@ -1316,14 +1311,12 @@
        return customerList;
    }
    //总检点击体检信息详情
    private AjaxResult getAjaxResult(String tjNumber) {
    private List<Map<String, Object>> getAjaxResult(String tjNumber) {
        List<Map<String, Object>> list = new ArrayList<>();
        TjOrder one = orderService.getOrderByTjNum(tjNumber);

        if (one == null) {
            return AjaxResult.error("暂无数据！！");
            return list;
        }

        TjCustomer customer = tjCustomerService.getById(one.getUserId());
        List<TjOrderRemark> remarkList = orderRemarkService.getRemarkListByTjNumAndType(tjNumber);

@@ -1340,7 +1333,11 @@
                if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                        final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
                         if(null==byId){
                             tjOrderDetailService.removeById(tjOrderDetail.getOrderDetailId());
                        }else {
                        tjOrderDetail.setProject(byId);
                        }
                        List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
                        if (list2.size() == 0) {
                            tjOrderDetail.setStandard(new TjStandard());
@@ -1366,14 +1363,10 @@
                        parent.put("doctorName", userService.getById(remark.getDoctorName()).getNickName());
                    }
                    list.add(parent);
                } else {
                    return AjaxResult.success("该客户没有体检项目数据");
                }
//                }
            }
            return AjaxResult.success(list);
        }
        return AjaxResult.success("该客户没有体检项目数据！");
        return list;
    }
    //已签收/未签收
    private List<Map<String, Object>>  getYWqsResult(int a) {

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

@@ -540,7 +540,8 @@
            return AjaxResult.success("操作失败");
        }
        for (TjOrderRemark orderRemark : remarklList) {
            if (null != orderRemark.getSummaryList() && orderRemark.getSummaryList().size()>0 ) {
            List<String> summaryList = orderRemark.getSummaryList();
            if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null) ) {
                orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
            }
            LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
@@ -581,7 +582,6 @@
                        }
                    }
                }
                //-----------------------------------end
                asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order);
                LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
                qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
@@ -600,7 +600,7 @@
                    remarkService.save(remark);
                } else {
                    one.setRemark(orderRemark.getRemark());
                    if (orderRemark.getSummaryList() != null) {
                    if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
                        one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
                    }
                    one.setDeptId(orderRemark.getDeptId());

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

@@ -413,6 +413,7 @@
                            LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
                            wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
                            transitionService.remove(wqq);
                            asyncService.updateCheckType(tjNumber);
                            return AjaxResult.success("操作成功");
                        }
                        return AjaxResult.error("操作失败");
@@ -434,16 +435,17 @@
     */
    @GetMapping("/updateCheckType")
    @ApiOperation(value = "总检点击体检信息详情")
//    @PreAuthorize("@ss.hasPermi('check:check:updateCheckType')")
    public AjaxResult updateCheckType(@ApiParam(value = "客户体检号") @RequestParam String tjNumber) {
        if(redisCache.hasKey("updateCheckType"+tjNumber)) {
            return redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
            List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
            return AjaxResult.success(cacheMapValue);
        }
        return getAjaxResult(tjNumber);
    }

    private AjaxResult getAjaxResult(String tjNumber) {
        final long l = System.currentTimeMillis();

        asyncService.updateCheckType(tjNumber);
        List<Map<String, Object>> list = new ArrayList<>();
        TjOrder one = orderService.getOrderByTjNum(tjNumber);

@@ -467,7 +469,11 @@
                if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                        final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
                        if(null==byId){
                            detailService.removeById(tjOrderDetail.getOrderDetailId());
                        }else {
                        tjOrderDetail.setProject(byId);
                        }
                        List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
                        if (list2.size() == 0) {
                            tjOrderDetail.setStandard(new TjStandard());
@@ -498,8 +504,6 @@
                }
//                }
            }
            final long l1 = System.currentTimeMillis();
            System.out.println("++++++++++++++++++++++++++++++++++++++++++==============="+(l1-l));
            return AjaxResult.success(list);
        }
        return AjaxResult.success("该客户没有体检项目数据！");

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

@@ -498,8 +498,12 @@
                            tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                            tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
                            tjRefundVo.setIdCard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                            if (null != order.getDictCompName())
                                tjRefundVo.setTjComp(compService.getById(order.getFirmId()) != null ? compService.getById(order.getFirmId()).getCnName() : null);
                            if (null != order.getFirmId()){
                                DictComp byId = compService.getById(order.getFirmId());
                                if(null != byId){
                                    tjRefundVo.setTjComp(byId.getCnName());
                                }
                            }
                            if (null != order.getTjType()) tjRefundVo.setTjType(order.getTjType());
                            TjFlowingWater one = tjFlowingWaterService.getOne(new LambdaQueryWrapper<TjFlowingWater>()
                                    .eq(TjFlowingWater::getOrderId, order.getOrderId())

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

@@ -807,8 +807,11 @@
            if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
            if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
            if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
            if (null != tjReservation.getGroupingId()) tjOrder.setGroupId(tjReservation.getGroupingId());
            if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
            if (null != tjReservation.getGroupingId()){
                tjOrder.setGroupId(tjReservation.getGroupingId());
                tjOrder.setFirmDeptId(tjReservation.getPacId());
            }
//            if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
            tjReservation.setIsExpire(1);
            tjReservationService.updateById(tjReservation);
            if (null != tjReservation.getTeamNo()) {
@@ -891,7 +894,6 @@

            //团体
            if ("1".equals(tjOrder.getTjType())) {
                tjOrder.setFirmDeptId(tjOrder.getPacId());
                asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
            }


 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java

@@ -117,22 +117,22 @@
    /**
     * 婚姻
     */
    @ExcelExport(value = "婚姻",kv = "0-未婚;1-已婚;2-离婚;3-丧偶",sort =8)
    @ExcelImport(value = "婚姻状况", kv = "0-未婚;1-已婚;2-离婚;3-丧偶")
    @ExcelExport(value = "婚姻状况",kv = "1-未婚;2-已婚;4-离婚;3-丧偶",sort =8)
    @ExcelImport(value = "婚姻状况", kv = "1-未婚;2-已婚;4-离婚;3-丧偶",required = true)
    @ApiModelProperty("婚姻")
    private Integer marriage;

    /**
     * 民族
     */
    @ExcelExport(value = "民族",kv = "0-汉族;1-蒙古族;2-回族;3-藏族;4-维吾尔族;6-苗族;7-彝族;8-壮族;9-布依族;10-朝鲜族;11-满族;12-侗族;13-瑶族;14-白族;15-土家族;16-哈尼族;17-哈萨克族;\" +\n" +
            "            \"18-傣族;19-黎族;20-傈傈族;21-佤族;22-畲族;23-高山族;24-拉祜族;25-水族;26-东乡族;27-纳西族;28-景颇族;29-柯尔克孜族;30-土族;31-达斡尔族;32-仫佬族;33-羌族;34-布朗族;34-撒拉族;35-毛南族\" +\n" +
            "            \"37-仡佬族;38-锡伯族;39-阿昌族;40-普米族;41-塔吉克族;42-怒族;43-乌孜别克族;44-俄罗斯族;45-鄂温克族;46-德昂族;47-保安族;48-裕固族;49-京族;50-塔塔尔族;51-独龙族;52-鄂伦春族;53-赫哲族;\" +\n" +
            "            \"54-门巴族;55-珞巴族;56-基诺族;57-其他民族或外国友人",sort =2)
    @ExcelImport(value = "民族", kv = "0-汉族;1-蒙古族;2-回族;3-藏族;4-维吾尔族;6-苗族;7-彝族;8-壮族;9-布依族;10-朝鲜族;11-满族;12-侗族;13-瑶族;14-白族;15-土家族;16-哈尼族;17-哈萨克族;" +
    @ExcelExport(value = "民族",kv = "1-汉族;2-蒙古族;3-回族;4-藏族;5-维吾尔族;6-苗族;7-彝族;8-壮族;9-布依族;10-朝鲜族;11-满族;12-侗族;13-瑶族;14-白族;15-土家族;16-哈尼族;17-哈萨克族;" +
            "18-傣族;19-黎族;20-傈傈族;21-佤族;22-畲族;23-高山族;24-拉祜族;25-水族;26-东乡族;27-纳西族;28-景颇族;29-柯尔克孜族;30-土族;31-达斡尔族;32-仫佬族;33-羌族;34-布朗族;34-撒拉族;35-毛南族" +
            "37-仡佬族;38-锡伯族;39-阿昌族;40-普米族;41-塔吉克族;42-怒族;43-乌孜别克族;44-俄罗斯族;45-鄂温克族;46-德昂族;47-保安族;48-裕固族;49-京族;50-塔塔尔族;51-独龙族;52-鄂伦春族;53-赫哲族;" +
            "54-门巴族;55-珞巴族;56-基诺族;57-其他民族或外国友人")
            "54-门巴族;55-珞巴族;56-基诺族;57-其他民族或外国友人;99-未说明",sort =2)
    @ExcelImport(value = "民族", kv = "1-汉族;2-蒙古族;3-回族;4-藏族;5-维吾尔族;6-苗族;7-彝族;8-壮族;9-布依族;10-朝鲜族;11-满族;12-侗族;13-瑶族;14-白族;15-土家族;16-哈尼族;17-哈萨克族;" +
            "18-傣族;19-黎族;20-傈傈族;21-佤族;22-畲族;23-高山族;24-拉祜族;25-水族;26-东乡族;27-纳西族;28-景颇族;29-柯尔克孜族;30-土族;31-达斡尔族;32-仫佬族;33-羌族;34-布朗族;34-撒拉族;35-毛南族" +
            "37-仡佬族;38-锡伯族;39-阿昌族;40-普米族;41-塔吉克族;42-怒族;43-乌孜别克族;44-俄罗斯族;45-鄂温克族;46-德昂族;47-保安族;48-裕固族;49-京族;50-塔塔尔族;51-独龙族;52-鄂伦春族;53-赫哲族;" +
            "54-门巴族;55-珞巴族;56-基诺族;57-其他民族或外国友人;99-未说明")
    @ApiModelProperty("民族")
    private Integer nation;


 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java

@@ -179,7 +179,7 @@
            "\ttj_grouping_pro a\n" +
            "\tLEFT JOIN tj_project b ON a.pro_id = b.pro_id \n" +
            "\tLEFT JOIN tj_project c ON c.pro_parent_id=b.pro_id\n" +
            "WHERE 1=1 AND a.grouping_id =#{groupingId} ")
            "WHERE 1=1 AND a.grouping_id =#{groupingId} and c.deleted=0 ")
    boolean saveTemoTransitionByGroupingId(@Param("cusId")String cusId,@Param("groupingId")String groupingId);



 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwDeptMapper.java

@@ -78,7 +78,9 @@
    @Select("\n" +
            "SELECT aa.bg_type, aa.dw_name,aa.batch,aa.dept,sum(aa.people_count) people_count,sum(aa.yj_count) yj_count,(sum(aa.people_count)-sum(aa.yj_count))wj_count FROM (\n" +
            "\n" +
            "SELECT '团体' bg_type, a.company dw_name,COUNT(DISTINCT a.team_no) batch,a.department dept,COUNT(*) people_count, 0 yj_count,0 wj_count  FROM tj_reservation a WHERE a.deleted=0 AND a.grouping_id IN (\n" +
            "SELECT '团体' bg_type, r.cn_name dw_name,COUNT(DISTINCT a.team_no) batch,a.department dept,COUNT(*) people_count, 0 yj_count,0 wj_count  FROM tj_reservation a " +
            "LEFT JOIN dict_comp r ON a.company_id=r.drug_manufacturer_id" +
            " WHERE a.deleted=0 AND a.grouping_id IN (\n" +
            "\n" +
            "   SELECT b.id FROM tj_dw_grouping b WHERE b.deleted=0 AND b.dw_dept_id=#{dwDeptId}\n" +
            "\t \n" +