Merge remote-tracking branch 'origin/master'

zhaowenxuan

7 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

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

@@ -181,7 +181,7 @@
            ksproList = projectService.getKsTjProjectIdList();
        }

        if (ksproList == null || ksproList.size() == 0) {
        if (ksproList == null || ksproList.isEmpty()) {
            return AjaxResult.error("请完善科室项目信息");
        }
        List<TjCustomer> customerLis = new ArrayList<>();
@@ -822,8 +822,10 @@
    @ApiOperation(value = "医生点击体检信息详情(只显示父项目列表)")
//    修改按照科室查询
    public AjaxResult getParentList(@ApiParam(value = "客户体检号") @RequestParam String tjNumber,
                                    @ApiParam(value = "已检未检状态 0 未检 1已检") @RequestParam Integer type) {
                                    @ApiParam(value = "已检未检状态 0 未检 1已检") @RequestParam(required = false) Integer type) {
        if(type == null)type= 0;
        String userId = SecurityUtils.getLoginUser().getUserId();
        log.info("当前登录用户ID ->{}",userId);
        Integer ksId = null;
        SysUser sysUser = null;
        if (null != userId) {
@@ -858,7 +860,8 @@
                            AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
                            if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
                                int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
                                if (sfsf > 0) {
                                int sfsf1 = ltkjJianchajianyanTreeService.getCallSfsfByCardId(tjOrder.getCardId());
                                if (sfsf > 0 || sfsf1 > 0) {
                                    log.error("路泰科技---  " + DateUtil.date() + " 存在未缴费项目的 就单数  " + sfsf);
                                    log.error("路泰科技---  " + DateUtil.date() + " 存在未缴费项目的 就诊号  " + tjOrder.getCardId() + " 体检号 " + tjOrder.getTjNumber());
                                    return AjaxResult.error("存在未缴费项目");
@@ -896,6 +899,7 @@
                }
            }
        }
        log.info("type ->{},查询关联科室集合 ->{}",type,split);
            List<TjOrderRemark> list;
            if(null != sysUser && sysUser.getUserName().equals("10001")){
                if(type !=1){
@@ -911,6 +915,7 @@
                }
            }
            if (null ==list || list.isEmpty()) {
                log.info("触发该科室下无项目");
                return AjaxResult.error("该科室下无项目！");
            }
            for (TjOrderRemark tjOrderRemark : list) {