From 5ce469c9e3bdf7107d49a5b4886cdd5fed67d9aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 08 四月 2025 18:00:38 +0800
Subject: [PATCH] zjh20250408

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java |   94 +++++++++++++++++++++++++++--------------------
 1 files changed, 54 insertions(+), 40 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 6ee8ae2..4e896f5 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
@@ -126,19 +126,17 @@
             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鑶�鑳卞厖鐩堜匠锛屽鍘氬害姝e父锛屽唴澹佸厜鏁达紝鑵斿唴鏈帰鍙婂紓甯稿洖澹般�俽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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\"}]";
-//        return AjaxResult.success(JSONUtil.parseArray(json1));
+//        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鑶�鑳卞厖鐩堜匠锛屽鍘氬害姝e父锛屽唴澹佸厜鏁达紝鑵斿唴鏈帰鍙婂紓甯稿洖澹般�俽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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\":\"涓や晶鑳稿粨瀵圭О锛屾皵绠″眳涓�傚乏鑲轰笅鍙跺鍩哄簳娈垫敮姘旂鎵╁紶锛屽懆鍥磋鏂戠墖鐘剁(鐜荤拑褰憋紱鍙岃偤闂ㄧ粨鏋勬甯革紝鍚勫彾銆佹鏀皵绠¢�氱晠銆傚績鑴忓悇鎴垮澶у皬姝e父锛涘啝鐘跺姩鑴夎蛋琛屽尯澶氬彂鑷村瘑褰便�傜旱鑶堝唴鏈澧炲ぇ娣嬪反缁撱�傚弻渚ц兏鑶滄湭瑙佸鍘氥�傞儴鍒嗚兏妞庣紭瑙侀璧樺舰鎴愶紝鑳稿粨璇搁璐ㄧ粨鏋勬樉绀哄畬鏁达紝杞粍缁囩粨鏋勬樉绀烘甯搞�俓",\"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\"}]";
+        return AjaxResult.success(JSONUtil.parseArray(json1));
     }
 
     /**
@@ -168,10 +166,10 @@
             TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
             name = tjCustomer.getCusName();
         }
-        List<Map<String, Object>> jcList = testMapper.getLisJyList(name, mzh, start, end);
-        return AjaxResult.success(jcList);
-//        String json1 = "[{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓1\",\"patientAge\":\"20\",\"mzh\":\"810001246120745\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽",\"conclusion\":\"寮傚父\",\"tjStandardGtValue\":\"1 - 5\",\"company\":\"姣厠\",\"checkDoctorName\":\"妫�娴嬪尰甯圽",\"jcxmid\":\"123\",\"shys\":\"瀹℃牳鍖诲笀\"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓2\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓3\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"}]";
-//        return AjaxResult.success(JSONUtil.parseArray(json1));
+//        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\":\"琛�娑插垎鏋怽"},{\"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\":\"琛�娑插垎鏋怽"},{\"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\":\"琛�娑插垎鏋怽"},{\"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\":\"琛�娑插垎鏋怽"},{\"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\":\"琛�娑插垎鏋怽"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓3\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"}]";
+        return AjaxResult.success(JSONUtil.parseArray(json1));
     }
 
     @GetMapping("/getTjList")
@@ -269,8 +267,12 @@
                 ltkjExamJcsqd.setJgsj(format.format(new Date()));
             }
             String checkParts = pacs.getStr("checkParts");
-            ltkjExamJcsqd.setJcxmmc(checkParts);
-            ltkjExamJcsqd.setJcxmid(xmdm);
+//            ltkjExamJcsqd.setJcxmmc(checkParts);
+//            ltkjExamJcsqd.setJcxmid(xmdm);
+
+            ltkjExamJcsqd.setJcxmmc(project.getProName());
+            ltkjExamJcsqd.setJcxmid(project.getProId().toString());
+
             ltkjExamJcsqd.setBw(checkParts);
             ltkjExamJcsqd.setJgzt(pacs.getStr("diagnosis"));
             ltkjExamJcsqd.setJgbx(pacs.getStr("examination"));
@@ -279,8 +281,12 @@
             LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
             ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
             ltkjExamJcbgd.setTmh(ltkjExamJcsqd.getTmh());
-            ltkjExamJcbgd.setXmdm(ltkjExamJcsqd.getJcxmid());
-            ltkjExamJcbgd.setXmmc(ltkjExamJcsqd.getJcxmmc());
+//            ltkjExamJcbgd.setXmdm(ltkjExamJcsqd.getJcxmid());
+//            ltkjExamJcbgd.setXmmc(ltkjExamJcsqd.getJcxmmc());
+
+            ltkjExamJcbgd.setXmdm(project.getProId().toString());
+            ltkjExamJcbgd.setXmmc(project.getProName());
+
             ltkjExamJcbgd.setBgUrl("");
             ltkjExamJcbgd.setShysxm(pacs.getStr("reportDoctorName"));
             ltkjExamJcbgd.setShysdm(pacs.getStr("reportDoctorCode"));
@@ -310,10 +316,8 @@
             cn.hutool.json.JSONObject entries = (cn.hutool.json.JSONObject) lis.get(0);
             String tjNum = entries.getStr("tjNum");
             LtkjHysqd hysqd = new LtkjHysqd();
-            LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(TjOrder::getTjNumber,tjNum);
-            TjOrder order = tjOrderService.getOne(wrapper);
-            hysqd.setTjh(order.getTjNumber());
+            TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+            hysqd.setTjh(order.getCardId());
             String mzh = order.getCardId();
 
             LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
@@ -344,22 +348,40 @@
                     }
                 }
             }
+            String tmh = tree.getSqdh()+"_"+tree.getHisXmdm();
+            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.setTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
-            hysqd.setXmid(xmdm);
-            hysqd.setXmmc(project.getHisXmbm());
+            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.setBbmc();
-            boolean save = hysqdService.save(hysqd);
-            boolean save2 = true;
+            hysqdService.deletedByTjhAndXmId(hysqd.getTjh(),hysqd.getXmid());
+            hybgdService.deletedLtkjHybgdByTjhAndTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
+            hysqdService.save(hysqd);
             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.setJcxm(jsonObject.getStr("proName"));
                 hybgd.setJyjg(jsonObject.getStr("proResult"));
                 hybgd.setJgdw(jsonObject.getStr("company"));
                 String tjStandardGtValue = jsonObject.getStr("tjStandardGtValue");
@@ -376,22 +398,14 @@
                 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;
-                }
+                hybgd.setShysmc(shys);
+                hybgd.setYcbz(jsonObject.getStr("ycbz"));
+                hybgdService.save(hybgd);
             }
-            if (save && save2){
-                try {
-                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
-                }catch (Exception e){
-                    log.error(String.valueOf(e));
-                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
-                }
-            } else {
+            try {
+                testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+            }catch (Exception e){
+                log.error(String.valueOf(e));
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
             }

--
Gitblit v1.8.0