zjh20250723

zjh

3 天以前 8e4922026e05dceffa44d913a234bbc489f1be6c

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

@@ -1420,15 +1420,19 @@
//                        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);
                        String isUseMx = configService.selectConfigByKey("jcxhis_is_use_mx");
                        if (isUseMx.equalsIgnoreCase("Y"))
                            hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
                        else
                            hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
                        try {
                            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);
                            String isUseMx = configService.selectConfigByKey("jcxhis_is_use_mx");
                            if (isUseMx.equalsIgnoreCase("Y"))
                                hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
                            else
                                hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
                        } catch (Exception e) {
                            throw new IllegalStateException("申请单发送失败!" + result.get("msg").toString());
                        }
                    }
                } catch (Exception e) {
                    log.error("发生错误 ->{}" + String.valueOf(e), e.getMessage());
@@ -2949,10 +2953,12 @@
            for (TbTransition tbTransition : list) {
                if (tbTransition.getParentProId().toString().equals(project.getProId().toString())) {
                    JSONObject obj = JSONUtil.createObj();
                    TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, tbTransition.getParentProId().toString());
                    obj.putOpt("index", index++);
                    obj.putOpt("parent_pro_name", tbTransition.getParentProName());
                    obj.putOpt("price", tbTransition.getOrdPrice());
                    obj.putOpt("ks", dept.getDeptName());
                    if(null !=remark) obj.putOpt("sfzt", remark.getSfbz());
                    huiZong.add(obj);
                }
            }