zjh20250307

zjh

2025-03-07 5d26355c3c630ffc26be575f5ed52b1b2cae46e4

zjh20250307

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java

@@ -2989,6 +2989,8 @@
                    if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())
                            && entry.getKey().getType() == 1
                            && !ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId()))) {

                        TjProject tjProjectq = projectService.getById(tjOrderDetail.getProject().getProParentId());
                        TjPdfVO tjPdfVO = new TjPdfVO();
                        tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
                        tjPdfVO.setProResult(tjOrderDetail.getProResult());
@@ -2999,11 +3001,17 @@
                            tjPdfVO.setCompany("/");
                        }
                        tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
//                        LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
//                        wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId());
//                        wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()))
//                                .or().eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjProjectq.getHisXmbm()));
//                        wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
                        LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
                        wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId());
                        wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()))
                                .or().eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getHisXmbm()));
                        wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
                        wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId())
                                .and(w -> w.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()))
                                        .or()
                                        .eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjProjectq.getHisXmbm()))).orderByDesc(LtkjExamJcbgd::getZdsj);

                        List<LtkjExamJcbgd> list = jcbgdService.list(wrapper);
                        if (null != list && !list.isEmpty()) {
                            LtkjExamJcbgd jcbgd = list.get(0);

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

@@ -209,6 +209,7 @@
                                @ApiParam (value = "体检单号") @RequestParam (required = false) String tjNumber,
                                @ApiParam (value = "单位") @RequestParam (required = false) Long compId,
                                @ApiParam (value = "姓名)") @RequestParam (required = false) String name,
                                @ApiParam (value = "套餐名)") @RequestParam (required = false) String tcm,
                                @ApiParam (value = "开始时间") @RequestParam (required = false) String beginTime,
                                @ApiParam (value = "结束时间") @RequestParam (required = false) String endTime) {

@@ -294,7 +295,8 @@
        if (name == null) name = "";
        if (beginTime == null) beginTime = "";
        if (endTime == null) endTime = "";
        return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name));
        if (tcm == null) tcm = "";
        return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name,tcm));
    }



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

@@ -550,7 +550,7 @@
                wq.isNull(TjOrder::getPrintLastTime);
            }
            if (zt == 6) {
                //已出报告
                //已打印
                wq.isNotNull(TjOrder::getPrintLastTime);
                wq.eq(TjOrder::getHeshouStatus, 1);
                wq.isNotNull(TjOrder::getPrintLastTime);
@@ -609,7 +609,7 @@
                        order.setZt("报告核收");
                    }
                    if (zt == 6) {
                        order.setZt("已出报告");
                        order.setZt("已打印");
                    }
                } else {
                    if (czwj == 0) {
@@ -637,8 +637,8 @@
                        order.setZt("报告核收");
                    }
                    if (null != lastTime) {
                        //已出报告6
                        order.setZt("已出报告");
                        //已打印6
                        order.setZt("已打印");
                    }
                }
            }
@@ -3818,7 +3818,7 @@
                        a = 5;
                    }
                    if (null != lastTime) {
                        //已出报告
                        //已打印
                        a = 6;
                    }
                    map.put("tjNUm", tjNUm);

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

@@ -1910,6 +1910,29 @@
        }
    }


    @GetMapping("/xiugaidayinzhuangtai")
    @ApiOperation(value = "修改打印状态接口")
    @Transactional
    public AjaxResult xiugaidayinzhuangtai(@RequestParam String tjNumber) {
        TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
        if(null !=order){
            Date date=new Date();
            TjReportPrint print=new TjReportPrint();
            print.setTjNumber(tjNumber);
            print.setPrintBy(SecurityUtils.getLoginUser().getUser().getNickName());
            print.setPrintTime(date);
            print.setPrintStatus("已打印");
            if (printService.save(print)) {
                order.setPrintLastTime(date);
                order.setStatus(TjConstants.TJ_END);
                tjOrderService.updateById(order);
            }
            return AjaxResult.success();
        }
     return AjaxResult.error();
    }

    /**
     * 通过sql 重整数据模板 全部重新生成
     *

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

@@ -958,7 +958,7 @@
                }


                reservation.setPacId(dwDept.getId());
                reservation.setPacId(dwGrouping.getId());
                compPay = compPay.add(dwGrouping.getYsPrice());
//                reservation.setTjType(String.valueOf(1));
                reservation.setTeamNo(teamNo);

 ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java

@@ -110,7 +110,7 @@
                // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                .antMatchers("/login", "/register", "/captchaImage","/cus/**","/getCaptchaConfigKey","/report/jmreport/**",
                        "/sqlserver/getdata/**","/api/His/**","/system/config/zx","/system/config/gxxmpym","/system/report/savePdf",
                        "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi","/check/pacs","/check/ceshicc").permitAll()
                        "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi","/check/pacs","/check/ceshicc","/system/report/xiugaidayinzhuangtai").permitAll()
                .antMatchers("/common/uploadImgExe","/common/listExeVal","/pacs/InvokeRisService/**").permitAll()
                .antMatchers("/check/dataSynchronizationApi","/reservation/reservation/linkage").permitAll()
                // 静态资源，可匿名访问

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

@@ -34,7 +34,7 @@

    @Insert("INSERT INTO  ltkj_exam_jcsqd \n" +
            "SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw,\n" +
            "a.yxzd jgzt,a.yxbx jgbx,sysdate()\n" +
            "a.yxzd jgzt,a.bg_nr jgbx,sysdate()\n" +
            "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.xmmc")
    void saveLtkjExamJcsqd(String tjh);


 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java

@@ -130,7 +130,7 @@

    //存储过程专用接口(初审)
    Map<String,Object> getCsCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize,
                                                     Integer checkStatus, String compId, String beginTime, String endTime,String tjname);
                                                     Integer checkStatus, String compId, String beginTime, String endTime,String tjname,String tcm);

    public int selectTjOrderByCardId(String cardId);


 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java

@@ -246,7 +246,8 @@
    }

    @Override
    public Map<String, Object> getCsCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize, Integer checkStatus, String compId, String beginTime, String endTime, String tjname) {
    public Map<String, Object> getCsCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize,
                                                               Integer checkStatus, String compId, String beginTime, String endTime, String tjname,String tcm) {
        Map<String, Object> map = new HashMap<>();
        map.put("checkStatus",checkStatus);
        map.put("page",page);
@@ -254,6 +255,7 @@
        map.put("tjNumber",tjNumber);
        map.put("compId",compId);
        map.put("tjname",tjname);
        map.put("tcm",tcm);
        map.put("beginTime",beginTime);
        map.put("endTime",endTime);
        List<List<?>> list = tjOrderMapper.getCsCunChuGuoChengCustomerList(map);

 ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml

@@ -351,6 +351,7 @@
                #{tjname,mode=IN,jdbcType=VARCHAR},
                #{beginTime,mode=IN,jdbcType=VARCHAR},
                #{endTime,mode=IN,jdbcType=VARCHAR},
                #{tcm,mode=IN,jdbcType=VARCHAR},
                #{total,mode=OUT,jdbcType=INTEGER}
            )}
    </select>