zjh
2025-04-24 672ce84d5ce6545a0e81709ea736c69cbbef8c1a
zjh20250424
21个文件已修改
259 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application-dev.yml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application-linux-dev.yaml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application-prod.yml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application-test.yml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application-win-chkwyyprod.yaml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application-win-chkwyytest.yaml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application-win-pbkwyyprod.yaml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application-win-xamjyyprod.yaml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application-win-xamjyytest.yaml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-common/src/main/java/com/ltkj/common/utils/file/FileUploadUtils.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java
@@ -2,10 +2,10 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -48,6 +48,9 @@
    @Autowired
    private ServerConfig serverConfig;
    @Value("${path.xdtfilePath}")
    private String value;
    private static final String FILE_DELIMETER = ",";
@@ -92,8 +95,8 @@
    }
    /**
    *   重新写的上传图片   适用于体检套餐
    */
     *   重新写的上传图片   适用于体检套餐
     */
    @PostMapping("/packageUpload")
    public AjaxResult packageUpload(@RequestBody MultipartFile file) {
        String fileName = file.getOriginalFilename();
@@ -274,4 +277,33 @@
        }
        return AjaxResult.success("删除成功");
    }
    /**
     * 心电图报告上传图片方法
     */
    @PostMapping("/uploadXdtFile")
    @ApiOperation(value = "心电图报告上传图片方法")
    public AjaxResult uploadXdtFile(@ApiParam("文件") @RequestPart("file") MultipartFile file,
                                    @ApiParam("体检号") String tjh,@ApiParam("项目id") String proId) throws Exception {
        try {
            // 上传文件路径
            String filePath = value + File.separator;
            String outputFileName = tjh +"_" +proId;
            // 上传并返回新文件名称
            String fileName = FileUploadUtils.upload(filePath,outputFileName, file);
            String url = filePath + fileName;
            Path path = Paths.get(url);
            byte[] data = Files.readAllBytes(path);
            String base64 = Base64.getEncoder().encodeToString(data);
            AjaxResult ajax = AjaxResult.success();
            ajax.put("url", url);
            ajax.put("fileName", fileName);
            ajax.put("base64", base64);
            return ajax;
        } catch (Exception e) {
            return AjaxResult.error(e.getMessage());
        }
    }
}
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
@@ -9,10 +9,7 @@
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.LtkjJianchajianyanTree;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.hisDto.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
@@ -23,6 +20,7 @@
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.web.controller.system.TjCheckController;
import io.swagger.annotations.Api;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.NoTransactionException;
@@ -63,6 +61,8 @@
    private LtkjHybgdService hybgdService;
    @Autowired
    private ITjCustomerService tjCustomerService;
    @Autowired
    private TjJcycxmService jcycxmService;
    /**
     * 获取pacs检查数据
@@ -278,10 +278,31 @@
                ltkjExamJcsqd.setBw(checkParts);
                ltkjExamJcsqd.setJgzt(pacs.getStr("diagnosis"));
                ltkjExamJcsqd.setJgbx(pacs.getStr("examination"));
                ltkjExamJcsqd.setSgorzd("1");
                ltkjExamJcsqd.setCreateTime(new Date());
                ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(),ltkjExamJcsqd.getJcxmid());
                boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
                if(StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())){
                    jcycxmService.deletedByTjh(order.getTjNumber());
                    String[] split = ltkjExamJcsqd.getJgzt().replaceAll("\n", "").split("。|;|;|,|,");
                    for (String jg : split) {
                        if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
                                && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")){
                            TjJcycxm jcycxm=new TjJcycxm();
                            jcycxm.setTjh(order.getTjNumber());
                            jcycxm.setYqid("jczyy");
                            String[] split1 = ltkjExamJcsqd.getJcxmid().split(";");
                            jcycxm.setProId(split1[0]);
                            jcycxm.setProName(ltkjExamJcsqd.getJcxmmc());
                            jcycxm.setCreateTime(new Date());
                            jcycxm.setJcjg(jg);
                            jcycxmService.save(jcycxm);
                        }
                    }
                }
                LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
                ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
@@ -303,6 +324,7 @@
                ltkjExamJcbgd.setBgNr(ltkjExamJcsqd.getJgbx());
                ltkjExamJcbgd.setYxbx(ltkjExamJcsqd.getJgzt());
                ltkjExamJcbgd.setYxzd(ltkjExamJcsqd.getJgzt());
                ltkjExamJcbgd.setSgorzd("1");
                ltkjExamJcsqd.setCreateTime(new Date());
                ltkjExamJcbgdService.deletedLtkjJcbgdByTjhAndTmhA(ltkjExamJcsqd.getTjh(),ltkjExamJcsqd.getTmh());
                boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -392,7 +392,7 @@
        if(null !=list && !list.isEmpty()){
            for (LtkjExamJcsqd jcsqd : list) {
                if(StringUtil.isNotBlank(jcsqd.getJgzt())){
                    String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|;|;");
                    String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|;|;|,|,");
                    for (String jg : split) {
                        if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                && !jg.contains("未见明显异常") && !jg.contains("未见占位")
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -868,24 +868,38 @@
                                            jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
                                        jcbgd.setCreateTime(new Date());
                                        jcbgdService.save(jcbgd);
                                    }
                                    jcsqdService.saveLtkjExamJcsqd(order.getCardId());
                                    List<LtkjExamJcsqd> jcsqdList = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
                                    jcycxmService.deletedByTjh(order.getTjNumber());
                                    if(!jcsqdList.isEmpty()){
                                        for (LtkjExamJcsqd jcsqd : jcsqdList) {
                                            if(StringUtil.isNotBlank(jcsqd.getJgzt())){
                                                String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|;|;|,|,");
                                                for (String jg : split) {
                                                    if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                                            && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
                                                            && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")){
                                                        TjJcycxm jcycxm=new TjJcycxm();
                                                        jcycxm.setTjh(order.getTjNumber());
                                                        jcycxm.setYqid("jczyy");
                                                        String[] split1 = jcsqd.getJcxmid().split(";");
                                                        jcycxm.setProId(split1[0]);
                                                        jcycxm.setProName(jcsqd.getJcxmmc());
                                                        jcycxm.setCreateTime(new Date());
                                                        jcycxm.setJcjg(jg);
                                                        jcycxmService.save(jcycxm);
                                                    }
                                                }
                                            }
                                        }
                                    }
                                    testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
                                } else {
                                    resultMsg += "\n检查项目暂时未出结果,请稍后同步!!!";
                                }
                            }
                        }
                        /*        LambdaQueryWrapper<TjXdtgmdjg> wq = new LambdaQueryWrapper<>();
                        wq.eq(TjXdtgmdjg::getTjh, tjNumber);
                        List<TjXdtgmdjg> list = xdtgmdjgService.list(wq);
                        if (null != list && !list.isEmpty()) {
                            for (TjXdtgmdjg xdtgmdjg : list) {
                                pictureController.saveTjXdtgmdjgByJcbgd(xdtgmdjg);
                            }
                        }*/
                        if (StrUtil.isBlank(resultMsg))
                            return AjaxResult.success("同步成功");
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -1,5 +1,9 @@
package com.ltkj.web.controller.system;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.Security;
import java.util.*;
import java.util.stream.Collectors;
@@ -318,6 +322,28 @@
        Long deptId = SecurityUtils.getDeptId();
        log.info("影像检查骨密度心电图页面点击体检人员展示体检项目接口当前登录人科室"+deptId);
        List<CsProVo> list = remarkService.getYxJcXx(tjNumber,deptId.toString());
        if(null !=list && !list.isEmpty()){
            for (CsProVo vo : list) {
                LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
                wq.eq(TjXdtgmdjg::getTjh,tjNumber);
                wq.eq(TjXdtgmdjg::getProId,vo.getProId());
                TjXdtgmdjg xdtgmdjg = xdtgmdjgService.getOne(wq);
                if(null !=xdtgmdjg){
                    if(StringUtil.isNotBlank(xdtgmdjg.getUrl())){
                        Path path = Paths.get(xdtgmdjg.getUrl());
                        byte[] data = null;
                        try {
                            data = Files.readAllBytes(path);
                        } catch (IOException e) {
                            throw new RuntimeException(e);
                        }
                        String base64 = Base64.getEncoder().encodeToString(data);
                        if(StringUtil.isNotBlank(base64)) vo.setImageUrl(base64);
                    }
                }
            }
        }
        return AjaxResult.success(list);
    }
