zjh20240927 修改驾驶员体检登记失败的问题

zjh

2024-09-27 59363c48a5977f4df327d87085d4c565c06bc96c

zjh20240927  修改驾驶员体检登记失败的问题

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

@@ -972,10 +972,11 @@
            tjOrder.setFinishTime(new Date());
            tjOrder.setCheckStatus(1);
            tjOrder.setStatus(TjConstants.TJ_WAIT);
            tjFlowingWater.setPayStasus(1L);
        }else {
            tjFlowingWater.setPayStasus(0L);
//            tjFlowingWater.setPayStasus(1L);
        }
//        else {
            tjFlowingWater.setPayStasus(0L);
//        }
        if (tjOrderService.save(tjOrder)) {

            //保存收货地址
@@ -1048,8 +1049,6 @@
            if (tjFlowingWaterService.save(tjFlowingWater)) {
                tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
                tjOrderService.updateById(tjOrder);


            }

            //修改每项的原价现价 //修改临时表体检号
@@ -1065,6 +1064,7 @@
                    if(null !=jzh && null !=jzh.toString()){
                        hisApiMethod.ZfHisApiMethod(jzh.toString());
                    }
                    log.info("该登记人挂号失败, 就诊号为: "+tjOrder.getCardId());
                    return AjaxResult.error("挂号失败!" + result.get("msg").toString());
                }

@@ -1079,16 +1079,18 @@
                    newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
                }
                // 查询 对接Lis、Pacs申请如果类型包含在配置内则使用对接lis、pacs
                String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
                String[] split = useLisAndPacsRegisterDictTeam.split(",");
                List<String> list = Arrays.asList(split);
                if (list.contains(tjOrder.getTjType())) {
                    List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(),tjOrder.getCardId());
                    pacsApiMethodService.save(tjOrder,tjCustomer,detailList);
                    lisApiMethod.save(tjOrder,tjCustomer,detailList);
                }else {
                    hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
                }
//                String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
//                String[] split = useLisAndPacsRegisterDictTeam.split(",");
//                List<String> list = Arrays.asList(split);
//                if (list.contains(tjOrder.getTjType())) {
//                    List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(),tjOrder.getCardId());
//                    pacsApiMethodService.save(tjOrder,tjCustomer,detailList);
//                    lisApiMethod.save(tjOrder,tjCustomer,detailList);
//                }else {
//                    hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
//                }

                hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());

                return AjaxResult.success(tjNumber);
            } else {
@@ -1838,7 +1840,6 @@
                dto.setJzqk(9);
                controller.Outpinimpapply(dto);
            }*/

            return AjaxResult.success("签离成功！");
        } else {
            return getAjaxResult(tjNumber);
@@ -2276,7 +2277,8 @@
    public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
        tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
        if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
            tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
            tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),
                    String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId(),String.valueOf(tjFlowingWater.getTjSerialNumber()));
        } else {
            tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
        }
@@ -2305,7 +2307,7 @@
            tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
            tjFlowingWater.setPayType(4L);
            tjFlowingWaterService.updateById(tjFlowingWater);
            asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
//            asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
        }
    }


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

@@ -141,16 +141,18 @@
            "  create_by,\n" +
            "  is_sampling,\n" +
            "  create_id,\n" +
            "  pro_type) \n" +
            "  pro_type," +
            "flowing_water_id) \n" +
            "  \n" +
            "  SELECT #{orderId},a.pro_id,IFNULL(b.pro_default,''),'1',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) " +
            "  SELECT #{orderId},a.pro_id,IFNULL(b.pro_default,''),'1',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) ,#{sl}" +
            "FROM tb_transition a LEFT JOIN tj_project b ON a.pro_id=b.pro_id  WHERE a.cus_id=#{cusId} AND a.card_id=#{cardId} \n" +
            "\t\t\n" +
            "\tUNION\n" +
            "  \n" +
            "\tSELECT #{orderId},a.parent_pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0)" +
            "\tSELECT #{orderId},a.parent_pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) ,#{sl}" +
            " FROM tb_transition a LEFT JOIN tj_project b ON a.parent_pro_id=b.pro_id  WHERE a.cus_id=#{cusId} AND a.card_id=#{cardId} GROUP BY a.parent_pro_id")
    boolean saveJSYTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId,@Param("cardId") String cardId);
    boolean saveJSYTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId,
                                         @Param("cardId") String cardId,@Param("sl") String sl);




 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java

@@ -96,7 +96,7 @@

    boolean saveTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId,String cardId);

    boolean saveJSYTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId,String cardId);
    boolean saveJSYTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId,String cardId,String sl);


    boolean saveTjPureToneTesByCusId(String cusId,String tjNum,String userName, String userId,String cardId);

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java

@@ -146,8 +146,8 @@
    }

    @Override
    public boolean saveJSYTjOrderDetailsByCusId(String cusId, String orderId, String userName, String userId,String cardId) {
        return tjOrderDetailMapper.saveJSYTjOrderDetailsByCusId(cusId,orderId,userName,userId,cardId);
    public boolean saveJSYTjOrderDetailsByCusId(String cusId, String orderId, String userName, String userId,String cardId,String sl) {
        return tjOrderDetailMapper.saveJSYTjOrderDetailsByCusId(cusId,orderId,userName,userId,cardId,sl);
    }

    @Override