zjh 2024/01/23--2

zjh

2024-01-23 a6e6348c8008fd3984fc0f42323c17b322be142f

zjh 2024/01/23--2

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

@@ -413,10 +413,10 @@
    }

    /**
     * 影像检查页面列表
     * 化验检查页面列表
     */
    @GetMapping("/huaYangetProList")
    @ApiOperation("影像检查页面列表")
    @ApiOperation("化验检查页面列表")
    public AjaxResult huaYangetProList(@ApiParam(value = "体检单号") @RequestParam(required = false) String tjNumber,
                                 @ApiParam(value = "0未检,1已检") @RequestParam(defaultValue = "0") Integer type,
                                 @ApiParam(value = "姓名)") @RequestParam(required = false) String name,
@@ -454,9 +454,9 @@
            ksproList = projectService.getKsTjProjectIdList();
        }

        //筛选影像的项目。
        //筛选化验的项目。
        ksproList = ksproList.stream()
                .filter(element -> element ==1633660948860522589L)
                .filter(element -> element ==1633660948860522629L)
                .collect(Collectors.toList());
        if (ksproList == null || ksproList.size() == 0) {
            return AjaxResult.error("请完善科室项目信息");
@@ -623,10 +623,10 @@


    /**
     * 化验检查页面列表
     * 影像检查页面列表
     */
    @GetMapping("/yingXiangGetProList")
    @ApiOperation("化验检查页面列表")
    @ApiOperation("影像检查页面列表")
    public AjaxResult yingXiangGetProList(@ApiParam(value = "体检单号") @RequestParam(required = false) String tjNumber,
                                       @ApiParam(value = "0未检,1已检") @RequestParam(defaultValue = "0") Integer type,
                                       @ApiParam(value = "姓名)") @RequestParam(required = false) String name,
@@ -663,19 +663,20 @@
        } else {
            ksproList = projectService.getKsTjProjectIdList();
        }
        //筛选化验的项目。
        //筛选影像的项目。
        ksproList = ksproList.stream()
                .filter(element -> element ==1633660948860522629L ||  element ==1633660948860522504L
                        ||
                        element ==1633660948860522507L||  element ==1633660948860522508L
                        ||
                        element ==1633660948860522515L||  element ==1633660948860522516L
                        ||
                        element ==1633660948860522517L||  element ==1633660948860522519L
                        ||
                        element ==1633660948860522524L||  element ==1633660948860522530L
                        ||
                        element ==1633660948860522531L||  element ==1633660948860522533L
                .filter(element -> element ==1633660948860522589L
//                        ||  element ==1633660948860522504L
//                        ||
//                        element ==1633660948860522507L||  element ==1633660948860522508L
//                        ||
//                        element ==1633660948860522515L||  element ==1633660948860522516L
//                        ||
//                        element ==1633660948860522517L||  element ==1633660948860522519L
//                        ||
//                        element ==1633660948860522524L||  element ==1633660948860522530L
//                        ||
//                        element ==1633660948860522531L||  element ==1633660948860522533L
                )
                .collect(Collectors.toList());


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

@@ -560,8 +560,10 @@
                                    project.getProId());
                            String s = tjFlowingWaterService.getDiscount(OrderId);
                            if(null !=decimal){
                                project.setProPrice(decimal.setScale(2));
                                project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
//                                project.setProPrice(decimal.setScale(2));
                                project.setProPrice(decimal);
//                                project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
                                project.setProOrdPrice(decimal);
                            }else {
                                BigDecimal decimal1 = transitionService.getTbTransitionDxPriceAndOrdPrice(String.valueOf(order.getUserId()),project.getProId());
                                if(null !=decimal1){

 ltkj-admin/src/test/java/ImageTextExtractor.java

@@ -27,9 +27,13 @@
    }

    public static void main(String[] args) throws IOException {
        String imagePath = "C:\\Users\\w\\Pictures\\Saved Pictures\\333.png";
        String imagePath = "C:\\Users\\w\\Pictures\\Saved Pictures\\a.png";
        String extractedText = extractTextFromImage(imagePath);
        System.out.println(extractedText);
        System.out.println("============================================================");
        String imagePath1 = "C:\\Users\\w\\Pictures\\Saved Pictures\\b.png";
        String extractedText1 = extractTextFromImage(imagePath1);
        System.out.println(extractedText1);
    }
}


 ltkj-admin/src/test/java/zjhTest.java

@@ -65,45 +65,17 @@
    @Test
    public void test() {
//        List<DictHosp> list = dictHospService.list();
//        DateTime dateTime1 = DateUtil.offsetMonth(new Date(),100);
//        for (DictHosp dictHosp : list) {
//        DateTime dateTime1 = DateUtil.offsetMonth(new Date(),6);
//        String mallMerchantSecretKey = SecurityUtils.getMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getHospAreaName(),dictHosp.getExpirationTime());
//        String mallMerchantSecretKey = SecurityUtils.getMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getHospAreaName(),dateTime1);
//            dictHosp.setSecretKey(mallMerchantSecretKey);
//            dictHosp.setExpirationTime(DateUtil.offsetDay(new Date(),30));
//            dictHosp.setExpirationTime(dateTime1);
//            dictHospService.updateById(dictHosp);
//        System.out.println(dateTime1);
//        System.out.println("=================================================");
//        System.out.println(mallMerchantSecretKey);

//        List<Object> list=new ArrayList<>();
//        ScanOptions options = ScanOptions.scanOptions().match("cS*").build();
//        try (Cursor<byte[]> cursor = redisTemplate.executeWithStickyConnection(redisConnection -> {
//            return redisConnection.scan(options);
//        })) {
//            while (cursor.hasNext()) {
//                byte[] keyBytes = cursor.next();
//                String key = new String(keyBytes);
//                // 处理匹配的key
//                List<Object> multiCacheMapValue = redisCache.getMultiCacheMapValue(key, null);
//                list.add(multiCacheMapValue);
//            }
//        }
//        System.out.println(list);
//        System.out.println(redisCache.getMultiCacheMapValue("check",null));
//        }

/*        LambdaQueryWrapper<TjProject> wq=new LambdaQueryWrapper<>();
        wq.eq(TjProject::getProParentId,0);
        List<TjProject> projectList = projectService.list(wq);
        for (TjProject project : projectList) {
            LambdaQueryWrapper<TjProject> wqq=new LambdaQueryWrapper<>();
            wqq.eq(TjProject::getProParentId,project.getProId());
            List<TjProject> list = projectService.list(wqq);
            for (TjProject tjProject : list) {
                tjProject.setDeptId(project.getDeptId());
                projectService.updateById(tjProject);
            }
        }*/
    }



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

@@ -190,13 +190,16 @@
    boolean saveTemoTransitionByGroupingId(@Param("cusId")String cusId,@Param("groupingId")String groupingId);


    @Select("SELECT b.price_now FROM \n" +
            "(SELECT a.pac_id FROM tb_transition a  WHERE\n" +
            "\ta.cus_id = #{cusId} \n" +
            "GROUP BY\n" +
            "\ta.pac_id) aa \n" +
            "LEFT JOIN tj_package_project b\n" +
            "\tON aa.pac_id=b.pac_id WHERE b.pro_id=#{proId} ")
//    @Select("SELECT b.price_now FROM \n" +
//            "(SELECT a.pac_id FROM tb_transition a  WHERE\n" +
//            "\ta.cus_id = #{cusId} \n" +
//            "GROUP BY\n" +
//            "\ta.pac_id) aa \n" +
//            "LEFT JOIN tj_package_project b\n" +
//            "\tON aa.pac_id=b.pac_id WHERE b.pro_id=#{proId} ")
//    BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);

    @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{cusId} AND a.parent_pro_id=#{proId}")
    BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);



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

@@ -139,7 +139,7 @@
            "SELECT #{tjNum},b.cus_id,b.cus_name,'1633660948860522619','纯音听阈'," +
            "#{userName},SYSDATE(),#{userId} FROM tb_transition a LEFT JOIN tj_customer b " +
            "ON a.cus_id=b.cus_idcard WHERE a.cus_id=#{cusId} AND a.parent_pro_id IN('1633660948860522619') GROUP BY a.cus_id")
    boolean saveTjPureToneTesByCusId(String cusId,String tjNum,String userName, String userId);
    boolean saveTjPureToneTesByCusId(@Param("cusId")String cusId,@Param("tjNum")String tjNum,@Param("userName")String userName,@Param("userId") String userId);


    @Update("UPDATE tj_order_detail a SET\n" +