@@ -327,7 +353,8 @@
    public AjaxResult addYxJcXx(@ApiParam (value = "体检号") @RequestParam String tjNumber,
                                @ApiParam (value = "项目id") @RequestParam String proId,
                                @ApiParam (value = "检查所见") @RequestParam String jcsj,
                                @ApiParam (value = "检查结论") @RequestParam String jcjl) {
                                @ApiParam (value = "检查结论") @RequestParam String jcjl,
                                @ApiParam (value = "图片地址") @RequestParam(required = false) String url) {
        try {
            SysUser user = SecurityUtils.getLoginUser().getUser();
            TjOrder order = orderService.getOrderByTjNum(tjNumber);
@@ -360,6 +387,7 @@
                            xdtgmdjg.setJcjl(jcjl);
                            xdtgmdjg.setCreateBy(user.getNickName());
                            xdtgmdjg.setCreateId(user.getUserId().toString());
                            if(StringUtil.isNotBlank(url)) xdtgmdjg.setUrl(url);
                            xdtgmdjgService.save(xdtgmdjg);
                            saveTjXdtgmdjgByJcbgd(xdtgmdjg);
                        }
@@ -369,7 +397,6 @@
            }
            return AjaxResult.error("暂无体检记录");
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            log.error("提交影像检查骨密度心电图结果接口"+e.getMessage());
            throw new RuntimeException("提交影像检查骨密度心电图结果接口");
