From 672ce84d5ce6545a0e81709ea736c69cbbef8c1a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 24 四月 2025 18:12:47 +0800
Subject: [PATCH] zjh20250424
---
ltkj-admin/src/main/resources/application-test.yml | 1
ltkj-admin/src/main/resources/application-win-chkwyyprod.yaml | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java | 1
ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java | 44 +++++++-
ltkj-admin/src/main/resources/application-linux-dev.yaml | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 90 ++++++++++-------
ltkj-admin/src/main/resources/application-win-pbkwyyprod.yaml | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 34 ++++--
ltkj-admin/src/main/resources/application-win-chkwyytest.yaml | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java | 3
ltkj-admin/src/main/resources/application-win-xamjyytest.yaml | 1
ltkj-admin/src/main/resources/application-dev.yml | 2
ltkj-admin/src/main/resources/application-prod.yml | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 30 +++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 2
ltkj-common/src/main/java/com/ltkj/common/utils/file/FileUploadUtils.java | 35 ++++++
ltkj-admin/src/main/resources/application-win-xamjyyprod.yaml | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java | 4
21 files changed, 196 insertions(+), 63 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java b/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java
index a480f19..9f1dbfd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java
+++ b/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());
+ }
+ }
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
index 7609adc..c93615d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
+++ b/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);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index 8576fcb..7864f34 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/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("鏈鍗犱綅")
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 3d9ab8a..30c002a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/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("鍚屾鎴愬姛");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index 4687148..fa466d4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/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);
}
diff --git a/ltkj-admin/src/main/resources/application-dev.yml b/ltkj-admin/src/main/resources/application-dev.yml
index beec389..cfd60a7 100644
--- a/ltkj-admin/src/main/resources/application-dev.yml
+++ b/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/
diff --git a/ltkj-admin/src/main/resources/application-linux-dev.yaml b/ltkj-admin/src/main/resources/application-linux-dev.yaml
index 90c9bbd..8ea617a 100644
--- a/ltkj-admin/src/main/resources/application-linux-dev.yaml
+++ b/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/
diff --git a/ltkj-admin/src/main/resources/application-prod.yml b/ltkj-admin/src/main/resources/application-prod.yml
index 8acc64d..4895914 100644
--- a/ltkj-admin/src/main/resources/application-prod.yml
+++ b/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/
diff --git a/ltkj-admin/src/main/resources/application-test.yml b/ltkj-admin/src/main/resources/application-test.yml
index c8ad41b..8158d50 100644
--- a/ltkj-admin/src/main/resources/application-test.yml
+++ b/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/
diff --git a/ltkj-admin/src/main/resources/application-win-chkwyyprod.yaml b/ltkj-admin/src/main/resources/application-win-chkwyyprod.yaml
index 3bf475a..b87bddb 100644
--- a/ltkj-admin/src/main/resources/application-win-chkwyyprod.yaml
+++ b/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/
diff --git a/ltkj-admin/src/main/resources/application-win-chkwyytest.yaml b/ltkj-admin/src/main/resources/application-win-chkwyytest.yaml
index eefe7e4..222b69b 100644
--- a/ltkj-admin/src/main/resources/application-win-chkwyytest.yaml
+++ b/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/
diff --git a/ltkj-admin/src/main/resources/application-win-pbkwyyprod.yaml b/ltkj-admin/src/main/resources/application-win-pbkwyyprod.yaml
index 34b6c30..bad7100 100644
--- a/ltkj-admin/src/main/resources/application-win-pbkwyyprod.yaml
+++ b/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/
diff --git a/ltkj-admin/src/main/resources/application-win-xamjyyprod.yaml b/ltkj-admin/src/main/resources/application-win-xamjyyprod.yaml
index 209a51e..7ffb518 100644
--- a/ltkj-admin/src/main/resources/application-win-xamjyyprod.yaml
+++ b/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/
diff --git a/ltkj-admin/src/main/resources/application-win-xamjyytest.yaml b/ltkj-admin/src/main/resources/application-win-xamjyytest.yaml
index 46e5f47..0820264 100644
--- a/ltkj-admin/src/main/resources/application-win-xamjyytest.yaml
+++ b/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/
diff --git a/ltkj-common/src/main/java/com/ltkj/common/utils/file/FileUploadUtils.java b/ltkj-common/src/main/java/com/ltkj/common/utils/file/FileUploadUtils.java
index 12be581..a93097f 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/utils/file/FileUploadUtils.java
+++ b/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;
}
+
/**
* 鏂囦欢澶у皬鏍￠獙
*
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java
index 5852cff..e9f8393 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java
+++ b/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;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
index 10f77ee..e24f7a4 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
+++ b/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")
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
index dcaf2b1..f712edd 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
+++ b/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);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java
index 39691bd..774baa3 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java
+++ b/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 = "鍒涘缓鏃堕棿")
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java
index 7435659..c194d6b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java
+++ b/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 = "鍒涘缓鏃堕棿")
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java
index edd3dbd..5a0489c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java
+++ b/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 = "鏈�鍚庝慨鏀规椂闂�")
--
Gitblit v1.8.0