zjh 2024-08-12

zjh

2024-08-12 d2651c4328e699a4407c518c4695779795199661

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

@@ -1431,7 +1431,8 @@
                HashMap<String, Object> hisRequestParams = new HashMap<>();
                // 不在需要身份证号
                hisRequestParams.put("patientId",tjOrder.getCardId());
                AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
                log.info("ltkj--- "+DateUtil.date()+"操作人id: "+userId+"操作科室: "+sysUser.getDeptId()+"操作的体检人: "+tjNumber);
            AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
                if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
//                    List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
//                    BigDecimal cateFeeAll = BigDecimal.ZERO;
@@ -1549,7 +1550,7 @@
    }

    @Transactional
    private void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
    public void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
        tjFlowingWater.setPayStasus(1L);
        tjFlowingWater.setPayType(0L);
        tjFlowingWater.setTollCollectorId("148");
@@ -1735,20 +1736,15 @@
    /**
     * 根据项目id获取建议
     */
    @GetMapping("/getDeptAdvice/{proId}")
    @GetMapping("/getDeptAdvice")
    @ApiOperation(value = "根据项目id获取建议")
    public AjaxResult getDeptAdvice(@ApiParam(value = "父项目项目id") @PathVariable String proId) {
        List<TjAdvice> list = new ArrayList<>();
    public AjaxResult getDeptAdvice(@ApiParam(value = "父项目项目id") @RequestParam(required = false) String proId) {
        LambdaQueryWrapper<TjAdvice> wq1 = new LambdaQueryWrapper<>();
        wq1.eq(TjAdvice::getProId, proId);
        List<TjAdvice> list1 = tjAdviceService.list(wq1);
        //如果没有项目id  就返回所有的建议集合
        if (list1.size() == 0) {
            return AjaxResult.success(tjAdviceService.list());
        if(null !=proId){
            wq1.eq(TjAdvice::getProId, proId);
        }
        for (TjAdvice tjAdvice : list1) {
            list.add(tjAdvice);
        }
        wq1.last("limit 20");
        List<TjAdvice> list = tjAdviceService.list(wq1);
        return AjaxResult.success(list);
    }