zjh
2025-03-24 30616665503726b49cb627cf59a9460e59523bee
zjh20250324
3个文件已修改
36 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
@@ -337,7 +337,7 @@
                creatTable(object, tabName, connection);
            } catch (SQLException e) {
                log.error(String.valueOf(e),e.getMessage());
                return AjaxResult.error();
//                return AjaxResult.error();
            }
        }
        //插入数据
@@ -345,7 +345,7 @@
            operationTable(object,connection,hisApiConfig,paramsJson,code);
        } catch (SQLException e) {
            log.error(String.valueOf(e),e.getMessage());
            return AjaxResult.error();
//            return AjaxResult.error();
        }finally {
            try {
                connection.close();
@@ -481,7 +481,7 @@
            String key = entry.getKey().trim().toLowerCase();
            if (StrUtil.isBlank(defaultVal) || defaultVal.equals("null"))
                continue;
            String val = defaultVal.trim().replaceAll("\\s+", "");
            String val = defaultVal.trim().replaceAll("\\s+", "").replaceAll("[^\\x00-\\x7F]", "");
            if (primaryKesList.contains(key)) {
                deleteSqlBuilder.append(key).append(" = '").append(val).append("' and ");
            }
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -713,7 +713,7 @@
            }
            return AjaxResult.error("该人员数据正在同步中,请稍等");
        } catch (InterruptedException e) {
            e.printStackTrace();
            log.error(String.valueOf(e),e.getMessage());
            return AjaxResult.error("该人员数据正在同步中,请稍等");
        }finally {
            lock.unlock();
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -18,6 +18,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import jodd.util.StringUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -333,4 +334,31 @@
        }
        return AjaxResult.error("暂无体检记录");
    }
    @GetMapping ("/getYxJcXxJg")
    @ApiOperation (value = "获取影像检查骨密度心电图结果接口")
    @Transactional
    public AjaxResult getYxJcXxJg(@ApiParam (value = "体检号") @RequestParam String tjNumber,
                                @ApiParam (value = "项目id") @RequestParam String proId) {
        TjOrder order = orderService.getOrderByTjNum(tjNumber);
        if(null !=order){
            TjProject project = projectService.getById(proId);
            if(null !=project){
                List<TjProject> projects = projectService.getTjProjectListBySoneId(proId);
                LambdaQueryWrapper<TjOrderDetail>wq1=new LambdaQueryWrapper<>();
                wq1.eq(TjOrderDetail::getProId,projects.get(0).getProParentId());
                wq1.eq(TjOrderDetail::getOrderId,order.getOrderId());
                TjOrderDetail detail = detailService.getOne(wq1);
                if(null !=detail && StringUtil.isNotBlank(detail.getProResult())){
                    Map<String,Object> map=new HashMap<>();
                    String string = detail.getProResult();
                }
            }
            return AjaxResult.success();
        }
        return AjaxResult.error("暂无体检记录");
    }
}