zhaowenxuan
2025-06-18 75ee6a6218f67d3720f9ab8824809ddb2abe525c
陕健医his开单传科室修改
2个文件已修改
38 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -321,6 +321,9 @@
                        String sfsyhisjgrulebaoliuweishu = configService.selectConfigByKey("sfsyhisjgrulebaoliuweishu");
                        // his价格传递规则 1四舍五入 2直接舍去
                        String sfsyhisjgrulesconfig = configService.selectConfigByKey("sfsyhisjgrulesconfig");
                        // 传递项目是否使用his科室
                        String isUseHisKs = configService.selectConfigByKey("isCreateMenZhenFyUseHisKs");
                        String createMenZhenFyZJUseHisKs = configService.selectConfigByKey("createMenZhenFyZJUseHisKs");
                        for (TbTransition transition : list) {
                            LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
@@ -358,8 +361,13 @@
                            obj.putOpt("danJia", danjia);
                            obj.putOpt("jieSuanJe", allPrice);
                            obj.putOpt("shuliang", sl);
                            obj.putOpt("zhiXingKs", dept.getDeptId());
                            obj.putOpt("zhiXingKsMc", dept.getDeptName());
                            if (isUseHisKs.equalsIgnoreCase("Y")) {
                                obj.putOpt("zhiXingKs", dept.getHisksid());
                                obj.putOpt("zhiXingKsMc", dept.getHisksmc());
                            }else {
                                obj.putOpt("zhiXingKs", dept.getDeptId());
                                obj.putOpt("zhiXingKsMc", dept.getDeptName());
                            }
                            obj.putOpt("shouFeiXmId", project.getHisXmbm());
                            obj.putOpt("shouFeiXmMc", project.getHisXmmc());
@@ -377,7 +385,12 @@
                            obj.putOpt("danJia", zongjia);
                            obj.putOpt("jieSuanJe", zongjia);
                            obj.putOpt("shuliang", sl);
                            obj.putOpt("zhiXingKs", "100");
                            if (isUseHisKs.equalsIgnoreCase("Y")) {
                                if (StrUtil.isBlank(createMenZhenFyZJUseHisKs)) return AjaxResult.error();
                                obj.putOpt("zhiXingKs", createMenZhenFyZJUseHisKs);
                            }else {
                                obj.putOpt("zhiXingKs", "100");
                            }
                            obj.putOpt("zhiXingKsMc","体检中心");
                            obj.putOpt("shouFeiXmId", tjfhisxmbm);
                            obj.putOpt("shouFeiXmMc", "体检费");
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1517,6 +1517,9 @@
            String sfsyhisjgrulebaoliuweishu = configService.selectConfigByKey("sfsyhisjgrulebaoliuweishu");
            // his价格传递规则 1四舍五入 2直接舍去
            String sfsyhisjgrulesconfig = configService.selectConfigByKey("sfsyhisjgrulesconfig");
            // 传递项目是否使用his科室
            String isUseHisKs = configService.selectConfigByKey("isCreateMenZhenFyUseHisKs");
            String createMenZhenFyZJUseHisKs = configService.selectConfigByKey("createMenZhenFyZJUseHisKs");
            for (TbTransition transition : list) {
                LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
@@ -1553,8 +1556,13 @@
                obj.putOpt("danJia", danjia);
                obj.putOpt("jieSuanJe", allPrice);
                obj.putOpt("shuliang", sl);
                obj.putOpt("zhiXingKs", dept.getDeptId());
                obj.putOpt("zhiXingKsMc", dept.getDeptName());
                if (isUseHisKs.equalsIgnoreCase("Y")){
                    obj.putOpt("zhiXingKs", dept.getHisksid());
                    obj.putOpt("zhiXingKsMc", dept.getHisksmc());
                }else {
                    obj.putOpt("zhiXingKs", dept.getDeptId());
                    obj.putOpt("zhiXingKsMc", dept.getDeptName());
                }
                obj.putOpt("shouFeiXmId", project.getHisXmbm());
                obj.putOpt("shouFeiXmMc", project.getHisXmmc());
                array.add(obj);
@@ -1571,7 +1579,12 @@
                obj.putOpt("danJia", zongjia);
                obj.putOpt("jieSuanJe", zongjia);
                obj.putOpt("shuliang", sl);
                obj.putOpt("zhiXingKs", "100");
                if (isUseHisKs.equalsIgnoreCase("Y")){
                    if (StrUtil.isBlank(createMenZhenFyZJUseHisKs)) return AjaxResult.error();
                    obj.putOpt("zhiXingKs", createMenZhenFyZJUseHisKs);
                }else {
                    obj.putOpt("zhiXingKs", "100");
                }
                obj.putOpt("zhiXingKsMc","体检中心");
                obj.putOpt("shouFeiXmId", tjfhisxmbm);
                obj.putOpt("shouFeiXmMc", "体检费");