@@ -390,45 +417,22 @@
            jcbgd.setXmdm(xdtgmdjg.getProId());
            jcbgd.setXmmc(xdtgmdjg.getProName());
            jcbgd.setBgNr(xdtgmdjg.getJcsj());
            jcbgd.setBgUrl("");
            if(StringUtil.isNotBlank(xdtgmdjg.getUrl())){
                jcbgd.setBgUrl(xdtgmdjg.getUrl());
            }else {
                jcbgd.setBgUrl("");
            }
            jcbgd.setShysxm(xdtgmdjg.getCreateBy());
            jcbgd.setShysdm(xdtgmdjg.getCreateId());
            jcbgd.setYxzd(xdtgmdjg.getJcjl());
            jcbgd.setYxbx(xdtgmdjg.getJcjl());
            jcbgd.setYxbx("未见异常");
            jcbgd.setZdsj(DateUtil.format(date,"yyyy-MM-dd"));
            jcbgd.setJcbw("");
            jcbgd.setSqsj(DateUtil.format(date,"yyyy-MM-dd"));
            jcbgd.setLx("1");
            jcbgd.setCreateTime(date);
            jcbgdService.save(jcbgd);
            jcsqdService.deletedLtkjJcsqdByTjhandtmh1(xdtgmdjg.getCardId());
            jcsqdService.saveLtkjExamJcsqdxdt(xdtgmdjg.getCardId());
            LambdaQueryWrapper<TjJcycxm> wq=new LambdaQueryWrapper<>();
            wq.eq(TjJcycxm::getTjh,xdtgmdjg.getTjh());
            wq.eq(TjJcycxm::getProId,xdtgmdjg.getProId());
            jcycxmService.remove(wq);
                    if(StringUtil.isNotBlank(xdtgmdjg.getJcjl())){
                        String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split("。|;|;|,|,");
                        for (String jg : split) {
                            if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                    && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
                                    && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")){
                                TjJcycxm jcycxm=new TjJcycxm();
                                jcycxm.setTjh(xdtgmdjg.getTjh());
                                jcycxm.setYqid("");
                                jcycxm.setProId(xdtgmdjg.getProId());
                                jcycxm.setProName(xdtgmdjg.getProName());
                                jcycxm.setCreateTime(new Date());
                                jcycxm.setJcjg(jg);
                                jcycxmService.save(jcycxm);
                            }
                        }
                    }
            jcsqdService.saveLtkjExamJcsqd(xdtgmdjg.getCardId());
        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException(e);
        }
    }
