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

@@ -117,6 +117,9 @@
    @DeleteMapping("/{ids}")
    @ApiOperation(value = "删除单位部门信息")
    public AjaxResult remove(@PathVariable String[] ids) {
        if (!dwGroupingService.list(new LambdaQueryWrapper<TjDwGrouping>().in(TjDwGrouping::getDwDeptId,Arrays.asList(ids))).isEmpty()){
            return AjaxResult.error("该部门下有分组信息，请先删除分组信息!");
        }
        return toAjax(dwDeptService.removeByIds(Arrays.asList(ids)));
    }


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

@@ -1507,8 +1507,16 @@
            List<TbTransition> list = tbTransitionService.list(wrapper);
            BigDecimal zongjia = new BigDecimal("0.0");

            // his直接单开体检费单项目总价编码
            String tjfhisxmbm = configService.selectConfigByKey("tjfhisxmbm");
            // 是否开启his直接单开体检费单项目 N使用明细开单 其他都为单项目开总价
            String lycdzjhmxj = configService.selectConfigByKey("lycdzjhmxj");
            // 是否使用his价格传递规则 Y开启
            String sfsyhisjgrule = configService.selectConfigByKey("sfsyhisjgrule");
            // his价格传递规则保留得位数 默认2位
            String sfsyhisjgrulebaoliuweishu = configService.selectConfigByKey("sfsyhisjgrulebaoliuweishu");
            // his价格传递规则 1四舍五入 2直接舍去
            String sfsyhisjgrulesconfig = configService.selectConfigByKey("sfsyhisjgrulesconfig");

            for (TbTransition transition : list) {
                LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
@@ -1524,6 +1532,24 @@
                int sl = 1;
                BigDecimal danjia = transition.getNowPrice();
                BigDecimal allPrice = danjia.multiply(new BigDecimal(sl));
                if (StrUtil.isNotBlank(sfsyhisjgrule) && sfsyhisjgrule.equalsIgnoreCase("Y")){
                    int baoliuweishu = 2;
                    if (StrUtil.isNotBlank(sfsyhisjgrulebaoliuweishu)){
                        try {
                            baoliuweishu = Integer.parseInt(sfsyhisjgrulebaoliuweishu);
                        } catch (NumberFormatException e) {
                            log.error("his价格传递规则保留位数转换异常 配置值->{}\n{}{}",sfsyhisjgrulebaoliuweishu,e,e.getMessage());
                            return AjaxResult.error();
                        }
                    }
                    if (StrUtil.isNotBlank(sfsyhisjgrulesconfig) && !sfsyhisjgrulesconfig.equalsIgnoreCase("1")){
                        // 其他自定义的规则计算方法
                    }else {
                        // 四舍五入
                        danjia = danjia.setScale(baoliuweishu, RoundingMode.HALF_UP);
                        allPrice = danjia.multiply(new BigDecimal(sl)).setScale(baoliuweishu, RoundingMode.HALF_UP);
                    }
                }
                obj.putOpt("danJia", danjia);
                obj.putOpt("jieSuanJe", allPrice);
                obj.putOpt("shuliang", sl);
@@ -1538,6 +1564,7 @@
            if(StringUtil.isNotBlank(lycdzjhmxj) && lycdzjhmxj.equalsIgnoreCase("N")){
                map.put("feiYongInfoList", array);
            }else {
                zongjia = tjFlowingWater.getPaidIn();
                JSONArray zjarray = JSONUtil.createArray();
                JSONObject obj = JSONUtil.createObj();
                int sl = 1;

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

@@ -107,7 +107,8 @@



    @Select("SELECT a.id pac_id,grouping_name pac_name,a.ys_price price , GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) allProName FROM   tj_dw_grouping a  JOIN tj_grouping_pro b ON b.grouping_id=a.id \n" +
    @Select("SELECT a.id pac_id,grouping_name pac_name,a.ys_price price , GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) allProName FROM  " +
            " tj_dw_grouping a  JOIN tj_grouping_pro b ON b.grouping_id=a.id \n" +
            "WHERE a.deleted=0 and a.dw_id=#{dwId} AND (a.sex=#{sex} or a.sex=2) GROUP BY b.grouping_id")
    List<TjPackage> huoqutuantitaocanxiangmu(@Param("dwId") String dwId,@Param("sex") Long sex);
}