zjh20250226

zjh

2025-02-26 263413a9ade62a8501acbbc60157d48ca51a9f9d

zjh20250226

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

@@ -681,7 +681,7 @@

                        if (null != project.getHisXmbm()) {
                            if (project.getSfzhfy().equals("Y")) {
                                mapJinchuan.add(project.getProParentId().toString());
                                mapJinchuan.add(project.getProId().toString());
                                //TODO 这里detailsDto 改成传递所有的小项 检验是合并之后进行发送 一个样本代码一次请求
                                // 所有的小项全部添加到这个集合之中
                                OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();

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

@@ -1212,16 +1212,16 @@
            /*调用his接口*/
            String config = configService.selectConfigByKey("sfkqdyhis");
            if (null != config && config.equals("Y")) {
//                AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder);
//                if (!result.get("code").toString().equals("200")) {
//                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//                    Object jzh = result.get("jzh");
//                    if (null != jzh && null != jzh.toString()) {
//                        hisApiMethod.ZfHisApiMethod(jzh.toString());
//                    }
//                    log.info("该登记人挂号失败, 就诊号为: " + tjOrder.getCardId());
//                    return AjaxResult.error("挂号失败!" + result.get("msg").toString());
//                }
                AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder);
                if (!result.get("code").toString().equals("200")) {
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    Object jzh = result.get("jzh");
                    if (null != jzh && null != jzh.toString()) {
                        hisApiMethod.ZfHisApiMethod(jzh.toString());
                    }
                    log.info("该登记人挂号失败, 就诊号为: " + tjOrder.getCardId());
                    return AjaxResult.error("挂号失败!" + result.get("msg").toString());
                }

                log.info("该登记人的his就诊号是: " + tjOrder.getCardId());
                //团体