ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java

@@ -87,6 +87,10 @@
                TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
                if(null !=water){
                    water.setPayStasus(1L);
                    water.setSfjs("1");
                    water.setJsrq(new Date());
                    water.setJsrxm("his回调");
                    water.setJsrdm("999");
                    if (tjFlowingWaterService.updateById(water)) {
                        String jxbz = water.getJxbz();
                        if(StringUtil.isNotBlank(jxbz)){

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

@@ -245,13 +245,15 @@
            TjCustomer customer = customerService.getById(tjSampling.getCusId());
            if(null !=customer){
                TjOrder order = orderService.getOrderByTjNum(tjSampling.getTjNum());
                customer.setCompName(order.getFirmName());
                customer.setCusName(customer.getCusName());
                customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                customer.setTjNumber(tjSampling.getTjNum());
                customer.setApplicationTime(tjSampling.getApplicationTime());
                tjCustomers.add(customer);
                if(null !=order){
                    customer.setCompName(order.getFirmName());
                    customer.setCusName(customer.getCusName());
                    customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                    customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                    customer.setTjNumber(tjSampling.getTjNum());
                    customer.setApplicationTime(tjSampling.getApplicationTime());
                    tjCustomers.add(customer);
                }
            }
        }
        HashMap<String, Object> hashMap = new HashMap<>();

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

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

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

    @ApiModelProperty(value = "是否结算 0未 1已 ")
    private String sfjs;

    @ApiModelProperty(value = "结算日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date jsrq;

    @ApiModelProperty(value = "结算人代码")
    private String jsrdm;

    @ApiModelProperty(value = "结算人姓名")
    private String jsrxm;

    /**
     * 收费id
     */