zjh20250625

zjh

8 天以前 3620453ef3ebf3ba1542c180d942443a4a934d67

zjh20250625

 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/TjFlowingWaterController.java

@@ -1340,7 +1340,7 @@
                            list2.add(tjConsumables);
                        }
                    }
                    if (null != list && list.size() > 0) {
                    if (null != list && !list.isEmpty()) {
                        ArrayList<TjConsumables> collectw = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
                        for (TjConsumables tjConsumables : collectw) {
                            LambdaQueryWrapper<TjChargingStandard> wqq = new LambdaQueryWrapper<>();
@@ -1365,4 +1365,38 @@
        }
        return AjaxResult.error();
    }



    @GetMapping("/gettuantijiesuanrenyuan")
    @ApiOperation(value = "获取团体结算人员")
    public AjaxResult gettuantijiesuanrenyuan(@RequestParam(required = false) @ApiParam("单位ID") String dwId,
                                              @RequestParam(required = false) @ApiParam("登记开始时间") String djkssj,
                                              @RequestParam(required = false) @ApiParam("登记结束时间") String djjssj,
                                              @RequestParam(required = false) @ApiParam("结算开始时间") String jskssj,
                                              @RequestParam(required = false) @ApiParam("结算结束时间") String jsjssj,
                                              @RequestParam(required = false) @ApiParam("体检号") String tjh,
                                              @RequestParam(required = false) @ApiParam("结算人id") String jsrid,
                                              @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize,
                                              @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page) {

        if (StringUtil.isNotBlank(dwId)) dwId = "";
        if (StringUtil.isNotBlank(djkssj)) djkssj = "";
        if (StringUtil.isNotBlank(djjssj)) djjssj = "";
        if (StringUtil.isNotBlank(jskssj)) jskssj = "";
        if (StringUtil.isNotBlank(jsjssj)) jsjssj = "";
        if (StringUtil.isNotBlank(tjh)) tjh = "";
        if (StringUtil.isNotBlank(jsrid)) jsrid = "";
        return AjaxResult.success(tjFlowingWaterService.gettuantijiesuanrenyuan(page, pageSize,dwId,djkssj, djjssj, jskssj, jsjssj, tjh, jsrid));
    }



    @PostMapping("/tuantijiesuan")
    @ApiOperation(value = "团体结算")
    public AjaxResult tuantijiesuan(@RequestParam(required = false) @ApiParam("单位ID") List<String> dwId) {

        return AjaxResult.success();
    }

}

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

@@ -245,13 +245,16 @@
            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

@@ -184,6 +184,20 @@
    @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
     */

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

@@ -2,6 +2,7 @@

import java.util.Date;
import java.util.List;
import java.util.Map;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjFlowingWater;
@@ -107,4 +108,8 @@

    @Select("call tj_bl(#{tjh,mode=IN})")
    void getTjBlCall(@Param("tjh") String tjh);


    //存储过程专用接口(获取团体结算人员情况信息)
    List<List<?>> gettuantijiesuanrenyuan(Map<String,Object> map);
}

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

@@ -2,6 +2,7 @@

import java.util.Date;
import java.util.List;
import java.util.Map;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjFlowingWater;
@@ -77,4 +78,6 @@
    void deleteTjOrderDetailByjxbz(String bldh);

    void getTjBlCall(String tjh);

    Map<String,Object> gettuantijiesuanrenyuan(Integer page, Integer pageSize, String dwId, String djkssj, String djjssj, String jskssj, String jsjssj, String tjh, String jsrid);
}

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

@@ -1,7 +1,6 @@
package com.ltkj.hosp.service.impl;

import java.util.Date;
import java.util.List;
import java.util.*;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.common.utils.DateUtils;
@@ -128,4 +127,24 @@
    public void getTjBlCall(String tjh) {
        tjFlowingWaterMapper.getTjBlCall(tjh);
    }

    @Override
    public Map<String, Object> gettuantijiesuanrenyuan(Integer page, Integer pageSize,
                                                       String dwId, String djkssj, String djjssj, String jskssj, String jsjssj, String tjh, String jsrid) {
        Map<String, Object> map = new HashMap<>();
        map.put("page",page);
        map.put("pageSize",pageSize);
        map.put("dwId",dwId);
        map.put("djkssj",djkssj);
        map.put("djjssj",djjssj);
        map.put("jskssj",jskssj);
        map.put("jsjssj",jsjssj);
        map.put("tjh",tjh);
        map.put("jsrid",jsrid);
        List<List<?>> list = tjFlowingWaterMapper.gettuantijiesuanrenyuan(map);
        Map<String,Object> map1=new HashMap<>();
        map1.put("customers",list);
        map1.put("total",map.get("total"));
        return map1;
    }
}

 ltkj-hosp/src/main/resources/mapper/hosp/TjFlowingWaterMapper.xml

@@ -132,4 +132,20 @@
            #{tj_serial_number}
        </foreach>
    </delete>
</mapper>


    <select id="gettuantijiesuanrenyuan" parameterType="java.util.Map"  statementType="CALLABLE" resultType="java.util.Map">
        {call gettuantijiesuanrenyuan(
                #{page,mode=IN,jdbcType=INTEGER},
                #{pageSize,mode=IN,jdbcType=INTEGER},
                #{dwId,mode=IN,jdbcType=VARCHAR},
                #{djkssj,mode=IN,jdbcType=VARCHAR},
                #{djjssj,mode=IN,jdbcType=VARCHAR},
                #{jskssj,mode=IN,jdbcType=VARCHAR},
                #{jsjssj,mode=IN,jdbcType=VARCHAR},
                #{tjh,mode=IN,jdbcType=VARCHAR},
                #{jsrid,mode=IN,jdbcType=VARCHAR},
                #{total,mode=OUT,jdbcType=INTEGER}
              )}
    </select>
</mapper>