@@ -438,7 +442,7 @@
    @ApiOperation (value = "获取影像检查骨密度心电图结果接口")
    @Transactional
    public AjaxResult getYxJcXxJg(@ApiParam (value = "体检号") @RequestParam String tjNumber,
                                @ApiParam (value = "项目id") @RequestParam String proId) {
                                  @ApiParam (value = "项目id") @RequestParam String proId) {
        TjOrder order = orderService.getOrderByTjNum(tjNumber);
        if(null !=order){
            LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
@@ -447,13 +451,27 @@
            TjXdtgmdjg xdtgmdjg = xdtgmdjgService.getOne(wq);
            Map<String,Object>map=new HashMap<>();
            if(null !=xdtgmdjg ){
             map.put("jcsj",xdtgmdjg.getJcsj());
             map.put("jcjl",xdtgmdjg.getJcjl());
             return AjaxResult.success(map);
                map.put("jcsj",xdtgmdjg.getJcsj());
                map.put("jcjl",xdtgmdjg.getJcjl());
                if(StringUtil.isNotBlank(xdtgmdjg.getUrl())){
                    Path path = Paths.get(xdtgmdjg.getUrl());
                    byte[] data = null;
                    try {
                        data = Files.readAllBytes(path);
                    } catch (IOException e) {
                        throw new RuntimeException(e);
                    }
                    String base64 = Base64.getEncoder().encodeToString(data);
                    map.put("tp",base64);
                }else {
                    map.put("tp",null);
                }
                return AjaxResult.success(map);
            }else {
                TjProject tjProject = projectService.getById(proId);
                map.put("jcsj","");
                map.put("jcjl",tjProject.getProDefault()==null ? "":tjProject.getProDefault());
                map.put("tp",null);
            }
            return AjaxResult.success(map);
        }
ltkj-admin/src/main/resources/application-dev.yml
@@ -190,6 +190,8 @@
#  体检报告模板和报告临时生成存储的文件夹路径
path:
  filePath: D:\Tjreport
  xdtfilePath: C:\TjXdt
  # nginx图片服务器
  reportServer: https://ltpeis.xaltjdkj.cn:5516/
ltkj-admin/src/main/resources/application-linux-dev.yaml
@@ -187,6 +187,7 @@
#  体检报告模板和报告临时生成存储的文件夹路径
path:
  filePath: /Users/chacca/开发相关/代码/Tjreport
  xdtfilePath: C:\TjXdt
  # nginx图片服务器
  reportServer: https://ltpeis.xaltjdkj.cn:5516/
ltkj-admin/src/main/resources/application-prod.yml
@@ -190,6 +190,7 @@
#  体检报告模板和报告临时生成存储的文件夹路径
path:
  filePath: D:\Tjreport
  xdtfilePath: C:\TjXdt
  # nginx图片服务器
  reportServer: https://ltpeis.xaltjdkj.cn:5516/
ltkj-admin/src/main/resources/application-test.yml
@@ -190,6 +190,7 @@
#  体检报告模板和报告临时生成存储的文件夹路径
path:
  filePath: D:\Tjreport
  xdtfilePath: C:\TjXdt
  # nginx图片服务器
  reportServer: https://ltpeis.xaltjdkj.cn:5516/
ltkj-admin/src/main/resources/application-win-chkwyyprod.yaml
@@ -190,6 +190,7 @@
#  体检报告模板和报告临时生成存储的文件夹路径
path:
  filePath: C:\Tjreport\chkwyy
  xdtfilePath: C:\TjXdt\chkwyy
  # nginx图片服务器
  reportServer: https://ltpeis.xaltjdkj.cn:5516/
ltkj-admin/src/main/resources/application-win-chkwyytest.yaml
@@ -190,6 +190,7 @@
#  体检报告模板和报告临时生成存储的文件夹路径
path:
  filePath: C:\Tjreport\chkwyy
  xdtfilePath: C:\TjXdt\chkwyy
  # nginx图片服务器
  reportServer: https://ltpeis.xaltjdkj.cn:5516/
ltkj-admin/src/main/resources/application-win-pbkwyyprod.yaml
@@ -190,6 +190,7 @@
#  体检报告模板和报告临时生成存储的文件夹路径
path:
  filePath: C:\Tjreport\pbkwyy
  xdtfilePath: C:\TjXdt\pbkwyy
  # nginx图片服务器
  reportServer: https://ltpeis.xaltjdkj.cn:5516/
ltkj-admin/src/main/resources/application-win-xamjyyprod.yaml
@@ -190,6 +190,7 @@
#  体检报告模板和报告临时生成存储的文件夹路径
path:
  filePath: C:\Tjreport\xamjyy
  xdtfilePath: C:\TjXdt\xamjyy
  # nginx图片服务器
  reportServer: https://ltpeis.xaltjdkj.cn:5516/
ltkj-admin/src/main/resources/application-win-xamjyytest.yaml
@@ -190,6 +190,7 @@
#  体检报告模板和报告临时生成存储的文件夹路径
path:
  filePath: C:\Tjreport\xamjyy\test
  xdtfilePath: C:\TjXdt\xamjyy\test
  # nginx图片服务器
  reportServer: https://ltpeis.xaltjdkj.cn:5516/
ltkj-common/src/main/java/com/ltkj/common/utils/file/FileUploadUtils.java
@@ -78,6 +78,14 @@
        }
    }
    public static final String upload(String baseDir,String fileName,MultipartFile file) throws IOException {
        try {
            return upload(baseDir,fileName, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
        } catch (Exception e) {
            throw new IOException(e.getMessage(), e);
        }
    }
    /**
     * 文件上传
     *
@@ -102,16 +110,38 @@
        String fileName = extractFilename(file);
        //String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
        String absPath = getAbsoluteFile(baseDir, fileName).getPath();
        file.transferTo(Paths.get(absPath));
        return getPathFileName(baseDir, fileName);
    }
    public static final String upload(String baseDir,String fileName, MultipartFile file, String[] allowedExtension)
            throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
            InvalidExtensionException {
        int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
        if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) {
            throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
        }
        assertAllowed(file, allowedExtension);
        fileName =StringUtils.format("{}/{}.{}", DateUtils.datePath(),
                fileName, getExtension(file));
        String absPath = getAbsoluteFile(baseDir, fileName).getPath();
        file.transferTo(Paths.get(absPath));
        return fileName;
    }
    /**
     * 编码文件名
     */
    public static final String extractFilename(MultipartFile file) {
        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
                FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
    }
    public static final String extractXdtFilename(MultipartFile file) {
        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
                FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
    }
@@ -130,9 +160,10 @@
    public static final String getPathFileName(String uploadDir, String fileName) throws IOException {
        int dirLastIndex = ltkjConfig.getProfile().length() + 1;
        String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
        return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
        return Constants.RESOURCE_PREFIX + currentDir + "/" + fileName;
    }
    /**
     * 文件大小校验
     *
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java
@@ -25,4 +25,5 @@
    private String proName;
    private String jcsj;
    private String jcjl;
    private String url;
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
@@ -21,13 +21,13 @@
@DataSource(value = DataSourceType.MASTER)
public interface LtkjExamJcbgdMapper extends BaseMapper<LtkjExamJcbgd> {
    @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh}  and lx=0 ")
    @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh}  and lx=0  and sgorzd=0 ")
    void deletedLtkjJcbgdByTjhAndTmh(String tmh);
    @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tjh} and tmh=#{tmh}   and lx=1 ")
    void deletedLtkjJcbgdByTjhandtmh(@Param("tjh") String tjh, @Param("tmh") String tmh);
    @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tjh} and tmh=#{tmh}   and lx=0 ")
    @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tjh} and tmh=#{tmh}   and lx=0  and sgorzd=1 ")
    void deletedLtkjJcbgdByTjhAndTmhA(@Param("tjh") String tjh, @Param("tmh") String tmh);
    @Select("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='检查' GROUP BY a.sqdh")
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -25,7 +25,7 @@
    @Select ("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh} AND a.tmh=#{tmh}  and a.lx=0  ")
    LtkjExamJcsqd getLtkjJcsqdByTjhAndTmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh}  and lx=0 ")
    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh}  and lx=0  and sgorzd=0  ")
    void  deletedLtkjJcsqdByTjhAndTmh(@Param("tjh")String tjh);
    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and tmh=#{tmh}   and lx=1 ")
@@ -59,7 +59,7 @@
                                                  @Param("page")int page,
                                                  @Param("status")String status);
    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and jcxmid = #{xmid} and lx=0 ")
    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and jcxmid = #{xmid} and lx=0 and sgorzd=1 ")
    void deletedLtkjJcsqdByTjhAndProId(@Param("tjh") String tjh,@Param("xmid") String xmid);
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java
@@ -39,6 +39,7 @@
    private String sqsj;
    private String jcbw;
    private String lx;
    private String sgorzd;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java
@@ -30,6 +30,7 @@
    private String jgbx;
    private String jgsj;
    private String lx;
    private String sgorzd;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")
ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java
@@ -55,6 +55,9 @@
    @ApiModelProperty("保存医生")
    private String bcdoctorName;
    @ApiModelProperty("图片")
    private String imageUrl;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "最后修改时间")