zjh20250407

zjh

2025-04-07 cdfd0e963d66721dfb0410598002273f7d26bc89

zjh20250407

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

@@ -1216,21 +1216,8 @@
                }
            }

            //修改每项的原价现价
//            transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
            //修改临时表体检号
            transitionService.updateTbTransitionTjNumByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber());
            //补差价
    /*        if(subtract.compareTo(BigDecimal.ZERO)>0){
                tjFlowingWater.setPaidIn(paidIn.add(subtract));
                TbTransition onwTbTransition = transitionService.getOnwTbTransition(tjCustomer.getCusIdcard(),tjOrder.getTjNumber());
                if(null !=onwTbTransition){
                    log.info("签到登记体检人: "+tjOrder.getTjNumber()+"给: "+onwTbTransition.getParentProName()+" "+onwTbTransition.getNowPrice()
                            +" 补差价 "+subtract+" 最终得 "+onwTbTransition.getNowPrice().add(subtract));
                    onwTbTransition.setNowPrice(onwTbTransition.getNowPrice().add(subtract));
                    transitionService.updateById(onwTbTransition);
                }
            }*/

            if (tjFlowingWaterService.save(tjFlowingWater)) {
                tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));

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

@@ -406,23 +406,6 @@


    @DataSource(value = DataSourceType.SLAVE_PACS)
//    @Select(" SELECT\n" +
//            "  trim(a.HIS_ID) tjh,\n" +
//            "  trim(a.HIS_ID) tmh,\n" +
//            "  trim(a.JCMID) xmdm,\n" +
//            "  a.JCMC xmmc,\n" +
//            "  NULL bg_mig,\n" +
//            "  NULL bg_url,\n" +
//            "  TRIM(a.JCSJ) bg_nr,\n" +
//            "  a.SHYS shysdm,\n" +
//            "  a.SHYS shysxm,\n" +
//            "  TRIM(a.JCJL) yxbx,\n" +
//            "  a.BGSJ zdsj,\n" +
//            "  a.SQRJ sqsj,\n" +
//            "  a.JCBW jcbw,\n" +
//            "  SYSDATE create_time\n" +
//            "FROM\n" +
//            "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE a.HIS_ID=#{tjNum}")
    @Select(" SELECT\n" +
            "  trim(a.HIS_ID) tjh,\n" +
            "  trim(a.HIS_ID) tmh,\n" +