From cc74c69a0b48dce77cec5674fa42bee768bb28d7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 07 三月 2025 10:59:28 +0800
Subject: [PATCH] zjh20250307
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 287 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 229 insertions(+), 58 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 2238660..719cc7e 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
@@ -10,12 +10,16 @@
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.hisDto.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
+import com.ltkj.hosp.sqlDomain.LtkjHybgd;
+import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.web.controller.system.TjCheckController;
import io.swagger.annotations.Api;
@@ -27,10 +31,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Slf4j
@@ -53,6 +54,14 @@
private LtkjExamJcbgdService ltkjExamJcbgdService;
@Autowired
private ITjProjectService projectService;
+ @Autowired
+ private ITjOrderRemarkService orderRemarkService;
+ @Autowired
+ private LtkjHysqdService hysqdService;
+ @Autowired
+ private LtkjHybgdService hybgdService;
+ @Autowired
+ private ITjCustomerService tjCustomerService;
/**
* 鑾峰彇pacs妫�鏌ユ暟鎹�
@@ -75,6 +84,10 @@
wrapper.eq(TjOrder::getTjNumber,tjNum);
TjOrder order = tjOrderService.getOne(wrapper);
mzh = order.getCardId();
+ LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TjCustomer::getCusId,order.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
+ name = tjCustomer.getCusName();
}
List<Map<String, Object>> jcList = testMapper.getPacsJcList(name, mzh, start, end);
if (jcList.isEmpty()){
@@ -117,6 +130,10 @@
wrapper.eq(TjOrder::getTjNumber,tjNum);
TjOrder order = tjOrderService.getOne(wrapper);
mzh = order.getCardId();
+ LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TjCustomer::getCusId,order.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
+ name = tjCustomer.getCusName();
}
List<Map<String, Object>> jcList = testMapper.getPacsJcList(name, mzh, start, end);
return AjaxResult.success(jcList);
@@ -124,11 +141,47 @@
// return AjaxResult.success(JSONUtil.parseArray(json1));
}
+
+ /**
+ * 鑾峰彇Lis妫�楠屾暟鎹�
+ * @param json
+ * @return
+ */
+ @PostMapping("/lis/getList")
+ public AjaxResult getLisList(@RequestBody String json) {
+// log.info("lis鎺ュ彛鍙傛暟->{}",JSONUtil.toJsonStr(json));
+ cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj(json);
+ String tjNum = StrUtil.isBlank(parseObj.getStr("tjNum")) ? null : parseObj.getStr("tjNum");
+ String name = StrUtil.isBlank(parseObj.getStr("name")) ? null : parseObj.getStr("name");
+ 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){
+ return AjaxResult.error("浣撴鍙峰拰鍚嶅瓧涓嶈兘閮戒负绌�");
+ }
+ if (tjNum != null) {
+ LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjOrder::getTjNumber,tjNum);
+ TjOrder order = tjOrderService.getOne(wrapper);
+ mzh = order.getCardId();
+ LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TjCustomer::getCusId,order.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
+ name = tjCustomer.getCusName();
+ }
+ List<Map<String, Object>> jcList = testMapper.getLisJyList(name, mzh, start, end);
+ return AjaxResult.success(jcList);
+// String json1 = "[{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓1\",\"patientAge\":\"20\",\"mzh\":\"810001246120745\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽",\"conclusion\":\"寮傚父\",\"tjStandardGtValue\":\"1 - 5\",\"company\":\"姣厠\",\"checkDoctorName\":\"妫�娴嬪尰甯圽",\"jcxmid\":\"123\",\"shys\":\"瀹℃牳鍖诲笀\"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓2\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓3\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"}]";
+// return AjaxResult.success(JSONUtil.parseArray(json1));
+ }
+
@GetMapping("/getTjList")
public AjaxResult getTjList(@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+"鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
@@ -139,79 +192,197 @@
// return AjaxResult.success(JSONUtil.parseArray(json));
}
+ @GetMapping("/getJyTjList")
+ public AjaxResult getJyTjList(@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+"鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
+ }
+ List<CsProVo> proVos = orderRemarkService.cSWebGetProByTjNumAndOrderIdJy(order.getTjNumber());
+ if (null != proVos && !proVos.isEmpty()) {
+ proVos.sort(Comparator.comparingInt(CsProVo::getType));
+ }
+ 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\"}]";
+// return AjaxResult.success(JSONUtil.parseArray(json));
+ }
+
@Transactional
@PostMapping("/asyncPacs")
public AjaxResult asyncPacs(@RequestBody String json) {
-// log.info("鍚堝苟妫�娴嬪悓姝ュ弬鏁� ->{}",json);
+ 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.JSONObject pacs = parseObj.getJSONObject("pacs");
+ cn.hutool.json.JSONArray lis = parseObj.getJSONArray("lis");
cn.hutool.json.JSONObject tj = parseObj.getJSONObject("tj");
- LtkjExamJcsqd ltkjExamJcsqd = new LtkjExamJcsqd();
- ltkjExamJcsqd.setTjh(pacs.getStr("mzh"));
+ if (pacs != null && !pacs.isEmpty()){
+ String tjNum = pacs.getStr("tjnum");
+ LambdaQueryWrapper<TjOrder> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TjOrder::getTjNumber,tjNum);
+ TjOrder order = tjOrderService.getOne(wrapper1);
- LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(LtkjJianchajianyanTree::getCardId, pacs.getStr("mzh"));
- String xmdm = projectService.getById(tj.getStr("proId")).getHisXmbm();
- queryWrapper.eq(LtkjJianchajianyanTree::getType,"妫�鏌�");
- queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm,xmdm);
+ LtkjExamJcsqd ltkjExamJcsqd = new LtkjExamJcsqd();
+ ltkjExamJcsqd.setTjh(order.getCardId());
- LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
- ltkjExamJcsqd.setTmh("M_"+tree.getSqdh()+"_"+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.setBw(checkParts);
- ltkjExamJcsqd.setJgzt(pacs.getStr("diagnosis"));
- ltkjExamJcsqd.setJgbx(pacs.getStr("examination"));
- boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
+ LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(LtkjJianchajianyanTree::getCardId, order.getCardId());
+ String xmdm = projectService.getById(tj.getStr("proId")).getHisXmbm();
+ queryWrapper.eq(LtkjJianchajianyanTree::getType,"妫�鏌�");
+ queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm,xmdm);
- LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
- ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
- ltkjExamJcbgd.setTmh(ltkjExamJcsqd.getTmh());
- ltkjExamJcbgd.setXmdm(ltkjExamJcsqd.getJcxmid());
- ltkjExamJcbgd.setXmmc(ltkjExamJcsqd.getJcxmmc());
- 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());
- boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
- if (save1 && save2) {
- LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjOrder::getCardId, ltkjExamJcbgd.getTjh());
- TjOrder order = tjOrderService.getOne(wrapper);
+ LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
+ ltkjExamJcsqd.setTmh("M_"+tree.getSqdh()+"_"+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 {
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
- }catch (Exception e){
- log.error(String.valueOf(e));
+ 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.setBw(checkParts);
+ ltkjExamJcsqd.setJgzt(pacs.getStr("diagnosis"));
+ ltkjExamJcsqd.setJgbx(pacs.getStr("examination"));
+ boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
+
+ LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
+ ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
+ ltkjExamJcbgd.setTmh(ltkjExamJcsqd.getTmh());
+ ltkjExamJcbgd.setXmdm(ltkjExamJcsqd.getJcxmid());
+ ltkjExamJcbgd.setXmmc(ltkjExamJcsqd.getJcxmmc());
+ 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());
+ 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("鍚屾澶辫触璇烽噸璇�");
}
- } 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();
+ LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjOrder::getTjNumber,tjNum);
+ TjOrder order = tjOrderService.getOne(wrapper);
+ hysqd.setTjh(order.getTjNumber());
+ 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);
+ 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;
+ }
+ }
+ }
+ }
+
+
+ hysqd.setTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
+ hysqd.setXmid(xmdm);
+ hysqd.setXmmc(project.getHisXmbm());
+ hysqd.setSqsj(format.format(tree.getCreateTime()));
+ hysqd.setJgsj(format.format(new Date()));
+// hysqd.setBbmc();
+ boolean save = hysqdService.save(hysqd);
+ boolean save2 = true;
+ for (Object object : lis) {
+ cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) object;
+ LtkjHybgd hybgd = new LtkjHybgd();
+ hybgd.setTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
+ hybgd.setJcxmid(jsonObject.getStr("jcxmid"));
+ hybgd.setJcxm(jsonObject.getStr("checkParts"));
+ 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.setShys(jsonObject.getStr("shys"));
+ boolean save1 = hybgdService.save(hybgd);
+ if (!save1) {
+ save2 = false;
+ break;
+ }
+ }
+ if (save && save2){
+ 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("鍚屾澶辫触璇烽噸璇�");
+ }
+ } else {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+ }
+ return AjaxResult.success();
}
- return AjaxResult.success();
+
}
--
Gitblit v1.8.0