From 34f6939fdac950c99253b063f80adcb25bc2b1a1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 十二月 2024 23:04:00 +0800
Subject: [PATCH] zjh20241205-2
---
ltkj-admin/src/main/java/com/ltkj/web/config/wordUtil/TableService.java | 3 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 5 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 4 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 9 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 12 ++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java | 8 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java | 18 ++++----
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 8 ++--
9 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/wordUtil/TableService.java b/ltkj-admin/src/main/java/com/ltkj/web/config/wordUtil/TableService.java
index 94b12d7..d36e248 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/wordUtil/TableService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/wordUtil/TableService.java
@@ -6,6 +6,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.io.File;
import java.text.ParseException;
import java.util.Date;
import java.util.List;
@@ -37,7 +38,7 @@
} catch (ParseException e) {
e.printStackTrace();
}
- String docFileName = Constants.FILE_PATH + "\\" + Constants.FILE_NAME + ".doc";
+ String docFileName = Constants.FILE_PATH + File.separator + Constants.FILE_NAME + ".doc";
// 3銆佽皟鐢ㄥ伐鍏风被鐢熸垚鏂囦欢
tableToWordUtil.toWord(tables, docFileName, Constants.FILE_NAME);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
index 28f5057..76a89f0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
@@ -442,9 +442,9 @@
final String substring = uuid.toString().substring(0, 5);
// String userId = SecurityUtils.getLoginUser().getUsername();
- PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + "\\" + substring + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
+ PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + substring + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
//String filePath = one.getPath();
- String filePath = value + "\\" + substring + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+ String filePath = value + File.separator + substring + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
File f = new File(filePath);
if (filePath.isEmpty()) {
System.out.println("鏂囦欢涓嶅瓨鍦紒");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 2a6a257..e1955ac 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -31,6 +31,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.List;
@@ -212,7 +213,7 @@
elements.setSpacingAfter(10f);
elements.setAlignment(Element.ALIGN_RIGHT);
Phrase phrase = new Phrase();
- Font doctorFonts = PdfUtils.setFont(9);
+ Font doctorFonts = PdfUtils.setFont(11);
for (LtkjGetexamreportinfo getexamreportinfo : list) {
String xm = getexamreportinfo.getHzxm();
String xb = getexamreportinfo.getHzxb().equals("2") ? "濂�" : "鐢�";
@@ -380,7 +381,7 @@
private void savePDFFile(String outputFileName1, TjOrder tjOrder, TjCustomer customer, ByteArrayOutputStream finalOutPut) throws IOException {
// 鏂囦欢閰嶇疆
// String outputPath1 = "/Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/";
- String outputPath1 = value + "\\";
+ String outputPath1 = value + File.separator;
File file = new File(outputPath1 + outputFileName1);
BufferedOutputStream outputStream = null;
outputStream = new BufferedOutputStream(new FileOutputStream(file));
@@ -408,7 +409,7 @@
ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
addJianYanTable(document1, titleName, titles, titlesWidth, lists);
if (!jyys.isEmpty()) {
- Font doctorFonts = PdfUtils.setFont(9);
+ Font doctorFonts = PdfUtils.setFont(11);
String doctors = "";
Paragraph elements = new Paragraph();
elements.setLeading(5f);
@@ -634,7 +635,6 @@
LambdaQueryWrapper<LtkjHysqd> ltkjHysqdLambdaQueryWrapper = new LambdaQueryWrapper<>();
ltkjHysqdLambdaQueryWrapper.eq(LtkjHysqd::getTjh, tjOrder.getCardId());
List<LtkjHysqd> list = ltkjHysqdService.list(ltkjHysqdLambdaQueryWrapper);
-// List<LtkjHysqd> list = ltkjHysqdService.list();
HashMap<String, Object> data = new HashMap<>();
for (LtkjHysqd hysqd : list) {
LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -784,6 +784,7 @@
}
//寮傚父椤圭洰
data.put("yichang", str.toString());
+ data.put("zjrq",new SimpleDateFormat("yyyy-MM-dd").format(tjOrder.getCheckTime()));
// 閬嶅巻data 缁檖df琛ㄥ崟琛ㄦ牸璧嬪��
for (String key : data.keySet()) {
acroFields.setField(key, data.get(key).toString());
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 c4e4d68..a8615bd 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
@@ -63,7 +63,7 @@
*/
@RestController
@RequestMapping ("/check")
-@Api (tags = "鎬绘鍖诲笀鐩稿叧鎺ュ彛")
+@Api (tags = "AAAAAAAAAAAA鎬绘鍖诲笀鐩稿叧鎺ュ彛")
@Slf4j
public class TjCheckController {
@Resource
@@ -631,7 +631,7 @@
}
return AjaxResult.success("鍚屾鎴愬姛");
}
- else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equals("Y")){
+ else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")){
List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber());
if(null != hysqdList && !hysqdList.isEmpty()){
for (LtkjHysqd hysqd : hysqdList) {
@@ -1197,8 +1197,12 @@
@ApiParam (value = "鎬绘寤鸿") @RequestParam (required = false) String advice,
@ApiParam (value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus) {
- int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
- if (num > 0) return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+ String config = configService.selectConfigByKey("sfjcwjhyqxm");
+ if(null != config && config.equalsIgnoreCase("Y")){
+ int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
+ if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+ }
+
if (null != tjNumber) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 25481cf..d124182 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -2631,7 +2631,7 @@
TjReport tjReport = new TjReport();
tjReport.setTjNumber(String.valueOf(tjNumber));
tjReport.setPath(urlValue + outputFileName1);
- String outputPath1 = value + "\\";
+ String outputPath1 = value + File.separator;
String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
tjReport.setReport(pdfBinary);
tjReport.setType("浣撴鎶ュ憡");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 72fa5e1..355ffc7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -58,7 +58,7 @@
*/
@RestController
@RequestMapping("/system/report")
-@Api(tags = "浣撴鎶ュ憡")
+@Api(tags = "AAAA_浣撴鎶ュ憡")
@Transactional
public class TjReportController extends BaseController {
@Resource
@@ -106,12 +106,14 @@
public AjaxResult savePdf() {
//浠庢枃浠跺湴鍧�璇诲叆PDF鏂囦欢 浠呭瓨鍌ㄤ竴娆�
String base64String = PDFBinaryUtil.getPDFBinary(configService.selectConfigByKey("default_pdf5Template"));
+ reportTemplateService.remove(new LambdaQueryWrapper<TjReportTemplate>().eq(TjReportTemplate::getName,"浣撴鎶ュ憡妯℃澘5"));
TjReportTemplate tem = new TjReportTemplate();
tem.setName("浣撴鎶ュ憡妯℃澘5");
tem.setRemark("浣撴鎶ュ憡妯℃澘5");
tem.setTemplate(base64String);
tem.setFlag("1");
tem.setOpen("0");
+ tem.setCreateTime(DateUtil.date());
final boolean save = reportTemplateService.save(tem);
if (save) {
return AjaxResult.success("淇濆瓨鎴愬姛");
@@ -2049,6 +2051,7 @@
} else {
one.setStatus(TjConstants.TJ_CONFIRM);
}
+ one.setReportTime(null);
//灏嗙姸鎬佹敼涓烘湭瀹℃牳
// UpdateWrapper updateWrapper=new UpdateWrapper();
// updateWrapper.eq("tj_number",tjNumber);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java
index 627e54c..fc7012d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java
@@ -133,8 +133,8 @@
return;
}
String userId = SecurityUtils.getLoginUser().getUsername();
- PDFBinaryUtil.base64StringToPDF(one.getTemplate(), FileUtil.mkdir(value).getPath() + "\\" + userId + reportTemId + "_妯℃澘棰勮.pdf");
- String filePath = value + "\\" + userId + reportTemId + "_妯℃澘棰勮.pdf";
+ PDFBinaryUtil.base64StringToPDF(one.getTemplate(), FileUtil.mkdir(value).getPath() + File.separator + userId + reportTemId + "_妯℃澘棰勮.pdf");
+ String filePath = value + File.separator + userId + reportTemId + "_妯℃澘棰勮.pdf";
File f = new File(filePath);
if (filePath.isEmpty()) {
System.out.println("鏂囦欢涓嶅瓨鍦紒");
@@ -202,8 +202,8 @@
return;
}
String userId = SecurityUtils.getLoginUser().getUsername();
- PDFBinaryUtil.base64StringToPDF(one.getTemplate(), FileUtil.mkdir(value).getPath() + "\\" + userId + "_鑱屼笟鍋ュ悍浣撴涓汉淇℃伅琛�.pdf");
- String filePath = value + "\\" + userId + "_鑱屼笟鍋ュ悍浣撴涓汉淇℃伅琛�.pdf";
+ PDFBinaryUtil.base64StringToPDF(one.getTemplate(), FileUtil.mkdir(value).getPath() + File.separator + userId + "_鑱屼笟鍋ュ悍浣撴涓汉淇℃伅琛�.pdf");
+ String filePath = value + File.separator + userId + "_鑱屼笟鍋ュ悍浣撴涓汉淇℃伅琛�.pdf";
File f = new File(filePath);
if (filePath.isEmpty()) {
System.out.println("鏂囦欢涓嶅瓨鍦紒");
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
index c4d7e19..49a6624 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -305,8 +305,8 @@
" a.JCMC jcxmmc,\n" +
" a.JCMCID jcxmid,\n" +
" a.JCBW bw,\n" +
- " a.JCJL jgzt,\n" +
- " a.JCSJ jgbx\n" +
+ " TRIM(a.JCJL) jgzt,\n" +
+ " TRIM(a.JCSJ) jgbx\n" +
" \n" +
"FROM\n" +
" ris.V_TJ_JCBGXX_NEWTJ a WHERE a.HIS_ID=#{tjNum}")
@@ -321,10 +321,10 @@
" a.JCMC xmmc,\n" +
" NULL bg_mig,\n" +
" NULL bg_url,\n" +
- " a.JCSJ bg_nr,\n" +
+ " TRIM(a.JCSJ) bg_nr,\n" +
" a.SHYS shysdm,\n" +
" a.SHYS shysxm,\n" +
- " a.JCJL yxbx,\n" +
+ " TRIM(a.JCJL) yxbx,\n" +
" a.BGSJ zdsj,\n" +
" a.SQRJ sqsj,\n" +
" a.JCBW jcbw\n" +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
index bd9c607..c77c09b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
@@ -190,12 +190,12 @@
//褰撳墠鐧诲綍鐨勪汉宸ュ彿
String userId = SecurityUtils.getLoginUser().getUsername();
//浜岃繘鍒惰浆pdf 瀛樺偍鍦ㄤ复鏃舵枃浠跺す涓�
- PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
+ PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
// 妯℃澘鏂囦欢璺緞
- String inputFileName = value + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf";
+ String inputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf";
// 鐢熸垚鐨勬枃浠惰矾寰�
- String outputFileName = value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf";
+ String outputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf";
OutputStream os = null;
PdfStamper ps = null;
PdfReader reader = null;
@@ -260,7 +260,7 @@
//璁剧疆鏂囨。鐨勯〉杈硅窛灏辨槸璺濈椤甸潰杈逛笂鐨勮窛绂伙紝鍒嗗埆涓猴細宸﹁竟璺濓紝鍙宠竟璺濓紝涓婅竟璺濓紝涓嬭竟璺�
document.setMargins(70, 70, 40, 40);
//杩欎釜鏄敓鎴恜df鐨勪綅缃互鍙婂悕绉�
- String fileName = value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
+ String fileName = value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
OutputStream outputStream = Files.newOutputStream(Paths.get(fileName));
PdfWriter pdfWriter = PdfWriter.getInstance(document, outputStream);
@@ -328,8 +328,8 @@
outputStream.close();
//=============================== 绗笁閮ㄥ垎 鍚堝苟浣撴鎶ュ憡灏侀潰椤靛拰浣撴鎶ュ憡椤圭洰璇︽儏椤�
- String[] files1 = {value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf"};
- String outputPath1 = value + "\\";
+ String[] files1 = {value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf"};
+ String outputPath1 = value + File.separator;
String outputFileName1 = tjNumber + "浣撴鎶ュ憡.pdf";
File file1 = new File(outputPath1 + outputFileName1);
@@ -349,9 +349,9 @@
//灏嗕复鏃舵枃浠跺す涓殑鍥涗釜鏂囦欢鍒犻櫎
//FileUtil.del(value+"\\"+tjNumber + "浣撴鎶ュ憡.pdf");
- FileUtil.del(value + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
- FileUtil.del(value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
- FileUtil.del(value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf");
+ FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
+ FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
+ FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf");
//淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
--
Gitblit v1.8.0