ltkj_peis.git - gitblit

parent: 4df73104 | 补丁 | 提交 | ignore whitespace

zjh20250305

zjh

2025-03-04 6b2687b46f8de04041f2a815b410211649cf3ed7

zjh20250305

3个文件已修改

	ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java	57 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java

@@ -146,6 +146,7 @@
        if (projects != null && !projects.isEmpty()) {
            String dept = configService.selectConfigByKey("request_default_dept");
            String ysbm = configService.selectConfigByKey("request_default_ysbm");
            String ysmc = configService.selectConfigByKey("request_default_ysmc");
            for (TjProject project : projects) {
                if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
                    if (null != project.getHisXmbm()) {
@@ -176,7 +177,7 @@
                        savePacsApply.setApplyDepment(dept);
                        savePacsApply.setApplyDepmentName("体检中心");
                        savePacsApply.setApplyDoctor(ysbm);
                        savePacsApply.setApplyDoctorName("王健萍");
                        savePacsApply.setApplyDoctorName(ysmc);
                        savePacsApply.setExecDepment(dept);
                        savePacsApply.setExecDepmentName("体检中心");
                        savePacsApply.setCreateTime(savePacsApply.getApplyDate());

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

@@ -1447,31 +1447,35 @@
        if (null == tjOrder) {
            return AjaxResult.error("未找到体检记录");
        }
        LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
        tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
        tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition, "N");
        TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
        if (null != tjFlowingWater) {
            if (tjFlowingWater.getPayStasus() != 1 && tjFlowingWater.getPayStasus() != 3) {
                if (configByKey.equals("Y")) {
                    HashMap<String, Object> hisRequestParams = new HashMap<>();
                    // 不在需要身份证号
                    hisRequestParams.put("patientId", tjOrder.getCardId());
                    log.info("ltkj--- " + DateUtil.date() + "操作人id: " + userId + "操作科室: " + sysUser.getDeptId() + "操作的体检人: " + tjNumber);
                    AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
                    if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
                        int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
                        if (sfsf > 0) {
                            log.error("路泰科技---  " + DateUtil.date() + " 存在未缴费项目的 就单数  " + sfsf);
                            log.error("路泰科技---  " + DateUtil.date() + " 存在未缴费项目的 就诊号  " + tjOrder.getCardId() + " 体检号 " + tjOrder.getTjNumber());
                            return AjaxResult.error("存在未缴费项目");

        SysDept dept = deptService.getById(ksId);

        if(null !=dept && !dept.getDeptName().contains("体检中心")){
            LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
            tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
            tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition, "N");
            TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
            if (null != tjFlowingWater) {
                if (tjFlowingWater.getPayStasus() != 1 && tjFlowingWater.getPayStasus() != 3) {
                    if (configByKey.equals("Y")) {
                        HashMap<String, Object> hisRequestParams = new HashMap<>();
                        // 不在需要身份证号
                        hisRequestParams.put("patientId", tjOrder.getCardId());
                        log.info("ltkj--- " + DateUtil.date() + "操作人id: " + userId + "操作科室: " + sysUser.getDeptId() + "操作的体检人: " + tjNumber);
                        AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
                        if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
                            int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
                            if (sfsf > 0) {
                                log.error("路泰科技---  " + DateUtil.date() + " 存在未缴费项目的 就单数  " + sfsf);
                                log.error("路泰科技---  " + DateUtil.date() + " 存在未缴费项目的 就诊号  " + tjOrder.getCardId() + " 体检号 " + tjOrder.getTjNumber());
                                return AjaxResult.error("存在未缴费项目");
                            }
                            extracted(tjOrder, tjFlowingWater);
                        } else {
                            log.error("路泰科技--- " + DateUtil.date() + " 未查询到缴费记录的 就诊号  " + tjOrder.getCardId() + " 体检号 " + tjOrder.getTjNumber());
                            return AjaxResult.error("未查询到缴费记录");
                        }
                        extracted(tjOrder, tjFlowingWater);
                    } else {
                        log.error("路泰科技--- " + DateUtil.date() + " 未查询到缴费记录的 就诊号  " + tjOrder.getCardId() + " 体检号 " + tjOrder.getTjNumber());
                        return AjaxResult.error("未查询到缴费记录");
                    }
                }
//                String s = configService.selectConfigByKey("is_request_common_his_api");
//                if (null != s && s.equals("Y")) {
//                    LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>();
@@ -1482,10 +1486,11 @@
//                        return AjaxResult.error("存在未缴费项目");
//                    }
//                }
                }
            } else {
                log.error("路泰科技--- " + DateUtil.date() + " 未对接his接口 " + " 体检号 " + tjOrder.getTjNumber());
                return AjaxResult.error("未查询到缴费记录");
            }
        } else {
            log.error("路泰科技--- " + DateUtil.date() + " 未对接his接口 " + " 体检号 " + tjOrder.getTjNumber());
            return AjaxResult.error("未查询到缴费记录");
        }

        String config = configService.selectConfigByKey("qt_open_xdt");

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

@@ -1236,19 +1236,22 @@
                }*/
                // 查询 对接Lis、Pacs申请如果类型包含在配置内则使用对接lis、pacs
                if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
                    log.info("调用his开启 进入不收费方法 该体检人员不收费:"+tjOrder.getTjNumber());
                    // 这是上面个人方法引入数据
                    tjFlowingWater.setPayStasus(1L);
                    newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
//                    AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
//                    if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
                    AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
                    if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
                    tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
                            sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
                    remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
                    List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
                    xdPictureService.saveBatch(xdPictureList);
//                    List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
//                    addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
                    List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
                    addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
                    log.info("调用his开启 进入不收费方法 该方法执行完毕");
                } else {
                    log.info("调用his开启 进入收费方法 该体检人员不收费:"+tjOrder.getTjNumber());
                    newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
                    List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
                    addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);

			@@ -146,6 +146,7 @@
			if (projects != null && !projects.isEmpty()) {
			String dept = configService.selectConfigByKey("request_default_dept");
			String ysbm = configService.selectConfigByKey("request_default_ysbm");
			String ysmc = configService.selectConfigByKey("request_default_ysmc");
			for (TjProject project : projects) {
			if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
			if (null != project.getHisXmbm()) {
			@@ -176,7 +177,7 @@
			savePacsApply.setApplyDepment(dept);
			savePacsApply.setApplyDepmentName("体检中心");
			savePacsApply.setApplyDoctor(ysbm);
			savePacsApply.setApplyDoctorName("王健萍");
			savePacsApply.setApplyDoctorName(ysmc);
			savePacsApply.setExecDepment(dept);
			savePacsApply.setExecDepmentName("体检中心");
			savePacsApply.setCreateTime(savePacsApply.getApplyDate());

			@@ -1447,31 +1447,35 @@
			if (null == tjOrder) {
			return AjaxResult.error("未找到体检记录");
			}
			LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
			tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
			tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition, "N");
			TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
			if (null != tjFlowingWater) {
			if (tjFlowingWater.getPayStasus() != 1 && tjFlowingWater.getPayStasus() != 3) {
			if (configByKey.equals("Y")) {
			HashMap<String, Object> hisRequestParams = new HashMap<>();
			// 不在需要身份证号
			hisRequestParams.put("patientId", tjOrder.getCardId());
			log.info("ltkj--- " + DateUtil.date() + "操作人id: " + userId + "操作科室: " + sysUser.getDeptId() + "操作的体检人: " + tjNumber);
			AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
			if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
			int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
			if (sfsf > 0) {
			log.error("路泰科技--- " + DateUtil.date() + " 存在未缴费项目的就单数 " + sfsf);
			log.error("路泰科技--- " + DateUtil.date() + " 存在未缴费项目的就诊号 " + tjOrder.getCardId() + " 体检号 " + tjOrder.getTjNumber());
			return AjaxResult.error("存在未缴费项目");

			SysDept dept = deptService.getById(ksId);

			if(null !=dept && !dept.getDeptName().contains("体检中心")){
			LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
			tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
			tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition, "N");
			TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
			if (null != tjFlowingWater) {
			if (tjFlowingWater.getPayStasus() != 1 && tjFlowingWater.getPayStasus() != 3) {
			if (configByKey.equals("Y")) {
			HashMap<String, Object> hisRequestParams = new HashMap<>();
			// 不在需要身份证号
			hisRequestParams.put("patientId", tjOrder.getCardId());
			log.info("ltkj--- " + DateUtil.date() + "操作人id: " + userId + "操作科室: " + sysUser.getDeptId() + "操作的体检人: " + tjNumber);
			AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
			if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
			int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
			if (sfsf > 0) {
			log.error("路泰科技--- " + DateUtil.date() + " 存在未缴费项目的就单数 " + sfsf);
			log.error("路泰科技--- " + DateUtil.date() + " 存在未缴费项目的就诊号 " + tjOrder.getCardId() + " 体检号 " + tjOrder.getTjNumber());
			return AjaxResult.error("存在未缴费项目");
			}
			extracted(tjOrder, tjFlowingWater);
			} else {
			log.error("路泰科技--- " + DateUtil.date() + " 未查询到缴费记录的就诊号 " + tjOrder.getCardId() + " 体检号 " + tjOrder.getTjNumber());
			return AjaxResult.error("未查询到缴费记录");
			}
			extracted(tjOrder, tjFlowingWater);
			} else {
			log.error("路泰科技--- " + DateUtil.date() + " 未查询到缴费记录的就诊号 " + tjOrder.getCardId() + " 体检号 " + tjOrder.getTjNumber());
			return AjaxResult.error("未查询到缴费记录");
			}
			}
			// String s = configService.selectConfigByKey("is_request_common_his_api");
			// if (null != s && s.equals("Y")) {
			// LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>();
			@@ -1482,10 +1486,11 @@
			// return AjaxResult.error("存在未缴费项目");
			// }
			// }
			}
			} else {
			log.error("路泰科技--- " + DateUtil.date() + " 未对接his接口 " + " 体检号 " + tjOrder.getTjNumber());
			return AjaxResult.error("未查询到缴费记录");
			}
			} else {
			log.error("路泰科技--- " + DateUtil.date() + " 未对接his接口 " + " 体检号 " + tjOrder.getTjNumber());
			return AjaxResult.error("未查询到缴费记录");
			}

			String config = configService.selectConfigByKey("qt_open_xdt");

			@@ -1236,19 +1236,22 @@
			}*/
			// 查询对接Lis、Pacs申请如果类型包含在配置内则使用对接lis、pacs
			if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
			log.info("调用his开启进入不收费方法该体检人员不收费:"+tjOrder.getTjNumber());
			// 这是上面个人方法引入数据
			tjFlowingWater.setPayStasus(1L);
			newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
			// AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
			// if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
			AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
			if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
			tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
			sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
			remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
			List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
			xdPictureService.saveBatch(xdPictureList);
			// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
			// addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
			List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
			addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
			log.info("调用his开启进入不收费方法该方法执行完毕");
			} else {
			log.info("调用his开启进入收费方法该体检人员不收费:"+tjOrder.getTjNumber());
			newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
			List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
			addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);