zjh20250604

zjh

2025-06-04 2e1fc763314f7231780c7d6e36fd6922548b285a

zjh20250604

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

@@ -283,10 +283,11 @@

                ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(),ltkjExamJcsqd.getJcxmid());
                boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);

                log.info("手动同步检查结果状态 ->{}",ltkjExamJcsqd.getJgzt());
                if(StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())){
                    jcycxmService.deletedByTjh(order.getTjNumber());
                    String[] split = ltkjExamJcsqd.getJgzt().replaceAll("\n", "").split("。|；|;|,|，");
                    log.info("进入检查结果异常提取分割方法体 ->{}->{}",order.getTjNumber(),split);
                    for (String jg : split) {
                        if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")

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

@@ -430,7 +430,7 @@

    public void zongjianshengchengyichangxiangmu(String s, String yqbm) {
        TjOrder order = orderService.getOrderByTjNum(s);
        jcycxmService.deletedByTjh(order.getCardId());
        jcycxmService.deletedByTjh(s);
        List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
        if(null !=list && !list.isEmpty()){
            for (LtkjExamJcsqd jcsqd : list) {

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

@@ -245,9 +245,11 @@
            tjFlowingWater.setIsAddition("Y");
            if (tjFlowingWater.getPayStasus().toString().equals("0")) {
                tjFlowingWater.setPayStasus(0L);
                tjFlowingWater.setZfgf(tjFlowingWater.getPayStasus().toString());
            } else {
                tjFlowingWater.setPayStasus(1L);
            }
            tjFlowingWater.setZfgf(tjFlowingWater.getPayStasus().toString());
            if (tjFlowingWaterService.save(tjFlowingWater)) {

                Date dates = new Date();

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

@@ -1430,7 +1430,7 @@
                        else hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
                    }
                } catch (Exception e) {
                    log.error(String.valueOf(e),e.getMessage());
                    log.error("发生错误 ->{}"+String.valueOf(e),e.getMessage());
                    throw new IllegalStateException();
                }
                return AjaxResult.success(tjNumber);

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java

@@ -180,6 +180,10 @@
    @ApiModelProperty(value = "加项标志")
    private String jxbz;


    @ApiModelProperty(value = "自费工费")
    private String zfgf;

    /**
     * 收费id
     */

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

@@ -111,7 +111,7 @@
    List<Map<String ,Object >> getCusInfoListByCardAndName(@Param("card") String card,@Param("name") String name);


    @Select("SELECT IF(b.cus_sex=0,'男','女') xb FROM tj_order a JOIN tj_customer b ON b.cus_id=a.user_id \n" +
    @Select("SELECT IF(b.cus_sex=0,'0','1') xb FROM tj_order a JOIN tj_customer b ON b.cus_id=a.user_id \n" +
            "WHERE a.tj_number=#{tjNumber}")
    String getSexByTjh(String tjNumber);
}