From decc3b9ce027fe35152b8b387a056c175a9aa08f Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 04 十二月 2024 00:20:35 +0800
Subject: [PATCH] zjh20241202-4
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 44 ++++----
ltkj-admin/pom.xml | 17 +++
ltkj-admin/lib/ojdbc17.jar | 0
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 46 +++++++-
ltkj-hosp/src/main/resources/mapper/TestMapper.xml | 15 +++
ltkj-admin/lib/orai18n-12.1.0.2.0.jar | 0
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java | 46 +++++---
ltkj-admin/lib/ojdbc8.jar | 0
ltkj-admin/src/main/resources/application-linux-test.yml | 12 +-
ltkj-admin/src/main/resources/application.yml | 1
ltkj-admin/src/test/java/zwxTest.java | 13 ++
ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 50 +++++++++
ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsServiceController.java | 37 ++++---
16 files changed, 210 insertions(+), 80 deletions(-)
diff --git a/ltkj-admin/lib/ojdbc17.jar b/ltkj-admin/lib/ojdbc17.jar
new file mode 100644
index 0000000..1c8484f
--- /dev/null
+++ b/ltkj-admin/lib/ojdbc17.jar
Binary files differ
diff --git a/ltkj-admin/lib/ojdbc8.jar b/ltkj-admin/lib/ojdbc8.jar
new file mode 100644
index 0000000..4c92806
--- /dev/null
+++ b/ltkj-admin/lib/ojdbc8.jar
Binary files differ
diff --git a/ltkj-admin/lib/orai18n-12.1.0.2.0.jar b/ltkj-admin/lib/orai18n-12.1.0.2.0.jar
new file mode 100644
index 0000000..c6a33dc
--- /dev/null
+++ b/ltkj-admin/lib/orai18n-12.1.0.2.0.jar
Binary files differ
diff --git a/ltkj-admin/pom.xml b/ltkj-admin/pom.xml
index 257cf12..70964f6 100644
--- a/ltkj-admin/pom.xml
+++ b/ltkj-admin/pom.xml
@@ -30,6 +30,23 @@
</repositories>
<dependencies>
+
+ <dependency>
+ <groupId>com.oracle.database.jdbc</groupId>
+ <artifactId>ojdbc8</artifactId>
+ <version>19.8.0.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/ojdbc8.jar</systemPath>
+ </dependency>
+
+ <dependency>
+ <groupId>com.oracle.database.jdbc</groupId>
+ <artifactId>orai18n</artifactId>
+ <version>1.0.2.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/orai18n-12.1.0.2.0.jar</systemPath>
+ </dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
index cdf9b24..f4da486 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
@@ -255,35 +255,43 @@
if (customer.getCusSex() == 0) patientInfo.put("PatientSex","M");
else if (customer.getCusSex() == 1) patientInfo.put("PatientSex","F");
else patientInfo.put("PatientSex","O");
- patientInfo.put("PatBirthday",customer.getCusBrithday());
+ patientInfo.put("PatBirthday",new SimpleDateFormat("yyyy-MM-dd").format(customer.getCusBrithday()));
patientInfo.put("IdCard",customer.getCusIdcard());
+ patientInfo.put("hospitalid","chkwyy");
- String examItems = "";
+// String examItems = "";
+ HashMap<String, Object> examItem = new HashMap<>();
+ List<Map<String,Object>> list = new ArrayList<>();
String date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
for (TjProject project : projects) {
- HashMap<String, Object> examItem = new HashMap<>();
+ HashMap<String, Object> examItems = new HashMap<>();
// 鐢宠鍗曞彿瑙勫垯锛氫綋妫�鍙穇project.getProId()鍚庡洓浣�
- examItem.put("HisID", tjOrder.getTjNumber() + String.valueOf(project.getProId()).substring(String.valueOf(project.getProId()).length() - 4));
- examItem.put("EmergencyFlag", "0");
- examItem.put("ExamItemID", project.getHisXmbm());
- examItem.put("ExamItemName", project.getHisXmmc());
- examItem.put("OrderDT", date);
+ examItems.put("HisID", tjOrder.getTjNumber() + String.valueOf(project.getProId()).substring(String.valueOf(project.getProId()).length() - 4));
+ examItems.put("EmergencyFlag", "0");
+ examItems.put("ExamItemID", project.getHisXmbm());
+ examItems.put("ExamItemName", project.getHisXmmc());
+ examItems.put("OrderDT", date);
SysDept dept = deptService.getById(project.getDeptId());
- examItem.put("Modality", dept.getModality());
+ examItems.put("Modality", dept.getModality());
// TODO 鏀惰垂鏍囪瘑 1鏄敹璐� 鍜� 0鏈敹璐�
- examItem.put("ChargeFlag","");
- examItems += "<ExamItem>"+
- XmlUtil.mapToXmlStr(examItem)
- .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
- .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
- .replaceAll("<xml>","")
- .replaceAll("</xml>","")
- +"</ExamItem>";
+ examItems.put("ChargeFlag","");
+// examItems += "<ExamItem>"+
+// XmlUtil.mapToXmlStr(examItem)
+// .replace("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
+//// .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
+// .replace("<xml>","")
+// .replace("</xml>","")
+// +"</ExamItem>";
+ list.add(examItems);
}
+ examItem.put("ExamItem",list);
hashMap.put("PatientInfor",patientInfo);
- hashMap.put("ExamItemList",examItems);
+ hashMap.put("ExamItemList",examItem);
root.put("Root",hashMap);
- String result = HttpRequest.post("").body(XmlUtil.mapToXmlStr(root)).contentType("application/xml;charset:utf-8;").execute().body();
+ String result = HttpRequest.post("http://10.100.100.222:8000/WebInterfaceService.asmx")
+ .body(XmlUtil.mapToXmlStr(root)).contentType("application/xml;charset:utf-8;").execute().body();
+ String s = XmlUtil.mapToXmlStr(root);
+ log.info("璋冪敤pacs浼犻�掑弬鏁扮殑鍊间负: "+s);
Map<String, Object> map = XmlUtil.xmlToMap(result);
if (map.get("Code").toString().equals("1")){
for (TjProject project : projects) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsServiceController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsServiceController.java
index ec53f35..b765b84 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsServiceController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsServiceController.java
@@ -287,26 +287,29 @@
patientInfo.put("PatBirthday",customer.getCusBrithday());
patientInfo.put("IdCard",customer.getCusIdcard());
-// ArrayList<HashMap<String, Object>> examItems = new ArrayList<>();
- String examItems = "";
+// String examItems = "";
+ HashMap<String, Object> examItem = new HashMap<>();
+ List<Map<String,Object>> lists = new ArrayList<>();
for (TjProject project : projects) {
- HashMap<String, Object> examItem = new HashMap<>();
- examItem.put("HisID", tjOrder.getTjNumber() + String.valueOf(project.getProId()).substring(String.valueOf(project.getProId()).length() - 4));
- examItem.put("EmergencyFlag", "0");
- examItem.put("ExamItemID", project.getHisXmbm());
- examItem.put("ExamItemName", project.getHisXmmc());
- examItem.put("OrderDT", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tjOrder.getCreateTime()));
+ HashMap<String, Object> examItems = new HashMap<>();
+ examItems.put("HisID", tjOrder.getTjNumber() + String.valueOf(project.getProId()).substring(String.valueOf(project.getProId()).length() - 4));
+ examItems.put("EmergencyFlag", "0");
+ examItems.put("ExamItemID", project.getHisXmbm());
+ examItems.put("ExamItemName", project.getHisXmmc());
+ examItems.put("OrderDT", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tjOrder.getCreateTime()));
SysDept dept = deptService.getById(project.getDeptId());
- examItem.put("Modality", dept.getModality());
- examItems += "<ExamItem>"+
- XmlUtil.mapToXmlStr(examItem)
- .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
- .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
- .replaceAll("<xml>","")
- .replaceAll("</xml>","")
- +"</ExamItem>";
+ examItems.put("Modality", dept.getModality());
+// examItems += "<ExamItem>"+
+// XmlUtil.mapToXmlStr(examItem)
+// .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
+// .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
+// .replaceAll("<xml>","")
+// .replaceAll("</xml>","")
+// +"</ExamItem>";
+ lists.add(examItems);
}
- hashMap.put("ExamItemList", examItems);
+ examItem.put("ExamItem",list);
+ hashMap.put("ExamItemList", examItem);
hashMap.put("PatientInfor",patientInfo);
HashMap<String, Object> result = new HashMap<>();
result.put("Code",1);
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 7521ecc..51ff07b 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
@@ -149,6 +149,24 @@
}
+ @GetMapping ("/pacs")
+ @ApiOperation (value = "娴嬭瘯璋冪敤pacs瑙嗗浘鏁版嵁鎺ュ彛")
+ @RepeatSubmit
+ public AjaxResult pacs() {
+ List<Map<String, Object>> ccXZxYyPacsJgSt = testMapper.getCcXZxYyPacsJgSt();
+
+ List<LtkjExamJcsqd> list = testMapper.getCcXZxYyPacsLtkjExamJcsqd("");
+
+ log.info(list.toString());
+
+ List<LtkjExamJcbgd> list1 = testMapper.getCcXZxYyPacsLtkjExamJcbgd("");
+
+ log.info(list1.toString());
+
+ return AjaxResult.success(ccXZxYyPacsJgSt);
+ }
+
+
@GetMapping ("/getCsList")
@ApiOperation (value = "鍒濆鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
@Transactional
@@ -599,16 +617,12 @@
}
}
}
-
}else {
return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
}
}
-
-
return AjaxResult.success("鍚屾鎴愬姛");
-
}
else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equals("Y")){
List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber());
@@ -624,12 +638,28 @@
ltkjHybgdService.saveBatch(hybgdList);
}
}
+ DynamicDataSourceContextHolder.clearDataSourceType();
}
- testMapper.tjUpdateDetatilByVi(order.getTjNumber());
+// List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber());
+// if(null !=jcsqdList && !jcsqdList.isEmpty()){
+// jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
+// jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
+// jcsqdService.saveBatch(jcsqdList);
+// List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(order.getCardId());
+// if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList);
+// DynamicDataSourceContextHolder.clearDataSourceType();
+// }
+ String tjNumber1 = order.getTjNumber();
+ log.info("鏌ヨ鍑烘潵鐨勪綋妫�鍙锋槸: " + tjNumber1);
+ log.info("浼犺繃鏉ョ殑鐨勪綋妫�鍙锋槸: "+tjNumber);
+ Map<String,Object> map=new HashMap<>();
+ map.put("tjnum",tjNumber);
+ testMapper.tjUpdateDetatilByVi(map);
+ }else {
+ //鍖栭獙
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
}
- //鍖栭獙
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
- //妫�鏌�
+ //妫�鏌�
return AjaxResult.success("鍚屾鎴愬姛");
}
return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
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 db6983c..91ccef7 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
@@ -1161,7 +1161,7 @@
addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser,null);
}
-
+// pacsApiMethodService.OrderAdd(tjCustomer,tjOrder);
return AjaxResult.success(tjNumber);
}
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
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 ba19171..72fa5e1 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
@@ -412,7 +412,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("浣撴鎶ュ憡");
@@ -696,7 +696,7 @@
System.out.println("鏂囦欢淇濆瓨鍓嶈�楁椂锛�" + (fujianEnd - pdfMkStart));
// 淇濆瓨pdf鏂囦欢
copy.close();
- String outputPath1 = value + "\\";
+ String outputPath1 = value + File.separator;
String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "new_浣撴鎶ュ憡.pdf";
File file = new File(outputPath1 + outputFileName1);
BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(file));
@@ -1022,7 +1022,7 @@
String template = reportTemplate.getTemplate();
String userId = SecurityUtils.getLoginUser().getUsername();
if (template != null) {
- PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
+ PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
}
// --------浠ヤ笂------- 鏍规嵁鏁版嵁搴撲腑鐨勬ā鏉夸簩杩涘埗鏂囦欢 杞琾df 鍒涘缓鏂囦欢澶� 灏唒df鏀捐繘鏈湴鏂囦欢澶�
@@ -1045,8 +1045,8 @@
tjOrderDetail.setProject(tjProject);
}
- String inputFileName = value + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf";
- String outputFileName = value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf";
+ String inputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf";
+ String outputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf";
OutputStream os = null;
PdfStamper ps = null;
PdfReader reader = null;
@@ -1169,7 +1169,7 @@
//璁剧疆鏂囨。鐨勯〉杈硅窛灏辨槸璺濈椤甸潰杈逛笂鐨勮窛绂伙紝鍒嗗埆涓猴細宸﹁竟璺濓紝鍙宠竟璺濓紝涓婅竟璺濓紝涓嬭竟璺�
document.setMargins(70, 70, 40, 40);
//鐢熸垚pdf鐨勪綅缃互鍙婂悕绉�
- String fileName = value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
+ String fileName = value + File.separator + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
OutputStream outputStream = Files.newOutputStream(Paths.get(fileName));
PdfWriter pdfWriter = PdfWriter.getInstance(document, outputStream);
@@ -1336,7 +1336,7 @@
// TjReport one11111 = tjReportService.getOne(rtwq1);
// if(null !=one11111){
// String report1 = one11111.getReport();
-// PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "鍖诲鍚嶈瘝.pdf");
+// PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + File.separator + userId + "鍖诲鍚嶈瘝.pdf");
// }
LambdaQueryWrapper<TjReport> rtwq = new LambdaQueryWrapper<>();
@@ -1345,7 +1345,7 @@
TjReport one1111 = tjReportService.getOne(rtwq);
if (null != one1111) {
String report = one1111.getReport();
- PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + tjNumber + userId + "蹇冪數鍥�.pdf");
+ PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + File.separator + tjNumber + userId + "蹇冪數鍥�.pdf");
}
LambdaQueryWrapper<TjReport> rtwq12 = new LambdaQueryWrapper<>();
@@ -1354,27 +1354,27 @@
TjReport one111112 = tjReportService.getOne(rtwq12);
if (null != one111112) {
String report12 = one111112.getReport();
- PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" + tjNumber + userId + "闄勪欢.pdf");
+ PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + File.separator + tjNumber + userId + "闄勪欢.pdf");
}
//鍚堝苟
String[] files1 = null;
if (one1111 != null) {
if (one111112 != null) {
- files1 = new String[]{value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" + tjNumber + userId + "闄勪欢.pdf", value + "\\" + tjNumber + userId + "蹇冪數鍥�.pdf"};
+ files1 = new String[]{value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + File.separator + tjNumber + userId + "闄勪欢.pdf", value + File.separator + tjNumber + userId + "蹇冪數鍥�.pdf"};
} else {
- files1 = new String[]{value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" + tjNumber + userId + "蹇冪數鍥�.pdf"};
+ files1 = new String[]{value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + File.separator + tjNumber + userId + "蹇冪數鍥�.pdf"};
}
} else {
if (one111112 != null) {
- files1 = new String[]{value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" + tjNumber + userId + "闄勪欢.pdf"};
+ files1 = new String[]{value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + File.separator + tjNumber + userId + "闄勪欢.pdf"};
} else {
- files1 = new String[]{value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf"};
+ files1 = new String[]{value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf"};
}
}
//鍚堝苟
-// String[] files1 = {value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber+"浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" +tjNumber+ userId + "闄勪欢.pdf", value + "\\" + tjNumber + userId + "蹇冪數鍥�.pdf"};
- String outputPath1 = value + "\\";
+// String[] files1 = {value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + tjNumber+"浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + File.separator +tjNumber+ userId + "闄勪欢.pdf", value + File.separator + tjNumber + userId + "蹇冪數鍥�.pdf"};
+ String outputPath1 = value + File.separator;
String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
File file1 = new File(outputPath1 + outputFileName1);
@@ -1393,11 +1393,11 @@
tjReport.setPrint("pdf");
tjReportService.save(tjReport);
- //FileUtil.del(value + "\\" + tjNumber + "浣撴鎶ュ憡.pdf");
- //FileUtil.del(value + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
- //FileUtil.del(value + "\\" + userId +tjNumber+ "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
- //FileUtil.del(value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf");
- //FileUtil.del(value + "\\" + userId + "蹇冪數鍥�.pdf");
+ //FileUtil.del(value + File.separator + tjNumber + "浣撴鎶ュ憡.pdf");
+ //FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
+ //FileUtil.del(value + File.separator + userId +tjNumber+ "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
+ //FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf");
+ //FileUtil.del(value + File.separator + userId + "蹇冪數鍥�.pdf");
//淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
@@ -1723,9 +1723,9 @@
}
String userId = SecurityUtils.getLoginUser().getUsername();
- PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + "\\" + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
+ PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
//String filePath = one.getPath();
- String filePath = value + "\\" + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+ String filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
File f = new File(filePath);
if (filePath.isEmpty()) {
System.out.println("鏂囦欢涓嶅瓨鍦紒");
diff --git a/ltkj-admin/src/main/resources/application-linux-test.yml b/ltkj-admin/src/main/resources/application-linux-test.yml
index 527189e..b230bf5 100644
--- a/ltkj-admin/src/main/resources/application-linux-test.yml
+++ b/ltkj-admin/src/main/resources/application-linux-test.yml
@@ -21,7 +21,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 5001
+ port: 5002
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /ltkj-admin
@@ -189,13 +189,13 @@
# 浣撴鎶ュ憡妯℃澘鍜屾姤鍛婁复鏃剁敓鎴愬瓨鍌ㄧ殑鏂囦欢澶硅矾寰�
path:
- filePath: D:\Tjreport
+ filePath: /ltkj/Tjreport
# nginx鍥剧墖鏈嶅姟鍣�
reportServer: https://ltpeis.xaltjdkj.cn:5516/
# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
-photoPath: D:\AppPhoto\uploadPath\
+photoPath: /ltkj/uploadPath/
# nginx鍥剧墖鏈嶅姟鍣�
#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
photoServer: http://192.168.0.5:5502/uploadPath/
@@ -231,7 +231,7 @@
jimu:
# path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
# path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
- path: http://192.168.0.5:5001/ltkj-admin
+ path: http://192.168.0.5:5000/ltkj-admin
# path: http://10.168.0.9:5011
# path: http://192.168.0.105:5011
# path: http://192.168.1.113:5011
@@ -251,5 +251,5 @@
# username = root
# password = Root_ltkj123
config:
- properties: /Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/ltkj_peis/ltkj-admin/src/main/resources/config-test.properties
- path: /Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/ltkj_peis/ltkj-admin/src/main/resources
+ properties: /ltkj/ltkjprojectconf/csconfig.properties
+ path: /ltkj/ltkjprojectconf
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 86fc6e6..596cb35 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -3,6 +3,7 @@
#prod 娉惧窛鍘块儴缃叉寮忕幆澧冧娇鐢�(灏忕▼搴忕涔熷彲浣跨敤)
#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢�
# linux-prod
+# linux-test
spring:
profiles:
active: dev
\ No newline at end of file
diff --git a/ltkj-admin/src/test/java/zwxTest.java b/ltkj-admin/src/test/java/zwxTest.java
index fb70f7e..49c580f 100644
--- a/ltkj-admin/src/test/java/zwxTest.java
+++ b/ltkj-admin/src/test/java/zwxTest.java
@@ -1,6 +1,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.XmlUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -276,6 +277,16 @@
}
public static void main(String[] args) {
-
+ String list = "<List>";
+ for (int i = 0; i < 2; i++) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("index",RandomUtil.randomInt(1,10));
+ list+=XmlUtil.mapToXmlStr(map).replace("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
+ .replace("<xml>","").replace("</xml>","");
+ }
+ list+="</List>";
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("Root",list);
+ System.out.println(XmlUtil.mapToXmlStr(map).replaceAll("<","<").replaceAll(">",">"));
}
}
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
index 9282963..40e262e 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
@@ -215,9 +215,8 @@
Properties properties = new Properties();
// 杩欓噷鏄祴璇曞啓娉曪紝鍏蜂綋鐨剉alue鍙互閫氳繃璇锋眰鍙傛暟浼犻�掕繃鏉�
properties.setProperty("druid.enabled",props.getProperty("pacsenabled"));
- properties.setProperty("druid.driverClassName","com.microsoft.sqlserver.jdbc.SQLServerDriver");
- properties.setProperty("druid.url","jdbc:sqlserver://"+props.getProperty("pacsip")+":"+props.getProperty("pacsprot")+";DatabaseName="+props.getProperty("pacsname")+
- ";&characterEncoding=utf8");
+ properties.setProperty("druid.driverClassName","oracle.jdbc.OracleDriver");
+ properties.setProperty("druid.url","jdbc:oracle:thin:@//"+props.getProperty("pacsip")+"/"+props.getProperty("pacsname"));
properties.setProperty("druid.username",props.getProperty("pacsusername"));
properties.setProperty("druid.password",props.getProperty("pacspassword"));
dataSource.restart(properties);
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
index b3763b6..2ecf802 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
@@ -110,7 +110,7 @@
// 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
.antMatchers("/login", "/register", "/captchaImage","/cus/**","/getCaptchaConfigKey","/report/jmreport/**",
"/sqlserver/getdata/**","/api/His/**","/system/config/zx","/system/config/gxxmpym","/system/report/savePdf",
- "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi").permitAll()
+ "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi","/check/pacs").permitAll()
.antMatchers("/common/uploadImgExe","/common/listExeVal","/pacs/InvokeRisService/**").permitAll()
.antMatchers("/check/dataSynchronizationApi").permitAll()
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
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 9c0e3c5..1d65155 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
@@ -84,8 +84,8 @@
@Param("dockerId")String dockerId);
@DataSource(value = DataSourceType.MASTER)
- @Select("call tj_update_detatil_by_vi(#{tjnum,mode=IN}")
- public void tjUpdateDetatilByVi(@Param("tjnum")String tjnum);
+// @Select("call tj_update_detatil_by_vi(#{tjnum,mode=IN}")
+ public void tjUpdateDetatilByVi(Map<String,Object> map);
@@ -284,4 +284,50 @@
"WHERE b.HOSPITALID='chkwyy' AND b.PATIENTTYPE=3 AND\n" +
" a.SAMPLEID = #{tmh}")
List<LtkjHybgd> getCcXZxYyLtkjHybgdByLisVi(String tmh);
+
+
+
+ @DataSource(value = DataSourceType.SLAVE_PACS)
+ @Select("SELECT * FROM ris.V_TJ_JCBGXX_NEWTJ")
+ List<Map<String, Object>> getCcXZxYyPacsJgSt();
+
+ @DataSource(value = DataSourceType.SLAVE_PACS)
+ @Select("SELECT\n" +
+ " a.HIS_ID tjh,\n" +
+ " a.HIS_ID tmh,\n" +
+ " a.JCLX jclx,\n" +
+ " NULL jczlx,\n" +
+ " a.BGYS bgys,\n" +
+ " NULL bgysid,\n" +
+ " a.SQRJ sqsj,\n" +
+ " a.BGSJ jgsj,\n" +
+ " a.JCMC jcxmmc,\n" +
+ " a.JCMCID jcxmid,\n" +
+ " a.JCBW bw,\n" +
+ " a.JCJL jgzt,\n" +
+ " a.JCSJ jgbx\n" +
+ " \n" +
+ "FROM\n" +
+ " ris.V_TJ_JCBGXX_NEWTJ a WHERE a.HIS_ID=#{tjNum}")
+ List<LtkjExamJcsqd> getCcXZxYyPacsLtkjExamJcsqd(String tjNum);
+
+
+ @DataSource(value = DataSourceType.SLAVE_PACS)
+ @Select(" SELECT\n" +
+ " a.HIS_ID tjh,\n" +
+ " a.HIS_ID tmh,\n" +
+ " a.JCMCID xmdm,\n" +
+ " a.JCMC xmmc,\n" +
+ " NULL bg_mig,\n" +
+ " NULL bg_url,\n" +
+ " a.JCSJ bg_nr,\n" +
+ " a.SHYS shysdm,\n" +
+ " a.SHYS shysxm,\n" +
+ " a.JCJL yxbx,\n" +
+ " a.BGSJ zdsj,\n" +
+ " a.SQRJ sqsj,\n" +
+ " a.JCBW jcbw\n" +
+ "FROM\n" +
+ " ris.V_TJ_JCBGXX_NEWTJ a WHERE a.HIS_ID=#{tjNum}")
+ List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd(String tjNum);
}
diff --git a/ltkj-hosp/src/main/resources/mapper/TestMapper.xml b/ltkj-hosp/src/main/resources/mapper/TestMapper.xml
new file mode 100644
index 0000000..e26091f
--- /dev/null
+++ b/ltkj-hosp/src/main/resources/mapper/TestMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ltkj.hosp.mapper.TestMapper">
+
+
+
+ <select id="tjUpdateDetatilByVi" parameterType="java.util.Map" statementType="CALLABLE">
+ {call tj_update_detatil_by_vi(
+ #{tjNumber,mode=IN,jdbcType=VARCHAR}
+ )}
+ </select>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0