From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 1499 +++++++++++++++++++++++------------------------------------
1 files changed, 587 insertions(+), 912 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 f8b2008..7b18325 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
@@ -9,9 +9,7 @@
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.framework.config.UserHoder;
-import com.ltkj.hosp.domain.LtkjJianchajianyanTree;
-import com.ltkj.hosp.domain.TjOrder;
-import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.hisDto.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
@@ -20,10 +18,13 @@
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import com.ltkj.hosp.vodomain.CsProVo;
+import com.ltkj.web.controller.system.SysConfigController;
import com.ltkj.web.controller.system.TjCheckController;
import io.swagger.annotations.Api;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.NoTransactionException;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
@@ -59,50 +60,61 @@
private LtkjHysqdService hysqdService;
@Autowired
private LtkjHybgdService hybgdService;
+ @Autowired
+ private ITjCustomerService tjCustomerService;
+ @Autowired
+ private TjJcycxmService jcycxmService;
+ @Autowired
+ private SysConfigController configController;
/**
* 鑾峰彇pacs妫�鏌ユ暟鎹�
* @param json
* @return
*/
- @PostMapping("/pacs/getAll")
- public AjaxResult getAllList(@RequestBody String 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();
- }
- List<Map<String, Object>> jcList = testMapper.getPacsJcList(name, mzh, start, end);
- if (jcList.isEmpty()){
- return AjaxResult.success();
- }
- if (tjNum == null){
- String string = jcList.get(0).get("mzh").toString();
- LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjOrder::getCardId,string);
- TjOrder order = tjOrderService.getOne(wrapper);
- if (order == null) return AjaxResult.error("");
- tjNum = order.getTjNumber();
- }
- List<CsProVo> proVos = tjCheckController.getCsProVos(tjNum,true);
- HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("pacs",jcList);
- hashMap.put("vo",proVos);
- return AjaxResult.success(hashMap);
- }
+// @PostMapping("/pacs/getAll")
+// public AjaxResult getAllList(@RequestBody String 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.getPacsJcList(name, mzh, start, end);
+// if (jcList.isEmpty()){
+// return AjaxResult.success();
+// }
+// if (tjNum == null){
+// String string = jcList.get(0).get("mzh").toString();
+// LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjOrder::getCardId,string);
+// TjOrder order = tjOrderService.getOne(wrapper);
+// if (order == null) return AjaxResult.error("");
+// tjNum = order.getTjNumber();
+// }
+// List<CsProVo> proVos = tjCheckController.getCsProVos(tjNum,true);
+// HashMap<String, Object> hashMap = new HashMap<>();
+// hashMap.put("pacs",jcList);
+// hashMap.put("vo",proVos);
+// return AjaxResult.success(hashMap);
+// }
/**
* 鑾峰彇pacs妫�鏌ユ暟鎹�
+ *
* @param json
* @return
*/
@@ -115,24 +127,26 @@
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);
- TjOrder order = tjOrderService.getOne(wrapper);
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
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);
-// String json1 = "[{\"reportDoctorCode\":114,\"deptName\":\"浣撴涓績\",\"checkDoctorCode\":114,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗘硨灏跨郴鍓嶅垪鑵篭",\"zyh\":\"-\",\"diagnosis\":\"鍓嶅垪鑵哄鐢焅",\"checkDoctorName\":\"鏉庨湠\",\"F_MACHINE_NAME_LIST\":\"GE-P6\",\"reportDate\":\"2024.11.06 11:49:20\",\"examinationDate\":\"2024.11.06 11:54:58\",\"examination\":\"鍙岃偩澶у皬銆佸舰鎬佹甯革紝鍖呰啘鍏夋粦骞虫暣锛屽疄璐ㄥ洖澹板垎甯冨潎鍖�锛岀毊楂撶晫闄愭竻鏅帮紝闆嗗悎绯荤粺鏈鍒嗙銆俽nCDFI锛氬弻鑲捐娴佸憟鈥滄爲鏋濈姸鈥濆垎甯冿紝鐏屾敞鑹ソ锛涘弻渚ц緭灏跨鏈鎵╁紶銆俽n鑶�鑳卞厖鐩堜匠锛屽鍘氬害姝ｅ父锛屽唴澹佸厜鏁达紝鑵斿唴鏈帰鍙婂紓甯稿洖澹般�俽n缁忚吂閮ㄥ墠鍒楄吅澶у皬绾�34mm脳35mm脳30mm锛屽舰鎬侀ケ婊★紝鍖呰啘瀹屾暣锛屽疄璐ㄥ洖澹版瑺鍧囧寑锛屽唴鑵虹◢澧炲ぇ銆俽nCDFI锛氳吅浣撳唴鏈帰鍙婂紓甯歌娴佷俊鍙枫�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"53宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.204.1730864961.484.897.557\",\"reportDoctorName\":\"鏉庨湠\",\"studyReport\":525696,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"},{\"reportDoctorCode\":141,\"deptName\":\"浣撴涓績 \",\"checkDoctorCode\":141,\"ghxh\":\"M_jk20241106000019_2\",\"gender\":\"鐢穃",\"brid\":\"jk20241106000019\",\"checkParts\":\"鈼嗚兏閮–T骞虫壂\",\"zyh\":\"-\",\"diagnosis\":\"1.宸﹁偤涓嬪彾澶栧熀搴曟鏀皵绠℃墿寮犱即鎰熸煋锛況n2.鍐犵姸鍔ㄨ剦纭寲锛況n3.鑳告楠ㄨ川澧炵敓銆俓",\"checkDoctorName\":\"濮氳瘹\",\"F_MACHINE_NAME_LIST\":\"SIEMENS-CT\",\"reportDate\":\"2024.11.06 17:12:53\",\"examinationDate\":\"2024.11.06 17:12:54\",\"examination\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁（鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠￠�氱晠銆傚績鑴忓悇鎴垮澶у皬姝ｅ父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"name\":\"寮犲皬鍏礬",\"patientAge\":\"76宀乗",\"clinicalDiagnosis\":\"\",\"mzh\":\"20241106000520\",\"F_RPT_UID\":\"1.2.840.40823.1.1.1.1.1730884375.763.395.131\",\"reportDoctorName\":\"濮氳瘹\",\"studyReport\":525872,\"F_RPT_WRITE_DATE\":\"2024.11.06\"}]";
+// String json1 = "[{\"reportDoctorCode\":\"\",\"deptName\":\"\",\"checkDoctorCode\":\"\",\"ghxh\":\"135107\",\"gender\":\"鏈煡\",\"brid\":\"135107\",\"checkParts\":\"鑳搁儴CT\",\"zyh\":\"2025002358\",\"diagnosis\":\"鍙宠偤涓嬪彾鎱㈡�х値鐥囷紝璇风粨鍚堜复搴婏紱\\n鍙宠偤涓婂彾澶氬彂缁撹妭锛屽繀瑕佹椂瀹氭湡澶嶆煡銆俓",\"checkDoctorName\":\"杈涙枃杈塡",\"F_MACHINE_NAME_LIST\":\"CT\",\"reportDate\":\"2025-03-17 09:47:36\",\"examinationDate\":\"2025-03-17 09:47:36\",\"examination\":\"鑳搁儴CT骞虫壂锛氳兏寤撳舰鎬佹湭瑙佹槑鏄惧紓甯搞�傛皵绠￠�氱晠锛涘弻鑲虹汗鐞嗗绮楋紝鍙宠偤涓嬪彾鍙绱㈡潯鐘堕珮瀵嗗害褰憋紱鍙宠偤涓婂彾鍙澶氬彂缁撹妭褰憋紝杈圭晫娓咃紝杈冨ぇ鑰呯害0.5cm锛涘彾闂磋鏃犵Щ浣嶏紝鍙岃偤闂ㄦ湭瑙佸澶с�傜旱闅斿眳涓紝鍏跺唴鏈鏄庢樉澧炲ぇ娣嬪反缁撳奖銆傚績褰辨湭瑙佸澶э紝鏈鑳告按寰佽薄銆俓",\"name\":\"璧佃タ瀹乗",\"patientAge\":47,\"clinicalDiagnosis\":\"\",\"mzh\":\"135107\",\"F_RPT_UID\":\"http://192.168.10.3:8021/PDFReport/27/135107.pdf\",\"reportDoctorName\":\"妯婄户鍏僜",\"studyReport\":81000,\"F_RPT_WRITE_DATE\":\"2025-03-17 09:26:08\"},{\"reportDoctorCode\":\"\",\"deptName\":\"\",\"checkDoctorCode\":\"\",\"ghxh\":\"136954\",\"gender\":\"鏈煡\",\"brid\":\"136954\",\"checkParts\":\"鑴婃煴CT\",\"zyh\":\"2025002966\",\"diagnosis\":\"鍙宠偤涓嬪彾鍙婂乏鑲轰笂鍙舵參鎬х値鐥囷紝璇风粨鍚堜复搴婏紱\\n鍙宠偤涓�佷笂鍙剁粨鑺傦紱\\nL4/5妞庨棿鐩樿啫鍑恒�俓",\"checkDoctorName\":\"杈涙枃杈塡",\"F_MACHINE_NAME_LIST\":\"CT\",\"reportDate\":\"2025-04-07 09:49:25\",\"examinationDate\":\"2025-04-07 09:49:25\",\"examination\":\"鑳搁儴CT骞虫壂锛氳兏寤撳舰鎬佹湭瑙佹槑鏄惧紓甯搞�傛皵绠￠�氱晠锛涘弻鑲虹汗鐞嗗绮楋紝鍙宠偤涓嬪彾鍙婂乏鑲轰笂鍙跺彲瑙佺储鏉＄姸楂樺瘑搴﹀奖锛岃竟缂樻瑺娓咃紱鍙宠偤涓�佷笂鍙惰缁撹妭褰憋紝杈圭晫灏氭竻锛屽ぇ灏忕害0.4cm锛涘彾闂磋鏃犵Щ浣嶏紝鍙岃偤闂ㄦ湭瑙佸澶с�傜旱闅斿眳涓紝鍏跺唴鏈鏄庢樉澧炲ぇ娣嬪反缁撳奖銆傚績褰辨湭瑙佸澶э紝鏈鑳告按寰佽薄銆俓\n 鑵版妞庨棿鐩楥T骞虫壂锛氳叞妞庣敓鐞嗘洸搴﹀瓨鍦紝璇告浣撳簭鍒楀甯革紝L3/4銆丩4/5銆丩5/S1妞庨棿闅欐湭瑙佸彉绐勶紝L4/5妞庨棿鐩樺悜鍥涘懆鑶ㄥ嚭锛岀浉搴旂‖鑶滃泭杞诲害鍙楀帇锛涢鎬ф绠″墠鍚庡緞鏈鐙獎锛岄粍闊у甫鏈鍘氾紝妞庢梺杞粍缁囨湭瑙佹槑鏄惧紓甯搞�俓",\"name\":\"璧佃タ瀹乗",\"patientAge\":47,\"clinicalDiagnosis\":\"\",\"mzh\":\"136954\",\"F_RPT_UID\":\"http://192.168.10.3:8021/PDFReport/27/136954.pdf\",\"reportDoctorName\":\"妯婄户鍏僜",\"studyReport\":82737,\"F_RPT_WRITE_DATE\":\"2025-04-07 09:32:28\"},{\"reportDoctorCode\":\"\",\"deptName\":\"\",\"checkDoctorCode\":\"\",\"ghxh\":\"136954\",\"gender\":\"鏈煡\",\"brid\":\"136954\",\"checkParts\":\"鑳搁儴CT\",\"zyh\":\"2025002966\",\"diagnosis\":\"鍙宠偤涓嬪彾鍙婂乏鑲轰笂鍙舵參鎬х値鐥囷紝璇风粨鍚堜复搴婏紱\\n鍙宠偤涓�佷笂鍙剁粨鑺傦紱\\nL4/5妞庨棿鐩樿啫鍑恒�俓",\"checkDoctorName\":\"杈涙枃杈塡",\"F_MACHINE_NAME_LIST\":\"CT\",\"reportDate\":\"2025-04-07 09:49:25\",\"examinationDate\":\"2025-04-07 09:49:25\",\"examination\":\"鑳搁儴CT骞虫壂锛氳兏寤撳舰鎬佹湭瑙佹槑鏄惧紓甯搞�傛皵绠￠�氱晠锛涘弻鑲虹汗鐞嗗绮楋紝鍙宠偤涓嬪彾鍙婂乏鑲轰笂鍙跺彲瑙佺储鏉＄姸楂樺瘑搴﹀奖锛岃竟缂樻瑺娓咃紱鍙宠偤涓�佷笂鍙惰缁撹妭褰憋紝杈圭晫灏氭竻锛屽ぇ灏忕害0.4cm锛涘彾闂磋鏃犵Щ浣嶏紝鍙岃偤闂ㄦ湭瑙佸澶с�傜旱闅斿眳涓紝鍏跺唴鏈鏄庢樉澧炲ぇ娣嬪反缁撳奖銆傚績褰辨湭瑙佸澶э紝鏈鑳告按寰佽薄銆俓\n 鑵版妞庨棿鐩楥T骞虫壂锛氳叞妞庣敓鐞嗘洸搴﹀瓨鍦紝璇告浣撳簭鍒楀甯革紝L3/4銆丩4/5銆丩5/S1妞庨棿闅欐湭瑙佸彉绐勶紝L4/5妞庨棿鐩樺悜鍥涘懆鑶ㄥ嚭锛岀浉搴旂‖鑶滃泭杞诲害鍙楀帇锛涢鎬ф绠″墠鍚庡緞鏈鐙獎锛岄粍闊у甫鏈鍘氾紝妞庢梺杞粍缁囨湭瑙佹槑鏄惧紓甯搞�俓",\"name\":\"璧佃タ瀹乗",\"patientAge\":47,\"clinicalDiagnosis\":\"\",\"mzh\":\"136954\",\"F_RPT_UID\":\"http://192.168.10.3:8021/PDFReport/27/136954.pdf\",\"reportDoctorName\":\"妯婄户鍏僜",\"studyReport\":82737,\"F_RPT_WRITE_DATE\":\"2025-04-07 09:32:28\"},{\"reportDoctorCode\":\"\",\"deptName\":\"\",\"checkDoctorCode\":\"\",\"ghxh\":\"141493\",\"gender\":\"鏈煡\",\"brid\":\"141493\",\"checkParts\":\"鑳搁儴+涓婅吂閮�+鑲嬮涓夌淮閲嶅缓\",\"zyh\":\"2025004388 \",\"diagnosis\":\"鍙宠偤涓婁笅鐐庣棁锛沑\n鍙充晶绗�2鍓嶈倠楠ㄦ姌鎰堝悎鍚庤〃鐜帮紝璇风粨鍚堜复搴婄梾鍙诧紱\\n涓婅吂閮–T骞虫壂鏈鏄庢樉寮傚父 \",\"checkDoctorName\":\"杈涙枃杈塡",\"F_MACHINE_NAME_LIST\":\"CT\",\"reportDate\":\"2025-06-10 09:34:58\",\"examinationDate\":\"2025-06-10 09:34:58\",\"examination\":\"鑳搁儴CT骞虫壂鏄剧ず锛氳兏寤撳绉帮紝绾甸殧灞呬腑銆傛皵绠°�佹敮姘旂閫氱晠锛屾湭瑙佺嫮绐勶紱鍙宠偤涓嬪彾鍙鏉＄诞褰憋紱鍙宠偤涓笂鍙舵部鏀皵绠¤蛋琛屽彲瑙佺被鍦嗗舰瀵嗗害澧為珮褰憋紱鍙堕棿瑁傛棤绉讳綅锛屽弻鑲洪棬鏈澧炲ぇ銆傜旱闅斿眳涓紝鍏跺唴鏈鏄庢樉澧炲ぇ娣嬪反缁撳奖銆傚績褰辨湭瑙佸澶э紝鏈鑳告按寰佽薄銆俓\n 涓婅吂閮–T骞虫壂鏄剧ず锛氳倽鑴忓ぇ灏忋�佸舰鎬佹甯革紝鑲濆唴鏈鏄庢樉灞�鐏舵�у瘑搴﹀紓甯革紝鑲濆唴琛�绠¤蛋琛屾甯革紝鑲濆唴澶栬儐绠℃湭瑙佹墿寮犮�傝儐鍥婁笉澶э紝鍏跺唴鏈鏄庢樉寮傚父瀵嗗害褰便�傝劸鑴忋�佽儼鑵哄ぇ灏忓舰鎬佸強瀵嗗害姝ｅ父銆傚弻渚ц偩鑴忓绉帮紝澶у皬鍙婂舰鎬佹甯革紝鏈灞�鐏舵�у瘑搴﹀紓甯搞�傝吂鑶滃悗鏈鑲垮ぇ娣嬪反缁撱�俓\n 鑲嬮CT骞虫壂鍙婁笁缁撮噸寤烘樉绀猴細鍙充晶绗�2鍓嶈倠璧拌寮傚父锛屼綑鍙屼晶鑲嬮鏈鏄庢樉楠ㄦ姌寰佽薄銆俓",\"name\":\"璧佃タ瀹乗",\"patientAge\":48,\"clinicalDiagnosis\":\"\",\"mzh\":\"141493\",\"F_RPT_UID\":\"http://192.168.10.3:8021/PDFReport/28/141493.pdf\",\"reportDoctorName\":\"寮犺壋鑹砛",\"studyReport\":87091,\"F_RPT_WRITE_DATE\":\"2025-06-10 09:01:14\"}]";
// return AjaxResult.success(JSONUtil.parseArray(json1));
}
-
/**
* 鑾峰彇Lis妫�楠屾暟鎹�
+ *
* @param json
* @return
*/
@@ -145,44 +159,52 @@
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());
+ 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\":\"琛�娑插垎鏋怽"}]";
+// String json1 = "[{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0103\",\"diagnosis\":0,\"project\":\"0-0.20\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"checkParts\":\"椤圭洰1\",\"proResult\":\"0.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"*宸ㄥぇ鏈垚鐔熺粏鑳瀄",\"tjStandardGtValue\":\"0-0.20\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000070 \",\"checkParts\":\"椤圭洰2\",\"jcxmid\":\"0104\",\"diagnosis\":0,\"project\":\"0-2.50\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.1000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"*宸ㄥぇ鏈垚鐔熺粏鑳炵櫨鍒嗘瘮\",\"tjStandardGtValue\":\"0-2.50\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0101\",\"diagnosis\":0,\"project\":\"0-0.20\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"*寮傚舰娣嬪反缁嗚優\",\"tjStandardGtValue\":\"0-0.20\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0102\",\"diagnosis\":0,\"project\":\"0-2.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"*寮傚舰娣嬪反缁嗚優鐧惧垎姣擻",\"tjStandardGtValue\":\"0-2.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0001\",\"diagnosis\":0,\"project\":\"4.00-10.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"5.4500\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"鈼嗙櫧缁嗚優\",\"tjStandardGtValue\":\"4.00-10.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0012\",\"diagnosis\":0,\"project\":\"3.50-5.50\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"4.4400\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"10^12/L\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"鈼嗙孩缁嗚優\",\"tjStandardGtValue\":\"3.50-5.50\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0014\",\"diagnosis\":0,\"project\":\"37.00-54.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"42.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"鈼嗙孩缁嗚優鍘嬬Н\",\"tjStandardGtValue\":\"37.00-54.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0013\",\"diagnosis\":0,\"project\":\"110.00-160.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"135.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"g/L\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"鈼嗚绾㈣泲鐧絓",\"tjStandardGtValue\":\"110.00-160.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0020\",\"diagnosis\":0,\"project\":\"100.00-300.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"154.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"鈼嗚灏忔澘\",\"tjStandardGtValue\":\"100.00-300.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0023\",\"diagnosis\":0,\"project\":\"0.10-0.50\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.1700\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"鈼嗚灏忔澘鍘嬬Н\",\"tjStandardGtValue\":\"0.10-0.50\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0006\",\"diagnosis\":0,\"project\":\"0.10-0.80\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.2900\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"鍗曟牳缁嗚優\",\"tjStandardGtValue\":\"0.10-0.80\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0007\",\"diagnosis\":0,\"project\":\"3.00-8.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"5.3000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"鍗曟牳缁嗚優鐧惧垎姣擻",\"tjStandardGtValue\":\"3.00-8.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0019\",\"diagnosis\":0,\"project\":\"10.00-15.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"13.7000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"绾㈢粏鑳炲垎甯冨搴﹀彉寮傜郴鏁癨",\"tjStandardGtValue\":\"10.00-15.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0018\",\"diagnosis\":0,\"project\":\"30.00-57.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"47.7000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"fL\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"绾㈢粏鑳炲垎甯冨搴︽爣鍑嗗樊\",\"tjStandardGtValue\":\"30.00-57.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0004\",\"diagnosis\":0,\"project\":\"0.80-4.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"2.1100\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"娣嬪反缁嗚優\",\"tjStandardGtValue\":\"0.80-4.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0005\",\"diagnosis\":0,\"project\":\"20.00-40.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"38.7000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"娣嬪反缁嗚優鐧惧垎姣擻",\"tjStandardGtValue\":\"20.00-40.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0015\",\"diagnosis\":0,\"project\":\"80.00-100.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"94.6000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"fL\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"骞冲潎绾㈢粏鑳炰綋绉痋",\"tjStandardGtValue\":\"80.00-100.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0016\",\"diagnosis\":0,\"project\":\"27.00-34.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"30.4000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"pg\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"骞冲潎绾㈢粏鑳炶绾㈣泲鐧藉惈閲廫",\"tjStandardGtValue\":\"27.00-34.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0017\",\"diagnosis\":0,\"project\":\"320.00-360.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"321.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"g/L\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"骞冲潎绾㈢粏鑳炶绾㈣泲鐧芥祿搴",\"tjStandardGtValue\":\"320.00-360.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0022\",\"diagnosis\":0,\"project\":\"6.00-14.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"11.3000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"fL\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"骞冲潎琛�灏忔澘浣撶Н\",\"tjStandardGtValue\":\"6.00-14.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0010\",\"diagnosis\":0,\"project\":\"0-0.10\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.0100\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"鍡滅⒈绮掔粏鑳瀄",\"tjStandardGtValue\":\"0-0.10\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0011\",\"diagnosis\":0,\"project\":\"0-3.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.2000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"鍡滅⒈绮掔粏鑳炵櫨鍒嗘瘮\",\"tjStandardGtValue\":\"0-3.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0008\",\"diagnosis\":0,\"project\":\"0.05-0.35\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.0300\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"鍡滈吀绮掔粏鑳瀄",\"tjStandardGtValue\":\"0.05-0.35\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0009\",\"diagnosis\":0,\"project\":\"0.50-5.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.6000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"鍡滈吀绮掔粏鑳炵櫨鍒嗘瘮\",\"tjStandardGtValue\":\"0.50-5.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0021\",\"diagnosis\":0,\"project\":\"9.00-18.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"16.4000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"fL\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"琛�灏忔澘鍒嗗竷瀹藉害\",\"tjStandardGtValue\":\"9.00-18.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0002\",\"diagnosis\":0,\"project\":\"2.00-7.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"3.0100\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"涓�х矑缁嗚優\",\"tjStandardGtValue\":\"2.00-7.00\"},{\"deptName\":\"鍐呭効绉� \",\"brid\":\"250512000069 \",\"jcxmid\":\"0003\",\"diagnosis\":0,\"project\":\"52.00-72.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"55.2000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129 \",\"shys\":\"寮犻挵鏃� \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃� \",\"proName\":\"涓�х矑缁嗚優鐧惧垎姣擻",\"tjStandardGtValue\":\"52.00-72.00\"}]";
// return AjaxResult.success(JSONUtil.parseArray(json1));
}
@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);
+ 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()) {
@@ -196,7 +218,8 @@
@Transactional
@PostMapping("/asyncPacs")
public AjaxResult asyncPacs(@RequestBody String json) {
- log.info("鍚堝苟妫�娴嬪悓姝ュ弬鏁� ->{}",json);
+ try {
+ log.info("鍚堝苟妫�娴嬪悓姝ュ弬鏁� ->{}", json);
// try {
// Thread.sleep(2000);
// } catch (InterruptedException ignored) {
@@ -204,883 +227,535 @@
// }
// 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");
- if (pacs != null && !pacs.isEmpty()){
- LtkjExamJcsqd ltkjExamJcsqd = new LtkjExamJcsqd();
- ltkjExamJcsqd.setTjh(pacs.getStr("mzh"));
+ 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");
+ 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);
-
- 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);
- 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 mzh = entries.getStr("mzh");
- LtkjHysqd hysqd = new LtkjHysqd();
- LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjOrder::getCardId,mzh);
- TjOrder order = tjOrderService.getOne(wrapper);
- hysqd.setTjh(order.getTjNumber());
-
- 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);
+ 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);
- 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){
+ 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.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
- }catch (Exception 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.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());
+ boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
+ /* log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}", ltkjExamJcsqd.getJgzt());
+ if (StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())) {
+// jcycxmService.deletedByTjh(order.getTjNumber());
+ jcycxmService.deletedByTjhAndXmm(order.getTjNumber(),ltkjExamJcsqd.getJcxmmc());
+ 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("鍙屼晶妞庨棿瀛旀棤鐙獎")) {
+ log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙� 鍗冲皢淇濆瓨妫�鏌ュ紓甯哥粨鏋�->{}->{}", order.getTjNumber(), jg);
+ try {
+ 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);
+ } catch (Exception e) {
+ logger.error("淇濆瓨妫�鏌ュ紓甯哥粨鏋滃け璐�",e);
+ throw new RuntimeException(e);
+ }
+ log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙� 淇濆瓨妫�鏌ュ紓甯哥粨鏋滃畬姣�");
+ }
+ }
+ }
+*/
+ 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 {
+
+ configController.tjjcycxm(tjNum, "0");
+// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
+ } 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());
+ orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
+ } 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();
+ } 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");
- @PostMapping(value = "/callback")
- public void callback(@RequestBody JSONObject json) {
- System.out.println("===================璁板綍鎵撳嵃娆℃暟====================");
- System.out.println(json.toJSONString());
- String tjNumber = json.get("tjNumber").toString();
- String reportName = json.get("reportName").toString();
- System.out.println("鐢ㄦ埛: "+tjNumber+reportName+" 宸叉墦鍗�");
+ 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());
+
+ 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;
+// }
+// }
+// }
+// LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+// queryWrapper.eq(LtkjJianchajianyanTree::getCardId, order.getCardId());
+// queryWrapper.eq(LtkjJianchajianyanTree::getType, "妫�鏌�");
+// queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm, xmdm);
+// LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
+
+ String brid = pacs.getStr("brid");
+
+// ltkjExamJcsqd.setTmh(brid + tree.getHisXmdm());
+// if(StringUtil.isNotBlank(xmdm)){
+// String tmh = brid+ xmdm;
+// ltkjExamJcsqd.setTmh(tmh);
+// }else {
+// String tmh = brid+ project.getProId();
+// ltkjExamJcsqd.setTmh(tmh);
+// }
+ ltkjExamJcsqd.setTmh(order.getCardId()+brid);
+ ltkjExamJcsqd.setBgys(pacs.getStr("checkDoctorName"));
+ ltkjExamJcsqd.setBgysid(pacs.getStr("checkDoctorCode"));
+ ltkjExamJcsqd.setSqsj(format.format(order.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());
+ jcycxmService.deletedByTjhAndXmm(order.getTjNumber(),ltkjExamJcsqd.getJcxmmc());
+ 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("鍙屼晶妞庨棿瀛旀棤鐙獎")) {
+ log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙� 鍗冲皢淇濆瓨妫�鏌ュ紓甯哥粨鏋�->{}->{}", order.getTjNumber(), jg);
+ try {
+ 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);
+ } catch (Exception e) {
+ log.error("淇濆瓨妫�鏌ュ紓甯哥粨鏋滃け璐�",e);
+ throw new RuntimeException(e);
+ }
+ log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙� 淇濆瓨妫�鏌ュ紓甯哥粨鏋滃畬姣�");
+ }
+ }
+ }*/
+
+ 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 {
+ configController.tjjcycxm(tjNum, "0");
+// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
+ } 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();
+
+
+ TjProject project = projectService.getById(tj.getStr("proId"));
+ String xmdm = project.getHisXmbm();
+ LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(LtkjJianchajianyanTree::getCardId, mzh);
+ 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(order.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());
+ orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
+ } 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("鍚屾澶辫触璇烽噸璇�");
}
+ }
+ @PostMapping(value = "/callback")
+ public void callback(@RequestBody JSONObject json) {
+ System.out.println("===================璁板綍鎵撳嵃娆℃暟====================");
+ System.out.println(json.toJSONString());
+ String tjNumber = json.get("tjNumber").toString();
+ String reportName = json.get("reportName").toString();
+ System.out.println("鐢ㄦ埛: " + tjNumber + reportName + " 宸叉墦鍗�");
+ }
-
-
-// @Autowired
-// private ITjCustomerService tjCustomerService;
-//
-// @Autowired
-// private HisApiGetMethodService service;
-//
-// private static final String HIS_URL = "https://mock.mengxuegu.com/mock/664d3dbce45d2156fa209c80/example/api/His/HisRequest";
-//
-//
-// @GetMapping("/his")
-// public AjaxResult Outpinconapply() {
-// Map<String, Object> maps = new HashMap<>();
-// maps.put("his_registration_id","20240704000218");
-// maps.put("ksbm", "浣撴涓績");
-// maps.put("pagecount", 100);
-// maps.put("page", 1);
-// service.getHISDataNew("", maps);
-// return AjaxResult.success();
-// }
-
-
-// @PostMapping("/Outpincreateapply")
-// @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖娉ㄥ唽淇℃伅")
-// public AjaxResult Outpincreateapply(@RequestBody TjCustomer customer) {
-// Map<String, Object> map = new HashMap<>();
-// if (null != customer.getCusId()) {
-// map.put("pationid", customer.getCusId());
-// } else {
-// map.put("pationid", null);
-// }
-// map.put("brxm", customer.getCusName());
-// map.put("brxb", customer.getCusSex());
-// map.put("csrq", customer.getCusBrithday());
-// map.put("brnl", customer.getAge());
-// map.put("brnldw", customer.getAgeUnit());
-// map.put("addr", customer.getAddr());
-// map.put("gzdw", null);
-// map.put("dwdz", null);
-// map.put("lxr", customer.getCusName());
-// map.put("lxrdh", customer.getCusPhone());
-// map.put("lxrgx", "鏈汉");
-// map.put("sfzh", customer.getCusIdcard());
-// map.put("jhrxm", null);
-// map.put("jhrsfzh", null);
-// map.put("mz", customer.getCusNational());
-// map.put("zy", customer.getCareer());
-// map.put("fbbm", null);
-// map.put("czy", customer.getCreateBy());
-// map.put("jkkkh", customer.getIndexCard());
-// map.put("mindex_id", customer.getIndexCard());
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Outpinconapply")
-// @ApiOperation(value = "闂ㄨ瘖鍖荤敓鎺ヨ瘖")
-// public AjaxResult Outpinconapply(@RequestParam @ApiParam(value = "灏辫瘖鍙�") String jzh,
-// @ApiParam(value = "鎺ヨ瘖鏃ユ湡") @RequestParam Date jzrq,
-// @ApiParam(value = "鎺ヨ瘖鍖诲笀") @RequestParam String jzysbm) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("jzh",jzh);
-// map.put("jzrq",jzrq);
-// map.put("jzysbm",jzysbm);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Outpinunconapply")
-// @ApiOperation(value = "闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖")
-// public AjaxResult Outpinunconapply(@RequestParam @ApiParam(value = "灏辫瘖鍙�") String jzh,
-// @ApiParam(value = "鎺ヨ瘖鏃ユ湡") @RequestParam Date jzrq,
-// @ApiParam(value = "鎺ヨ瘖鍖诲笀") @RequestParam String jzysbm) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("jzh",jzh);
-// map.put("jzrq",jzrq);
-// map.put("jzysbm",jzysbm);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-// @PostMapping("/Outpinimpapply")
-// @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖璇婃柇")
-// public AjaxResult Outpinimpapply(@RequestBody OutpinimpapplyDto dto ) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",dto.getHisRegistrationId());
-// map.put("mzzdid",dto.getMzzdid());
-// map.put("sqysbm",dto.getSqysbm());
-// map.put("mzksbm",dto.getMzksbm());
-// map.put("fbrq",dto.getFbrq());
-// map.put("zdrq",dto.getZdrq());
-// map.put("czybm",dto.getCzybm());
-// map.put("czyksbm",dto.getCzyksbm());
-// map.put("zs",dto.getZs());
-// map.put("bs",dto.getBs());
-// map.put("clyz",dto.getClyz());
-// map.put("jws",dto.getJws());
-// map.put("tgjc",dto.getTgjc());
-// map.put("gms",dto.getGms());
-// map.put("jbbm",dto.getJbbm());
-// map.put("jbbm1",dto.getJbbm1());
-// map.put("jbbm2",dto.getJbbm2());
-//// map.put("tw",dto.getTw());
-//// map.put("mb",dto.getMb());
-//// map.put("hx",dto.getHx());
-//// map.put("bp",dto.getBp());
-// map.put("fzbz",dto.getFzbz());
-// map.put("hzqx",dto.getHzqx());
-// map.put("sfqc",dto.getSfqc());
-// map.put("qchs",dto.getQchs());
-// map.put("sfqj",dto.getSfqj());
-// map.put("jzqk",dto.getJzqk());
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Outpinmesapply")
-// @ApiOperation(value = "闂ㄨ瘖棰勪氦鏀惰垂")
-// public AjaxResult Outpinmesapply(@RequestParam @ApiParam(value = "闂ㄨ瘖鎮ｈ�� ID") String pationid,
-// @ApiParam(value = "鎿嶄綔鍛�") @RequestParam String czybm,
-// @ApiParam(value = "鏀粯绫诲瀷缂栫爜") @RequestParam String zflxbm,
-// @ApiParam(value = "棰勪氦閲戦") @RequestParam int yjje) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("pationid",pationid);
-// map.put("czybm",czybm);
-// map.put("zflxbm",zflxbm);
-// map.put("yjje",yjje);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Outpinregapply")
-// @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖鎸傚彿鐢宠")
-// public AjaxResult Outpinregapply(@RequestBody OutpinregapplyDto dao) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("pationid",dao.getPationid());
-// map.put("his_registration_id",dao.getHisRegistrationId());
-// map.put("sqysbm",dao.getSqysbm());
-// map.put("mzksbm",dao.getMzksbm());
-// map.put("czybm",dao.getCzybm());
-// map.put("sfjz",dao.getSfjz());
-// map.put("ghzlbm",dao.getGhzlbm());
-// map.put("ywckbm",dao.getYwckbm());
-// map.put("sflstd",dao.getSflstd());
-// map.put("ghrq",dao.getGhrq());
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-// @PostMapping("/Outpintestapply")
-// @ApiOperation(value = "闂ㄨ瘖妫�楠岀敵璇�")
-// public AjaxResult Outpintestapply(@RequestBody OutpintestapplyDto dao) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",dao.getHisRegistrationId());
-// map.put("sfzh",dao.getHisRegistrationId());
-// map.put("sqysbm",dao.getSqysbm());
-// map.put("mzksbm",dao.getMzksbm());
-// map.put("sjrq",dao.getSjrq());
-// map.put("czybm",dao.getCzybm());
-// map.put("czyksbm",dao.getCzyksbm());
-// map.put("sfjz",dao.getSfjz());
-// map.put("details",dao.getDetails());
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Outpindeltestapply")
-// @ApiOperation(value = "浣滃簾闂ㄨ瘖妫�楠岀敵璇�")
-// public AjaxResult Outpindeltestapply(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-// @ApiParam(value = "鎿嶄綔鍛�") @RequestParam String czybm,
-// @ApiParam(value = "鐢宠鍗曞彿") @RequestParam String sqdh) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",hisRegistrationId);
-// map.put("czybm",czybm);
-// map.put("zflxbm",sqdh);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Outpinexamapply")
-// @ApiOperation(value = "闂ㄨ瘖妫�鏌ョ敵璇�")
-// public AjaxResult Outpinexamapply(@RequestBody OutpinexamapplyDto dao) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",dao.getHisRegistrationId());
-// map.put("sfzh",dao.getHisRegistrationId());
-// map.put("sqysbm",dao.getSqysbm());
-// map.put("mzksbm",dao.getMzksbm());
-// map.put("sjrq",dao.getSjrq());
-// map.put("czybm",dao.getCzybm());
-// map.put("czyksbm",dao.getCzyksbm());
-// map.put("lczz",dao.getLczz());
-// map.put("lczd",dao.getLczd());
-// map.put("jcms",dao.getJcms());
-// map.put("jcbw",dao.getJcbw());
-// map.put("sfjz",dao.getSfjz());
-// map.put("details",dao.getDetails());
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Outpindelexamapply")
-// @ApiOperation(value = "浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�")
-// public AjaxResult Outpindelexamapply(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-// @ApiParam(value = "鎿嶄綔鍛�") @RequestParam String czybm,
-// @ApiParam(value = "鐢宠鍗曞彿") @RequestParam String sqdh) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",hisRegistrationId);
-// map.put("czybm",czybm);
-// map.put("zflxbm",sqdh);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Outpinmedapply")
-// @ApiOperation(value = "闂ㄨ瘖鍖荤枟鍖诲槺鐢宠")
-// public AjaxResult Outpinmedapply(@RequestBody OutpinmedapplyDto dao) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",dao.getHisRegistrationId());
-// map.put("sfzh",dao.getHisRegistrationId());
-// map.put("sqysbm",dao.getSqysbm());
-// map.put("mzksbm",dao.getMzksbm());
-// map.put("sjrq",dao.getSjrq());
-// map.put("czybm",dao.getCzybm());
-// map.put("czyksbm",dao.getCzyksbm());
-// map.put("bqsm",dao.getBqsm());
-// map.put("sfjz",dao.getSfjz());
-// map.put("details",dao.getDetails());
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Outpindelmedapply")
-// @ApiOperation(value = "浣滃簾闂ㄨ瘖鍖荤枟鍖诲槺鐢宠")
-// public AjaxResult Outpindelmedapply(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-// @ApiParam(value = "鎿嶄綔鍛�") @RequestParam String czybm,
-// @ApiParam(value = "鐢宠鍗曞彿") @RequestParam String sqdh) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",hisRegistrationId);
-// map.put("czybm",czybm);
-// map.put("zflxbm",sqdh);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Outpintreatapply")
-// @ApiOperation(value = "闂ㄨ瘖娌荤枟澶勭疆鐢宠")
-// public AjaxResult Outpintreatapply(@RequestBody OutpintreatapplyDto dao) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",dao.getHisRegistrationId());
-// map.put("sfzh",dao.getHisRegistrationId());
-// map.put("sqysbm",dao.getSqysbm());
-// map.put("mzksbm",dao.getMzksbm());
-// map.put("sjrq",dao.getSjrq());
-// map.put("czybm",dao.getCzybm());
-// map.put("czyksbm",dao.getCzyksbm());
-// map.put("bqsm",dao.getBqsm());
-// map.put("sfjz",dao.getSfjz());
-// map.put("zlbz",dao.getZlbz());
-// map.put("details",dao.getDetails());
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-// @PostMapping("/Outpintdelreatapply")
-// @ApiOperation(value = "浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠")
-// public AjaxResult Outpintdelreatapply(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-// @ApiParam(value = "鎿嶄綔鍛�") @RequestParam String czybm,
-// @ApiParam(value = "鐢宠鍗曞彿") @RequestParam String sqdh) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",hisRegistrationId);
-// map.put("czybm",czybm);
-// map.put("zflxbm",sqdh);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Outpinmedicapply")
-// @ApiOperation(value = "闂ㄨ瘖鑽搧鐢宠")
-// public AjaxResult Outpinmedicapply(@RequestBody OutpinmedicapplyDto dao) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",dao.getHisRegistrationId());
-// map.put("sfzh",dao.getHisRegistrationId());
-// map.put("sqysbm",dao.getSqysbm());
-// map.put("mzksbm",dao.getMzksbm());
-// map.put("sjrq",dao.getSjrq());
-// map.put("czybm",dao.getCzybm());
-// map.put("czyksbm",dao.getCzyksbm());
-// map.put("cflxbm",dao.getCflxbm());
-// map.put("yfbm",dao.getYfbm());
-// map.put("fyts",dao.getFyts());
-// map.put("mzzd",dao.getMzzd());
-// map.put("details",dao.getDetails());
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-// @PostMapping("/Outpindelmedicapply")
-// @ApiOperation(value = "浣滃簾闂ㄨ瘖鑽搧鐢宠")
-// public AjaxResult Outpindelmedicapply(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-// @ApiParam(value = "鎿嶄綔鍛�") @RequestParam String czybm,
-// @ApiParam(value = "鐢宠鍗曞彿") @RequestParam String sqdh) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",hisRegistrationId);
-// map.put("czybm",czybm);
-// map.put("zflxbm",sqdh);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Getexamapplyinfo")
-// @ApiOperation(value = "鑾峰彇妫�鏌ョ敵璇蜂俊鎭�")
-// public AjaxResult Getexamapplyinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-// @ApiParam(value = "绉戝缂栫爜") @RequestParam String ksbm,
-// @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-// @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",hisRegistrationId);
-// map.put("ksbm",ksbm);
-// map.put("jsrq",jsrq);
-// map.put("ksrq",ksrq);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Getexamreportinfo")
-// @ApiOperation(value = "鑾峰彇妫�鏌ユ姤鍛婁俊鎭�")
-// public AjaxResult Getexamreportinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-// @ApiParam(value = "绉戝鍚嶇О") @RequestParam String ksmc,
-// @ApiParam(value = "鎮ｈ�� ID") @RequestParam String pationid,
-// @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-// @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-// @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-// @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page,
-// @ApiParam(value = "鐘舵�侊細宸茬櫥璁� 锛屽凡璇婃柇锛屽凡浣滃簾") @RequestParam String status,
-// @ApiParam(value = "鍗＄被鍨� 5 灏辫瘖娴佹按鍙� 9 鐢靛瓙鍋ュ悍鍗� 娴佹按鍙� 榛樿 5") @RequestParam String cardtype) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",hisRegistrationId);
-// map.put("ksmc",ksmc);
-// map.put("jsrq",jsrq);
-// map.put("ksrq",ksrq);
-// map.put("pationid",pationid);
-// map.put("pagecount",pagecount);
-// map.put("page",page);
-// map.put("status",status);
-// map.put("cardtype",cardtype);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-// @PostMapping("/Examreportrecordinfo")
-// @ApiOperation(value = "鏂板/淇敼妫�鏌ユ姤鍛婅褰�")
-// public AjaxResult Examreportrecordinfo(@RequestBody ExamreportrecordinfoDto dto) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",dto.getHisRegistrationId());
-// map.put("jcbgid",dto.getJcbgid());
-// map.put("sfjz",dto.getSfjz());
-// map.put("pationid",dto.getPationid());
-// map.put("mzzybz",dto.getMzzybz());
-// map.put("brxm",dto.getBrxm());
-// map.put("brxb",dto.getBrxb());
-// map.put("brnl",dto.getBrnl());
-// map.put("brnldw",dto.getBrnldw());
-// map.put("lxrdh",dto.getLxrdh());
-// map.put("hzksbm",dto.getHzksbm());
-// map.put("sqdh",dto.getSqdh());
-// map.put("sqjgdm",dto.getSqjgdm());
-// map.put("sqsj",dto.getSqsj());
-// map.put("sqrbm",dto.getSqrbm());
-// map.put("sqrxm",dto.getSqrxm());
-// map.put("hzzs",dto.getHzzs());
-// map.put("hzbs",dto.getHzbs());
-// map.put("xyzdbm",dto.getXyzdbm());
-// map.put("xyzdmc",dto.getXyzdmc());
-// map.put("zdrq",dto.getZdrq());
-// map.put("fbrq",dto.getFbrq());
-// map.put("tsjcbz",dto.getTsjcbz());
-// map.put("jcxmdm",dto.getJcxmdm());
-// map.put("jcxmmc",dto.getJcxmmc());
-// map.put("jcjgdm",dto.getJcjgdm());
-// map.put("jcjsbh",dto.getJcjsbh());
-// map.put("jcjsxm",dto.getJcjsxm());
-// map.put("jcrq",dto.getJcrq());
-// map.put("jcbgdbh",dto.getJcbgdbh());
-// map.put("jcff",dto.getJcff());
-// map.put("jcksbh",dto.getJcksbh());
-// map.put("jcksmc",dto.getJcksmc());
-// map.put("yqbm",dto.getYqbm());
-// map.put("jcbgbz",dto.getJcbgbz());
-// map.put("jcbwdm",dto.getJcbwdm());
-// map.put("bgksbh",dto.getBgksbh());
-// map.put("bgksmc",dto.getBgksmc());
-// map.put("bgrq",dto.getBgrq());
-// map.put("bgysbh",dto.getBgysbh());
-// map.put("bgysxm",dto.getBgysxm());
-// map.put("shysbh",dto.getShysbh());
-// map.put("shysxm",dto.getShysxm());
-// map.put("jch",dto.getJch());
-// map.put("yxh",dto.getYxh());
-// map.put("kdsj",dto.getKdsj());
-// map.put("jclx",dto.getJclx());
-// map.put("yyh",dto.getYyh());
-// map.put("yxbx",dto.getYxbx());
-// map.put("yxzd",dto.getYxzd());
-// map.put("sfyyx",dto.getSfyyx());
-// map.put("yxzl",dto.getYxzl());
-// map.put("yxs",dto.getYxs());
-// map.put("jlysbh",dto.getJlysbh());
-// map.put("jlrq",dto.getJlrq());
-// map.put("bgzt",dto.getBgzt());
-// map.put("lczdfh",dto.getLczdfh());
-// map.put("wjz",dto.getWjz());
-// map.put("wjzzdmc",dto.getWjzzdmc());
-// map.put("wjzjcysyj",dto.getWjzjcysyj());
-// map.put("wjzjcysbh",dto.getWjzjcysbh());
-// map.put("wjzjcysxyj",dto.getWjzjcysyj());
-// map.put("wjzqrrq",dto.getWjzqrrq());
-// map.put("wjzjsrbh",dto.getWjzjsrbh());
-// map.put("wjzjsrxm",dto.getWjzjsrxm());
-// map.put("wjzjsrq",dto.getWjzjsrq());
-// map.put("wjzclysbh",dto.getWjzclysbh());
-// map.put("wjzclysxm",dto.getWjzclysxm());
-// map.put("wjzclyj",dto.getWjzclyj());
-// map.put("wjzclrq",dto.getWjzclrq());
-// map.put("sfkf",dto.getSfkf());
-// map.put("yzid",dto.getYzid());
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-// @PostMapping("/Getexamurgentinfo")
-// @ApiOperation(value = "鑾峰彇妫�鏌ュ嵄鎬ュ�间俊鎭�")
-// public AjaxResult Getexamurgentinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-// @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-// @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-// @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-// @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",hisRegistrationId);
-// map.put("jsrq",jsrq);
-// map.put("ksrq",ksrq);
-// map.put("pagecount",pagecount);
-// map.put("page",page);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Getexamimageinfo")
-// @ApiOperation(value = "鑾峰彇妫�鏌ュ奖鍍忎俊鎭�")
-// public AjaxResult Getexamimageinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-// @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-// @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-// @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-// @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",hisRegistrationId);
-// map.put("jsrq",jsrq);
-// map.put("ksrq",ksrq);
-// map.put("pagecount",pagecount);
-// map.put("page",page);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Getlabapplyinfo")
-// @ApiOperation(value = "鑾峰彇妫�楠岀敵璇蜂俊鎭�")
-// public AjaxResult Getlabapplyinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-// @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-// @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-// @ApiParam(value = "鍗＄被鍨嬶紝 1 鐢靛瓙鍋ュ悍鍗� 2 韬唤璇� 3" +
-// "璇婄枟鍗� 4 鎮ｈ�� ID 5 灏辫瘖娴佹按鍙� 榛樿" +
-// "4 鎮ｈ�� ID") @RequestParam String cardtype,
-// @ApiParam(value = "涓氬姟绫诲瀷锛氶棬璇娿�佷綇闄€�佷綋妫�銆佸叾浠�") @RequestParam String mzorzy,
-// @ApiParam(value = "鐢宠绉戝") @RequestParam String ksbm) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",hisRegistrationId);
-// map.put("jsrq",jsrq);
-// map.put("ksrq",ksrq);
-// map.put("cardtype",cardtype);
-// map.put("mzorzy",mzorzy);
-// map.put("ksbm",ksbm);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Getlabreportinfo")
-// @ApiOperation(value = "鑾峰彇妫�楠屾姤鍛婅褰曚俊鎭�")
-// public AjaxResult Getlabreportinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-// @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-// @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-// @ApiParam(value = "鐢宠绉戝") @RequestParam String ksbm,
-// @ApiParam(value = "鐢宠绉戝") @RequestParam String pationid,
-// @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-// @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",hisRegistrationId);
-// map.put("jsrq",jsrq);
-// map.put("ksrq",ksrq);
-// map.put("ksbm",ksbm);
-// map.put("pationid",pationid);
-// map.put("pagecount",pagecount);
-// map.put("page",page);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-//
-// @PostMapping("/Getlabgermrepinfo")
-// @ApiOperation(value = "鑾峰彇寰敓鐗╂姤鍛婅褰曚俊鎭�")
-// public AjaxResult Getlabgermrepinfo(@RequestParam @ApiParam(value = "妫�楠屾姤鍛� ID") String jybgid) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("jybgid",jybgid);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-// @PostMapping("/Getlabgermdetailinfo")
-// @ApiOperation(value = "鑾峰彇寰敓鐗╄嵂鏁忎俊鎭�")
-// public AjaxResult Getlabgermdetailinfo(@RequestParam @ApiParam(value = "妫�楠屾姤鍛� ID") String jybgid) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("jybgid",jybgid);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Getlaburgentinfo")
-// @ApiOperation(value = "鑾峰彇鍗辨�ュ�间俊鎭�")
-// public AjaxResult Getlaburgentinfo(@RequestParam @ApiParam(value = "妫�楠屾姤鍛� ID") String jybgid,
-// @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-// @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("jybgid",jybgid);
-// map.put("jsrq",jsrq);
-// map.put("ksrq",ksrq);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Labreportapply")
-// @ApiOperation(value = "妫�楠屾牱鏈嫆鏀惰褰�")
-// public AjaxResult Labreportapply(@RequestParam @ApiParam(value = "鏉＄爜鍙�") String tmh,
-// @ApiParam(value = "鎺ユ敹浜哄憳浠ｇ爜锛屽瓧鍏镐唬鐮�") @RequestParam String jsrydm,
-// @ApiParam(value = "鎷掓敹鎶ュ憡鏃ユ湡锛寉yyy-mm-dd hh:mm:ss") @RequestParam Date jsrq,
-// @ApiParam(value = "鎷掓敹鍘熷洜") @RequestParam String jsyy) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("tmh",tmh);
-// map.put("jsrydm",jsrydm);
-// map.put("jsrq",jsrq);
-// map.put("jsyy",jsyy);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Getlabreginfoinfo")
-// @ApiOperation(value = "鑾峰彇妫�楠岀櫥璁颁俊鎭�")
-// public AjaxResult Getlabreginfoinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-// @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-// @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-// @ApiParam(value = "鐘舵�侊細 宸茬敵璇� 宸查噰鏍� 宸叉娴� 宸插" +
-// "鏍� 宸蹭綔搴�") @RequestParam String Status,
-// @ApiParam(value = "鎮ｈ�� ID") @RequestParam String pationid,
-// @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-// @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",hisRegistrationId);
-// map.put("Status",Status);
-// map.put("jsrq",jsrq);
-// map.put("ksrq",ksrq);
-// map.put("pationid",pationid);
-// map.put("pagecount",pagecount);
-// map.put("page",page);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-// @PostMapping("/Testcostapply")
-// @ApiOperation(value = "浣撴璐圭敤鐢宠")
-// public AjaxResult Testcostapply(@RequestBody TestcostapplyDto dao) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",dao.getHisRegistrationId());
-// map.put("czybm",dao.getCzybm());
-// map.put("czyksbm",dao.getCzyksbm());
-// map.put("brxm",dao.getBrxm());
-// map.put("ywck",dao.getYwck());
-// map.put("sfzh",dao.getSfzh());
-// map.put("jkkkh",dao.getJkkkh());
-// map.put("mindexId",dao.getMindexId());
-// map.put("brxb",dao.getBrxb());
-// map.put("csrq",dao.getCsrq());
-// map.put("brnl",dao.getBrnl());
-// map.put("brnldw",dao.getBrnldw());
-// map.put("addr",dao.getAddr());
-// map.put("lxrdh",dao.getLxrdh());
-// map.put("mz",dao.getMz());
-// map.put("zy",dao.getZy());
-// map.put("details",dao.getDetails());
-// map.put("mxfyxmbm",dao.getMxfyxmbm());
-// map.put("sfzhfy",dao.getSfzhfy());
-// map.put("sl",dao.getSl());
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Testregapply")
-// @ApiOperation(value = "鏂板鎴栦慨鏀逛綋妫�鐧昏淇℃伅")
-// public AjaxResult Testregapply(@RequestBody TestregapplyDto dao) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",dao.getHisRegistrationId());
-// map.put("czybm",dao.getCzybm());
-// map.put("czyksbm",dao.getCzyksbm());
-// map.put("tjbh",dao.getTjbh());
-// map.put("grbh",dao.getGrbh());
-// map.put("sfzh",dao.getSfzh());
-// map.put("xm",dao.getXm());
-// map.put("xb",dao.getXb());
-// map.put("nl",dao.getNl());
-// map.put("csrq",dao.getCsrq());
-// map.put("nldw",dao.getNldw());
-// map.put("addr",dao.getAddr());
-// map.put("sj",dao.getSj());
-// map.put("dwbm",dao.getDwbm());
-// map.put("tcbm",dao.getTcbm());
-// map.put("details",dao.getDetails());
-// map.put("je",dao.getJe());
-// map.put("sjje",dao.getSjje());
-// map.put("details_mx",dao.getDetailsMx());
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Getoutpatientcostinfo")
-// @ApiOperation(value = "鑾峰彇闂ㄨ瘖鎮ｈ�呰垂鐢ㄦ竻鍗曚俊鎭�")
-// public AjaxResult Getoutpatientcostinfo(@RequestParam @ApiParam(value = "鍗＄被鍨� 1 鐢靛瓙鍋ュ悍鍗� 2 韬唤璇� 3 璇�" +
-// "鐤楀崱 4 鎮ｈ�� ID 5 灏辫瘖娴佹按鍙� 9 鐢靛瓙" +
-// "鍋ュ悍鍗℃祦姘村彿") String cardtype,
-// @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-// @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-// @ApiParam(value = "妫�绱㈢爜" +
-// "1 鐢靛瓙鍋ュ悍鍗★紝闀垮害>=64 2 韬唤璇侊紝闀垮害=18锛堟敞鍐岃韩浠借瘉鎴栧崱鍙疯韩浠借瘉鍙风爜锛�3 璇婄枟鍗★紝闀垮害=8 4 鎮ｈ�� ID 5 灏辫瘖娴佹按鍙� " +
-// "9 鍋ュ悍鍗℃祦姘村彿锛堝缓妗ｅ敮涓�鍙凤級闀垮害n" +
-// "14") @RequestParam String input,
-// @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-// @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("cardtype",cardtype);
-// map.put("input",input);
-// map.put("jsrq",jsrq);
-// map.put("ksrq",ksrq);
-// map.put("pagecount",pagecount);
-// map.put("page",page);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Getoutaccountrecord")
-// @ApiOperation(value = "鑾峰彇闂ㄨ瘖缁撶畻璁板綍")
-// public AjaxResult Getoutaccountrecord(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-// @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-// @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-// @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-// @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("his_registration_id",hisRegistrationId);
-// map.put("jsrq",jsrq);
-// map.put("ksrq",ksrq);
-// map.put("pagecount",pagecount);
-// map.put("page",page);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
-//
-//
-// @PostMapping("/Getpatientalterregrecord")
-// @ApiOperation(value = "鑾峰彇鎮ｈ�呮敞鍐屼俊鎭紙鍚彉鏇磋褰曪級")
-// public AjaxResult Getpatientalterregrecord(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String mzzybz,
-// @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-// @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("mzzybz",mzzybz);
-// map.put("jsrq",jsrq);
-// map.put("ksrq",ksrq);
-// String post = HttpClientUtils.sendPost(HIS_URL, map);
-// return AjaxResult.success(post);
-// }
}
--
Gitblit v1.8.0