From 2c19fa65dc87ea8f3d81f84154f4eeabff7f8d00 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 六月 2025 12:36:47 +0800
Subject: [PATCH] zjh20250605
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 379 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 320 insertions(+), 59 deletions(-)
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 c93615d..6366910 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
@@ -111,6 +111,7 @@
/**
* 鑾峰彇pacs妫�鏌ユ暟鎹�
+ *
* @param json
* @return
*/
@@ -123,14 +124,14 @@
String start = StrUtil.isBlank(parseObj.getStr("start")) ? null : parseObj.getStr("start");
String end = StrUtil.isBlank(parseObj.getStr("end")) ? null : parseObj.getStr("end");
String mzh = null;
- if (tjNum == null && name == null){
+ if (tjNum == null && name == null) {
return AjaxResult.error("浣撴鍙峰拰鍚嶅瓧涓嶈兘閮戒负绌�");
}
if (tjNum != null) {
TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
mzh = order.getCardId();
LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
- wrapper1.eq(TjCustomer::getCusId,order.getUserId());
+ wrapper1.eq(TjCustomer::getCusId, order.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
name = tjCustomer.getCusName();
}
@@ -142,6 +143,7 @@
/**
* 鑾峰彇Lis妫�楠屾暟鎹�
+ *
* @param json
* @return
*/
@@ -154,16 +156,16 @@
String start = StrUtil.isBlank(parseObj.getStr("start")) ? null : parseObj.getStr("start");
String end = StrUtil.isBlank(parseObj.getStr("end")) ? null : parseObj.getStr("end");
String mzh = null;
- if (tjNum == null && name == null){
+ if (tjNum == null && name == null) {
return AjaxResult.error("浣撴鍙峰拰鍚嶅瓧涓嶈兘閮戒负绌�");
}
if (tjNum != null) {
LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjOrder::getTjNumber,tjNum);
+ wrapper.eq(TjOrder::getTjNumber, tjNum);
TjOrder order = tjOrderService.getOne(wrapper);
mzh = order.getCardId();
LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
- wrapper1.eq(TjCustomer::getCusId,order.getUserId());
+ wrapper1.eq(TjCustomer::getCusId, order.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
name = tjCustomer.getCusName();
}
@@ -174,32 +176,32 @@
}
@GetMapping("/getTjList")
- public AjaxResult getTjList(@RequestParam("code")String code){
+ public AjaxResult getTjList(@RequestParam("code") String code) {
// log.info("tjList鎺ュ彛鍙傛暟->{}",code);
LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TjOrder::getCardId, code)
.or()
.eq(TjOrder::getTjNumber, code);
TjOrder order = tjOrderService.getOne(queryWrapper);
- if (order == null){
- return AjaxResult.error("闂ㄨ瘖鍙�:"+code+"鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
+ if (order == null) {
+ return AjaxResult.error("闂ㄨ瘖鍙�:" + code + "鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
}
List<CsProVo> proVos = tjCheckController.getCsProVos(order.getTjNumber(),true);
return AjaxResult.success(proVos);
-// String json = "[{\"deptName\":\"CT瀹",\"proName\":\"(tj)鑳搁儴CT骞虫壂\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"}]";
+// String json = "[{\"proId\":\"1870371396991955206\",\"deptName\":\"DR瀹",\"proName\":\"鑳搁儴DR姝ｄ綅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2025-06-05 10:55:43\",\"bcupdateTime\":\"2025-06-05 10:55:43\",\"bcdoctorName\":null,\"imageUrl\":null,\"zhupdateTime\":\"2025-06-05 10:55:43\",\"deptId\":599},{\"proId\":\"1878964342340526298\",\"deptName\":\"褰╄秴瀹",\"proName\":\"鑲濊儐鑴捐儼鑲惧僵瓒匼",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2025-06-05 10:55:43\",\"bcupdateTime\":\"2025-06-05 10:55:43\",\"bcdoctorName\":null,\"imageUrl\":null,\"zhupdateTime\":\"2025-06-05 10:55:43\",\"deptId\":609},{\"proId\":\"1878964342340526330\",\"deptName\":\"褰╄秴瀹",\"proName\":\"鑶�鑳卞墠鍒楄吅褰╄秴\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2025-06-05 10:55:43\",\"bcupdateTime\":\"2025-06-05 10:55:43\",\"bcdoctorName\":null,\"imageUrl\":null,\"zhupdateTime\":\"2025-06-05 10:55:43\",\"deptId\":609},{\"proId\":\"1870371396991955336\",\"deptName\":\"蹇冪數鍥綷",\"proName\":\"蹇冪數鍥炬鏌",\"type\":1,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2025-06-05 10:55:43\",\"bcupdateTime\":\"2025-06-05 11:12:50\",\"bcdoctorName\":null,\"imageUrl\":null,\"zhupdateTime\":\"2025-06-05 11:12:50\",\"deptId\":601}]";
// return AjaxResult.success(JSONUtil.parseArray(json));
}
@GetMapping("/getJyTjList")
- public AjaxResult getJyTjList(@RequestParam("code")String code){
+ public AjaxResult getJyTjList(@RequestParam("code") String code) {
// log.info("tjList鎺ュ彛鍙傛暟->{}",code);
LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(TjOrder::getCardId,code)
+ queryWrapper.eq(TjOrder::getCardId, code)
.or()
.eq(TjOrder::getTjNumber, code);
TjOrder order = tjOrderService.getOne(queryWrapper);
- if (order == null){
- return AjaxResult.error("闂ㄨ瘖鍙�:"+code+"鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
+ if (order == null) {
+ return AjaxResult.error("闂ㄨ瘖鍙�:" + code + "鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
}
List<CsProVo> proVos = orderRemarkService.cSWebGetProByTjNumAndOrderIdJy(order.getTjNumber());
if (null != proVos && !proVos.isEmpty()) {
@@ -214,7 +216,7 @@
@PostMapping("/asyncPacs")
public AjaxResult asyncPacs(@RequestBody String json) {
try {
- log.info("鍚堝苟妫�娴嬪悓姝ュ弬鏁� ->{}",json);
+ log.info("鍚堝苟妫�娴嬪悓姝ュ弬鏁� ->{}", json);
// try {
// Thread.sleep(2000);
// } catch (InterruptedException ignored) {
@@ -223,14 +225,14 @@
// if (true)
// return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj( json);
+ cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj(json);
cn.hutool.json.JSONObject pacs = parseObj.getJSONObject("pacs");
cn.hutool.json.JSONArray lis = parseObj.getJSONArray("lis");
cn.hutool.json.JSONObject tj = parseObj.getJSONObject("tj");
- if (pacs != null && !pacs.isEmpty()){
+ if (pacs != null && !pacs.isEmpty()) {
String tjNum = pacs.getStr("tjnum");
LambdaQueryWrapper<TjOrder> wrapper1 = new LambdaQueryWrapper<>();
- wrapper1.eq(TjOrder::getTjNumber,tjNum);
+ wrapper1.eq(TjOrder::getTjNumber, tjNum);
TjOrder order = tjOrderService.getOne(wrapper1);
LtkjExamJcsqd ltkjExamJcsqd = new LtkjExamJcsqd();
@@ -240,23 +242,23 @@
queryWrapper.eq(LtkjJianchajianyanTree::getCardId, order.getCardId());
TjProject project = projectService.getById(tj.getStr("proId"));
String xmdm = project.getHisXmbm();
- if (project.getSfzhfy().equals("N")){
+ if (project.getSfzhfy().equals("N")) {
LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjProject::getProParentId,project.getProId());
+ wrapper.eq(TjProject::getProParentId, project.getProId());
List<TjProject> list = projectService.list(wrapper);
for (TjProject tjProject : list) {
- if (StrUtil.isNotBlank(tjProject.getHisXmbm())){
+ if (StrUtil.isNotBlank(tjProject.getHisXmbm())) {
xmdm = tjProject.getHisXmbm();
break;
}
}
}
- queryWrapper.eq(LtkjJianchajianyanTree::getType,"妫�鏌�");
- queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm,xmdm);
+ queryWrapper.eq(LtkjJianchajianyanTree::getType, "妫�鏌�");
+ queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm, xmdm);
LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
- ltkjExamJcsqd.setTmh("M_"+tree.getSqdh()+"_"+tree.getHisXmdm());
+ ltkjExamJcsqd.setTmh("M_" + tree.getSqdh() + "_" + tree.getHisXmdm());
ltkjExamJcsqd.setBgys(pacs.getStr("checkDoctorName"));
ltkjExamJcsqd.setBgysid(pacs.getStr("checkDoctorCode"));
ltkjExamJcsqd.setSqsj(format.format(tree.getCreateTime()));
@@ -269,8 +271,8 @@
ltkjExamJcsqd.setJgsj(format.format(new Date()));
}
String checkParts = pacs.getStr("checkParts");
- // ltkjExamJcsqd.setJcxmmc(checkParts);
- // ltkjExamJcsqd.setJcxmid(xmdm);
+ // ltkjExamJcsqd.setJcxmmc(checkParts);
+ // ltkjExamJcsqd.setJcxmid(xmdm);
ltkjExamJcsqd.setJcxmmc(project.getProName());
ltkjExamJcsqd.setJcxmid(project.getProId().toString());
@@ -281,17 +283,18 @@
ltkjExamJcsqd.setSgorzd("1");
ltkjExamJcsqd.setCreateTime(new Date());
- ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(),ltkjExamJcsqd.getJcxmid());
+ ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getJcxmid());
boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
-
- if(StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())){
+ log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}", ltkjExamJcsqd.getJgzt());
+ if (StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())) {
jcycxmService.deletedByTjh(order.getTjNumber());
String[] split = ltkjExamJcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
+ log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙栧垎鍓叉柟娉曚綋 ->{}->{}", order.getTjNumber(), split);
for (String jg : split) {
- if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+ if (StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
- && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
- TjJcycxm jcycxm=new TjJcycxm();
+ && !jg.contains("鏈鏄庢樉") && !jg.contains("姝ｅ父") && !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")) {
+ TjJcycxm jcycxm = new TjJcycxm();
jcycxm.setTjh(order.getTjNumber());
jcycxm.setYqid("jczyy");
String[] split1 = ltkjExamJcsqd.getJcxmid().split(";");
@@ -307,8 +310,8 @@
LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
ltkjExamJcbgd.setTmh(ltkjExamJcsqd.getTmh());
- // ltkjExamJcbgd.setXmdm(ltkjExamJcsqd.getJcxmid());
- // ltkjExamJcbgd.setXmmc(ltkjExamJcsqd.getJcxmmc());
+ // ltkjExamJcbgd.setXmdm(ltkjExamJcsqd.getJcxmid());
+ // ltkjExamJcbgd.setXmmc(ltkjExamJcsqd.getJcxmmc());
ltkjExamJcbgd.setXmdm(project.getProId().toString());
ltkjExamJcbgd.setXmmc(project.getProName());
@@ -316,8 +319,8 @@
ltkjExamJcbgd.setBgUrl("");
ltkjExamJcbgd.setShysxm(pacs.getStr("reportDoctorName"));
ltkjExamJcbgd.setShysdm(pacs.getStr("reportDoctorCode"));
- // ltkjExamJcbgd.setYxzd(ltkjExamJcsqd.getJgzt());
- // ltkjExamJcbgd.setYxbx(ltkjExamJcsqd.getJgbx());
+ // ltkjExamJcbgd.setYxzd(ltkjExamJcsqd.getJgzt());
+ // ltkjExamJcbgd.setYxbx(ltkjExamJcsqd.getJgbx());
ltkjExamJcbgd.setZdsj(ltkjExamJcsqd.getJgsj());
ltkjExamJcbgd.setSqsj(ltkjExamJcsqd.getSqsj());
ltkjExamJcbgd.setJcbw(ltkjExamJcsqd.getJcxmmc());
@@ -326,12 +329,12 @@
ltkjExamJcbgd.setYxzd(ltkjExamJcsqd.getJgzt());
ltkjExamJcbgd.setSgorzd("1");
ltkjExamJcsqd.setCreateTime(new Date());
- ltkjExamJcbgdService.deletedLtkjJcbgdByTjhAndTmhA(ltkjExamJcsqd.getTjh(),ltkjExamJcsqd.getTmh());
+ ltkjExamJcbgdService.deletedLtkjJcbgdByTjhAndTmhA(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getTmh());
boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
if (save1 && save2) {
try {
testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
- }catch (Exception e){
+ } catch (Exception e) {
log.error(String.valueOf(e));
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
@@ -341,7 +344,7 @@
return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
}
return AjaxResult.success();
- }else {
+ } else {
cn.hutool.json.JSONObject entries = (cn.hutool.json.JSONObject) lis.get(0);
String tjNum = entries.getStr("tjNum");
LtkjHysqd hysqd = new LtkjHysqd();
@@ -353,8 +356,8 @@
queryWrapper.eq(LtkjJianchajianyanTree::getCardId, mzh);
TjProject project = projectService.getById(tj.getStr("proId"));
String xmdm = project.getHisXmbm();
- queryWrapper.eq(LtkjJianchajianyanTree::getType,"妫�楠�");
- queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm,xmdm);
+ queryWrapper.eq(LtkjJianchajianyanTree::getType, "妫�楠�");
+ queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm, xmdm);
LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
String tmh;
if (tree == null) {
@@ -363,22 +366,22 @@
tree.setCreateTime(new Date());
String sqdh = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.valueOf(RandomUtil.randomInt(0, 99999));
queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(LtkjJianchajianyanTree::getSqdh,sqdh);
+ queryWrapper.eq(LtkjJianchajianyanTree::getSqdh, sqdh);
if (ltkjJianchajianyanTreeService.getOne(queryWrapper) == null) {
tree.setSqdh(sqdh);
- }else {
- while (true){
+ } else {
+ while (true) {
sqdh = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.valueOf(RandomUtil.randomInt(0, 99999));
queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(LtkjJianchajianyanTree::getSqdh,sqdh);
+ queryWrapper.eq(LtkjJianchajianyanTree::getSqdh, sqdh);
if (ltkjJianchajianyanTreeService.getOne(queryWrapper) == null) {
tree.setSqdh(sqdh);
break;
}
}
}
- tmh = tree.getSqdh()+"_"+tree.getHisXmdm();
- }else{
+ tmh = tree.getSqdh() + "_" + tree.getHisXmdm();
+ } else {
tmh = tree.getSqdh();
}
String shys = "";
@@ -386,17 +389,18 @@
cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) o;
if (StrUtil.isNotBlank(jsonObject.getStr("jyxh"))) tmh = jsonObject.getStr("jyxh");
if (StrUtil.isNotBlank(jsonObject.getStr("shys"))) shys = jsonObject.getStr("shys");
- if (StrUtil.isNotBlank(tmh) && StrUtil.isNotBlank(shys) && StrUtil.isNotBlank(jsonObject.getStr("jyxh"))) break;
+ if (StrUtil.isNotBlank(tmh) && StrUtil.isNotBlank(shys) && StrUtil.isNotBlank(jsonObject.getStr("jyxh")))
+ break;
}
hysqd.setTmh(tmh);
- // if (StrUtil.isNotBlank(xmdm)) {
- // hysqd.setXmid(xmdm);
- // hysqd.setXmmc(project.getHisXmmc());
- // }else {
- // hysqd.setXmid(String.valueOf(project.getProId()));
- // hysqd.setXmmc(project.getProName());
- // }
+ // if (StrUtil.isNotBlank(xmdm)) {
+ // hysqd.setXmid(xmdm);
+ // hysqd.setXmmc(project.getHisXmmc());
+ // }else {
+ // hysqd.setXmid(String.valueOf(project.getProId()));
+ // hysqd.setXmmc(project.getProName());
+ // }
hysqd.setXmid(project.getProId().toString());
hysqd.setXmmc(project.getProName());
@@ -405,8 +409,8 @@
hysqd.setJgsj(format.format(new Date()));
hysqd.setShrxm(shys);
hysqd.setCreateTime(new Date());
- // hysqd.setBbmc();
- hysqdService.deletedByTjhAndXmId(hysqd.getTjh(),hysqd.getXmid());
+ // hysqd.setBbmc();
+ hysqdService.deletedByTjhAndXmId(hysqd.getTjh(), hysqd.getXmid());
hybgdService.deletedLtkjHybgdByTjhAndTmh(tmh);
hysqdService.save(hysqd);
for (Object object : lis) {
@@ -420,7 +424,7 @@
String tjStandardGtValue = jsonObject.getStr("tjStandardGtValue");
String zdz = "";
String zxz = "";
- if (tjStandardGtValue.contains("-")){
+ if (tjStandardGtValue.contains("-")) {
String[] split = tjStandardGtValue.split("-");
zxz = split[0].trim();
zdz = split[1].trim();
@@ -438,7 +442,264 @@
}
try {
testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
- }catch (Exception e){
+ } catch (Exception e) {
+ log.error(String.valueOf(e));
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+ }
+ return AjaxResult.success();
+ }
+ } catch (NoTransactionException e) {
+ log.error(String.valueOf(e));
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+ }
+
+ }
+
+ @Transactional
+ @PostMapping("/newasyncPacs")
+ public AjaxResult newasyncPacs(@RequestBody String json) {
+ try {
+ log.info("鍚堝苟妫�娴嬪悓姝ュ弬鏁� ->{}", json);
+// try {
+// Thread.sleep(2000);
+// } catch (InterruptedException ignored) {
+//
+// }
+// if (true)
+// return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj(json);
+ cn.hutool.json.JSONArray pacss = parseObj.getJSONArray("pacs");
+ cn.hutool.json.JSONArray lis = parseObj.getJSONArray("lis");
+ cn.hutool.json.JSONObject tj = parseObj.getJSONObject("tj");
+
+
+ if (pacss != null && !pacss.isEmpty()) {
+ cn.hutool.json.JSONObject entries = (cn.hutool.json.JSONObject) pacss.get(0);
+ String tjNum = entries.getStr("tjNum");
+ LambdaQueryWrapper<TjOrder> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TjOrder::getTjNumber, tjNum);
+ TjOrder order = tjOrderService.getOne(wrapper1);
+
+ for (Object o : pacss) {
+ cn.hutool.json.JSONObject pacs = (cn.hutool.json.JSONObject) o;
+ if (pacs != null && !pacs.isEmpty()) {
+
+ LtkjExamJcsqd ltkjExamJcsqd = new LtkjExamJcsqd();
+ ltkjExamJcsqd.setTjh(order.getCardId());
+
+ LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(LtkjJianchajianyanTree::getCardId, order.getCardId());
+ TjProject project = projectService.getById(tj.getStr("proId"));
+ String xmdm = project.getHisXmbm();
+ if (project.getSfzhfy().equals("N")) {
+ LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjProject::getProParentId, project.getProId());
+ List<TjProject> list = projectService.list(wrapper);
+ for (TjProject tjProject : list) {
+ if (StrUtil.isNotBlank(tjProject.getHisXmbm())) {
+ xmdm = tjProject.getHisXmbm();
+ break;
+ }
+ }
+ }
+
+ queryWrapper.eq(LtkjJianchajianyanTree::getType, "妫�鏌�");
+ queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm, xmdm);
+
+ LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
+ String brid = pacs.getStr("brid");
+
+ ltkjExamJcsqd.setTmh(brid + tree.getHisXmdm());
+ ltkjExamJcsqd.setBgys(pacs.getStr("checkDoctorName"));
+ ltkjExamJcsqd.setBgysid(pacs.getStr("checkDoctorCode"));
+ ltkjExamJcsqd.setSqsj(format.format(tree.getCreateTime()));
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+ Date reportDate = null;
+ try {
+ reportDate = dateFormat.parse(pacs.getStr("reportDate"));
+ ltkjExamJcsqd.setJgsj(format.format(reportDate));
+ } catch (ParseException ignored) {
+ ltkjExamJcsqd.setJgsj(format.format(new Date()));
+ }
+ String checkParts = pacs.getStr("checkParts");
+ // ltkjExamJcsqd.setJcxmmc(checkParts);
+ // ltkjExamJcsqd.setJcxmid(xmdm);
+
+ ltkjExamJcsqd.setJcxmmc(project.getProName());
+ ltkjExamJcsqd.setJcxmid(project.getProId().toString());
+
+ 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());
+ ltkjExamJcsqdService.sdtbdeletedLtkjJcsqdByTjhandtmh(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getTmh());
+ boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
+ log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}", ltkjExamJcsqd.getJgzt());
+ if (StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())) {
+ jcycxmService.deletedByTjh(order.getTjNumber());
+ String[] split = ltkjExamJcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
+ log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙栧垎鍓叉柟娉曚綋 ->{}->{}", order.getTjNumber(), 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());
+ ltkjExamJcbgd.setTmh(ltkjExamJcsqd.getTmh());
+ // ltkjExamJcbgd.setXmdm(ltkjExamJcsqd.getJcxmid());
+ // ltkjExamJcbgd.setXmmc(ltkjExamJcsqd.getJcxmmc());
+
+ ltkjExamJcbgd.setXmdm(project.getProId().toString());
+ ltkjExamJcbgd.setXmmc(project.getProName());
+
+ ltkjExamJcbgd.setBgUrl("");
+ ltkjExamJcbgd.setShysxm(pacs.getStr("reportDoctorName"));
+ ltkjExamJcbgd.setShysdm(pacs.getStr("reportDoctorCode"));
+ // ltkjExamJcbgd.setYxzd(ltkjExamJcsqd.getJgzt());
+ // ltkjExamJcbgd.setYxbx(ltkjExamJcsqd.getJgbx());
+ ltkjExamJcbgd.setZdsj(ltkjExamJcsqd.getJgsj());
+ ltkjExamJcbgd.setSqsj(ltkjExamJcsqd.getSqsj());
+ ltkjExamJcbgd.setJcbw(ltkjExamJcsqd.getJcxmmc());
+ 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);
+ if (save1 && save2) {
+ try {
+ testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ } catch (Exception e) {
+ log.error(String.valueOf(e));
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+ }
+ } else {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+ }
+ }
+ }
+ return AjaxResult.success();
+ } else {
+ cn.hutool.json.JSONObject entries = (cn.hutool.json.JSONObject) lis.get(0);
+ String tjNum = entries.getStr("tjNum");
+ LtkjHysqd hysqd = new LtkjHysqd();
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ hysqd.setTjh(order.getCardId());
+ String mzh = order.getCardId();
+
+ LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(LtkjJianchajianyanTree::getCardId, mzh);
+ TjProject project = projectService.getById(tj.getStr("proId"));
+ String xmdm = project.getHisXmbm();
+ queryWrapper.eq(LtkjJianchajianyanTree::getType, "妫�楠�");
+ queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm, xmdm);
+ LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
+ String tmh;
+ if (tree == null) {
+ tree = new LtkjJianchajianyanTree();
+ tree.setHisXmdm(xmdm);
+ tree.setCreateTime(new Date());
+ String sqdh = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.valueOf(RandomUtil.randomInt(0, 99999));
+ queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(LtkjJianchajianyanTree::getSqdh, sqdh);
+ if (ltkjJianchajianyanTreeService.getOne(queryWrapper) == null) {
+ tree.setSqdh(sqdh);
+ } else {
+ while (true) {
+ sqdh = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.valueOf(RandomUtil.randomInt(0, 99999));
+ queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(LtkjJianchajianyanTree::getSqdh, sqdh);
+ if (ltkjJianchajianyanTreeService.getOne(queryWrapper) == null) {
+ tree.setSqdh(sqdh);
+ break;
+ }
+ }
+ }
+ tmh = tree.getSqdh() + "_" + tree.getHisXmdm();
+ } else {
+ tmh = tree.getSqdh();
+ }
+ String shys = "";
+ for (Object o : lis) {
+ cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) o;
+ if (StrUtil.isNotBlank(jsonObject.getStr("jyxh"))) tmh = jsonObject.getStr("jyxh");
+ if (StrUtil.isNotBlank(jsonObject.getStr("shys"))) shys = jsonObject.getStr("shys");
+ if (StrUtil.isNotBlank(tmh) && StrUtil.isNotBlank(shys) && StrUtil.isNotBlank(jsonObject.getStr("jyxh")))
+ break;
+ }
+ hysqd.setTmh(tmh);
+
+ // if (StrUtil.isNotBlank(xmdm)) {
+ // hysqd.setXmid(xmdm);
+ // hysqd.setXmmc(project.getHisXmmc());
+ // }else {
+ // hysqd.setXmid(String.valueOf(project.getProId()));
+ // hysqd.setXmmc(project.getProName());
+ // }
+
+ hysqd.setXmid(project.getProId().toString());
+ hysqd.setXmmc(project.getProName());
+
+ hysqd.setSqsj(format.format(tree.getCreateTime()));
+ hysqd.setJgsj(format.format(new Date()));
+ hysqd.setShrxm(shys);
+ hysqd.setCreateTime(new Date());
+ // hysqd.setBbmc();
+ hysqdService.deletedByTjhAndXmId(hysqd.getTjh(), hysqd.getXmid());
+ hybgdService.deletedLtkjHybgdByTjhAndTmh(tmh);
+ hysqdService.save(hysqd);
+ for (Object object : lis) {
+ cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) object;
+ LtkjHybgd hybgd = new LtkjHybgd();
+ hybgd.setTmh(tmh);
+ hybgd.setJcxmid(jsonObject.getStr("jcxmid"));
+ hybgd.setJcxm(jsonObject.getStr("proName"));
+ hybgd.setJyjg(jsonObject.getStr("proResult"));
+ hybgd.setJgdw(jsonObject.getStr("company"));
+ String tjStandardGtValue = jsonObject.getStr("tjStandardGtValue");
+ String zdz = "";
+ String zxz = "";
+ if (tjStandardGtValue.contains("-")) {
+ String[] split = tjStandardGtValue.split("-");
+ zxz = split[0].trim();
+ zdz = split[1].trim();
+ }
+ hybgd.setFwzdz(zdz);
+ hybgd.setFwzgz(zxz);
+ hybgd.setFwz(tjStandardGtValue);
+ hybgd.setJysj(jsonObject.getStr("examinationDate"));
+ hybgd.setShsj(jsonObject.getStr("examinationDate"));
+ hybgd.setJyys(jsonObject.getStr("checkDoctorName"));
+ hybgd.setShysmc(shys);
+ hybgd.setYcbz(jsonObject.getStr("ycbz"));
+ hybgd.setCreateTime(new Date());
+ hybgdService.save(hybgd);
+ }
+ try {
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ } catch (Exception e) {
log.error(String.valueOf(e));
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
@@ -459,7 +720,7 @@
System.out.println(json.toJSONString());
String tjNumber = json.get("tjNumber").toString();
String reportName = json.get("reportName").toString();
- System.out.println("鐢ㄦ埛: "+tjNumber+reportName+" 宸叉墦鍗�");
+ System.out.println("鐢ㄦ埛: " + tjNumber + reportName + " 宸叉墦鍗�");
}
}
--
Gitblit v1.8.0