From 6d09c6301492d3095ff64dba2336f0d0b69638e6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 10 四月 2025 18:04:44 +0800
Subject: [PATCH] zjh20250410
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java | 7
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 7
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 144 +++++----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 535 +++++++++++++++++--------------------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 3
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 16
ltkj-admin/src/test/java/zjhTest.java | 38 --
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 4
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java | 19
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 4
14 files changed, 365 insertions(+), 418 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 4e896f5..fefb840 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
@@ -133,10 +133,10 @@
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\"}]";
- 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鑶�鑳卞厖鐩堜匠锛屽鍘氬害姝ｅ父锛屽唴澹佸厜鏁达紝鑵斿唴鏈帰鍙婂紓甯稿洖澹般�俽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\"}]";
+// return AjaxResult.success(JSONUtil.parseArray(json1));
}
/**
@@ -166,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\":\"琛�娑插垎鏋怽"},{\"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));
+ 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")
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
index 028923a..753f6d8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
@@ -147,7 +147,6 @@
if (null != list && !list.isEmpty()) {
List<Long> longs = list.stream().map(TjUserAdvice::getAdviceId).collect(Collectors.toList());
wq.in(TjAdvice::getId,longs);
-// wq.last("and (ad_sex=1 OR ad_sex=2)");
Page<TjAdvice> kjbqPage = tjAdviceService.page(page1,wq);
return AjaxResult.success(kjbqPage);
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 48f2064..fd03825 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -66,8 +66,8 @@
* @Date: 2022/12/6 14:29
*/
@RestController
-@RequestMapping ("/check")
-@Api (tags = "AAAAAAAAAAAA鎬绘鍖诲笀鐩稿叧鎺ュ彛")
+@RequestMapping("/check")
+@Api(tags = "AAAAAAAAAAAA鎬绘鍖诲笀鐩稿叧鎺ュ彛")
@Slf4j
public class TjCheckController {
@Resource
@@ -139,24 +139,23 @@
@Resource
private TjXdPictureController pictureController;
- @GetMapping ("/ceshicc")
- @ApiOperation (value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
+ @GetMapping("/ceshicc")
+ @ApiOperation(value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
@RepeatSubmit
// @Transactional
public AjaxResult ceshicc() {
List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd1("8003241206085556");
- if(null !=jcsqdList && !jcsqdList.isEmpty()){
+ if (null != jcsqdList && !jcsqdList.isEmpty()) {
jcsqdService.deletedLtkjJcsqdByTjhAndTmh("8003241206085556");
jcbgdService.deletedLtkjJcbgdByTjhAndTmh("8003241206085556");
jcsqdService.saveBatch(jcsqdList);
List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd1("8003241206085556");
- if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList);
+ if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
DynamicDataSourceContextHolder.clearDataSourceType();
}
return AjaxResult.success();
}
-
// @GetMapping ("/ceshi")
@@ -187,11 +186,9 @@
// }
-
-
- @GetMapping ("/getOperationPermissionsByTjNum")
- @ApiOperation (value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
- public AjaxResult getOperationPermissionsByTjNum(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping("/getOperationPermissionsByTjNum")
+ @ApiOperation(value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
+ public AjaxResult getOperationPermissionsByTjNum(@ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if (null != order) {
Integer status = order.getStatus();
@@ -206,18 +203,18 @@
}
- @GetMapping ("/getCsList")
- @ApiOperation (value = "鍒濆鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
+ @GetMapping("/getCsList")
+ @ApiOperation(value = "鍒濆鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
@Transactional
- public AjaxResult getCsList(@ApiParam (value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸插鏍�") @RequestParam (required = false) Integer checkStatus,
- @ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
- @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
- @ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
- @ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
- @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
- @ApiParam (value = "濂楅鍚�)") @RequestParam (required = false) String tcm,
- @ApiParam (value = "寮�濮嬫椂闂�") @RequestParam (required = false) String beginTime,
- @ApiParam (value = "缁撴潫鏃堕棿") @RequestParam (required = false) String endTime) {
+ public AjaxResult getCsList(@ApiParam(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸插鏍�") @RequestParam(required = false) Integer checkStatus,
+ @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
+ @ApiParam(value = "鍗曚綅") @RequestParam(required = false) Long compId,
+ @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "濂楅鍚�)") @RequestParam(required = false) String tcm,
+ @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
// DateTime beginTimes = null;
// DateTime endTimes = null;
@@ -302,16 +299,16 @@
if (beginTime == null) beginTime = "";
if (endTime == null) endTime = "";
if (tcm == null) tcm = "";
- return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name,tcm));
+ return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name, tcm));
}
/**
* 鍒濆
*/
- @GetMapping ("/cSWebGetProByTjNumAndOrderId")
- @ApiOperation (value = "(鍒濆椤甸潰)鐐瑰嚮浣撴浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛")
- public AjaxResult cSWebGetProByTjNumAndOrderId(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping("/cSWebGetProByTjNumAndOrderId")
+ @ApiOperation(value = "(鍒濆椤甸潰)鐐瑰嚮浣撴浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛")
+ public AjaxResult cSWebGetProByTjNumAndOrderId(@ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
// List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber);
// List<CsProVo> list = new ArrayList<>();
// if (null != orderRemarkList && orderRemarkList.size() > 0) {
@@ -340,12 +337,12 @@
// });
// }
- List<CsProVo> list = getCsProVos(tjNumber,false);
+ List<CsProVo> list = getCsProVos(tjNumber, false);
return AjaxResult.success(list);
}
- public List<CsProVo> getCsProVos(String tjNumber,boolean sfzpacs) {
- List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber,sfzpacs);
+ public List<CsProVo> getCsProVos(String tjNumber, boolean sfzpacs) {
+ List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber, sfzpacs);
if (null != list && !list.isEmpty()) {
list.sort(new Comparator<CsProVo>() {
@Override
@@ -361,12 +358,12 @@
/**
* 鍒濆
*/
- @GetMapping ("/confirmOrder")
- @ApiOperation (value = "鍒濆(骞朵慨鏀圭姸鎬�)鎺ュ彛")
+ @GetMapping("/confirmOrder")
+ @ApiOperation(value = "鍒濆(骞朵慨鏀圭姸鎬�)鎺ュ彛")
@Transactional
- public AjaxResult confirmOrder(@ApiParam (value = "tjNumber") @RequestParam String tjNumber,
- @ApiParam (value = "鐘舵�� 0鍚屾剰 1鎷掔粷 榛樿鍚屾剰") @RequestParam (defaultValue = "0") Integer status,
- @ApiParam (value = "椹冲洖鐞嗙敱") @RequestParam (required = false) String remark) {
+ public AjaxResult confirmOrder(@ApiParam(value = "tjNumber") @RequestParam String tjNumber,
+ @ApiParam(value = "鐘舵�� 0鍚屾剰 1鎷掔粷 榛樿鍚屾剰") @RequestParam(defaultValue = "0") Integer status,
+ @ApiParam(value = "椹冲洖鐞嗙敱") @RequestParam(required = false) String remark) {
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("璇锋鏌ユ槸鍚﹀瓨鍦ㄦ湭妫�鎴栧欢鏈熼」鐩�");
if (null != tjNumber) {
@@ -404,8 +401,8 @@
/**
* 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛
*/
- @GetMapping ("/dataSynchronization")
- @ApiOperation (value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
+ @GetMapping("/dataSynchronization")
+ @ApiOperation(value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
@RepeatSubmit
// @Transactional
public AjaxResult dataSynchronization(@RequestParam String tjNumber) {
@@ -413,7 +410,7 @@
RLock lock = redissonClient.getLock("lock:check:dataSynchronization:" + tjNumber);
try {
boolean tryLock = lock.tryLock(3L, TimeUnit.SECONDS);
- if (tryLock){
+ if (tryLock) {
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
@@ -580,10 +577,10 @@
/*鍚屾妫�鏌� his瀛樺偍杩囩▼*/
String jctbfs = configService.selectConfigByKey("jctbfs");
- AjaxResult results =null;
- if (jctbfs.equalsIgnoreCase("Y")){
+ AjaxResult results = null;
+ if (jctbfs.equalsIgnoreCase("Y")) {
results = service.getHISDataNew("Getexamreportinfo", maps);
- }else{
+ } else {
results = jcsqdService.getTjJcProByHisCall("浣撴涓績", order.getCardId(), "''", 100, 1, "'1'");
}
@@ -650,14 +647,14 @@
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
- int maxRetries=3;
+ int maxRetries = 3;
for (int attempt = 0; attempt < maxRetries; attempt++) {
try {
testMapper.updateDetailByTjJcCall(order.getCardId(),
String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
break;
} catch (Exception e) {
- if (attempt==maxRetries-1){
+ if (attempt == maxRetries - 1) {
throw e;
}
try {
@@ -666,20 +663,19 @@
}
}
}
- }else {
+ } else {
return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
}
}
return AjaxResult.success("鍚屾鎴愬姛");
- }
- else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")){
- List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber(),dqyyyqbm);
- if(null != hysqdList && !hysqdList.isEmpty()){
+ } else if (null != sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")) {
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber(), dqyyyqbm);
+ if (null != hysqdList && !hysqdList.isEmpty()) {
for (LtkjHysqd hysqd : hysqdList) {
- LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh());
+ LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
if (null != jybgid) {
- ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh());
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(hysqd.getTmh());
}
if (ltkjHysqdService.save(hysqd)) {
@@ -689,58 +685,56 @@
}
DynamicDataSourceContextHolder.clearDataSourceType();
}
- List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber(),dqyyyqbm);
- if(null !=jcsqdList && !jcsqdList.isEmpty()){
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber(), dqyyyqbm);
+ if (null != jcsqdList && !jcsqdList.isEmpty()) {
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
jcsqdService.saveBatch(jcsqdList);
List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(order.getCardId());
- if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList);
+ if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
DynamicDataSourceContextHolder.clearDataSourceType();
}
// String tjNumber1 = order.getTjNumber();
// log.info("鏌ヨ鍑烘潵鐨勪綋妫�鍙锋槸: " + tjNumber1);
// log.info("浼犺繃鏉ョ殑鐨勪綋妫�鍙锋槸: "+tjNumber);
- Map<String,Object> map=new HashMap<>();
- map.put("tjnum",tjNumber);
+ Map<String, Object> map = new HashMap<>();
+ map.put("tjnum", tjNumber);
testMapper.tjUpdateDetatilByVi(map);
- }else {
+ } else {
//鍖栭獙
testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
}
- //妫�鏌�
- orderService.tjLispacstongbujianyi(null,null,null,null);
+ //妫�鏌�
+ orderService.tjLispacstongbujianyi(null, null, null, null);
return AjaxResult.success("鍚屾鎴愬姛");
}
return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
}
return AjaxResult.error("璇ヤ汉鍛樻暟鎹鍦ㄥ悓姝ヤ腑锛岃绋嶇瓑");
} catch (InterruptedException e) {
- log.error(String.valueOf(e),e.getMessage());
+ log.error(String.valueOf(e), e.getMessage());
return AjaxResult.error("璇ヤ汉鍛樻暟鎹鍦ㄥ悓姝ヤ腑锛岃绋嶇瓑");
- }finally {
+ } finally {
lock.unlock();
}
}
-
/**
* 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛
*/
- @GetMapping ("/dataSynchronizationApi")
- @ApiOperation (value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
+ @GetMapping("/dataSynchronizationApi")
+ @ApiOperation(value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
@RepeatSubmit
// @Transactional
public AjaxResult dataSynchronizationApi(@RequestParam String tjNumber) {
RLock lock = redissonClient.getLock("lock:check:dataSynchronization:" + tjNumber);
try {
boolean tryLock = lock.tryLock(3L, TimeUnit.SECONDS);
- if (tryLock){
+ if (tryLock) {
String doctorId = configService.selectConfigByKey("request_default_check_doctorId");
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
- String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm");
final String sfkqdyhis = configService.selectConfigByKey("sfkqdyhis");
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if (null != order) {
@@ -748,16 +742,9 @@
//寮�鍚瓧鍏稿脊绐�
if ("Y".equals(getInfoFromSqlData)) {
tbhyxm(order);
- //鍚屾鍖栭獙椤圭洰
-// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
- //鍚屾妫�鏌ラ」鐩�
-// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
asyncService.updateCheckType(order.getTjNumber());
}
- // 11:42:04.617 [http-nio-5000-exec-72] ERROR c.a.d.p.DruidDataSource - [init,905] - init datasource error, url: jdbc:sqlserver://192.168.10.2:1433;DatabaseName=hospital;&characterEncoding=utf8
- //com.microsoft.sqlserver.jdbc.SQLServerException: 椹卞姩绋嬪簭鏃犳硶閫氳繃浣跨敤瀹夊叏濂楁帴瀛楀眰(SSL)鍔犲瘑涓� SQL Server 寤虹珛瀹夊叏杩炴帴銆傞敊璇�:鈥淣o appropriate protocol (protocol is disabled or cipher suites are inappropriate)鈥濄��
- //
//寮�鍚拰his瀵规帴
if (null != sfkqdyhis && sfkqdyhis.equals("Y")) {
List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
@@ -778,10 +765,7 @@
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
-// if (null == code || !code.equals("0")) {
-// return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏈嚭缁撴灉,璇风◢鍚庡悓姝�!!!");
-// }
- if(null != code && code.equals("0")) {
+ if (null != code && code.equals("0")) {
JSONArray data = object.getJSONArray("ResultData");
for (Object datum : data) {
JSONObject jsonObject = (JSONObject) datum;
@@ -817,7 +801,7 @@
saveHybgd(hysqd);
}
}
- }else{
+ } else {
resultMsg = "鍖栭獙椤圭洰鏆傛椂鏈嚭缁撴灉,璇风◢鍚庡悓姝�!!!";
}
//鍚屾鍖栭獙椤圭洰
@@ -835,10 +819,10 @@
HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
/*鍚屾妫�鏌� his瀛樺偍杩囩▼*/
String jctbfs = configService.selectConfigByKey("jctbfs");
- AjaxResult results =null;
- if (jctbfs.equalsIgnoreCase("Y")){
+ AjaxResult results = null;
+ if (jctbfs.equalsIgnoreCase("Y")) {
results = service.getHISDataNew("Getexamreportinfo", maps);
- }else{
+ } else {
results = jcsqdService.getTjJcProByHisCall("浣撴涓績", order.getCardId(), "''", 100, 1, "'1'");
DynamicDataSourceContextHolder.clearDataSourceType();
}
@@ -887,59 +871,31 @@
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
- /* List<LtkjExamJcsqd> jcsqdList = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
- if(null !=jcsqdList && !jcsqdList.isEmpty()) {
- for (LtkjExamJcsqd jcsqd : jcsqdList) {
- if (StringUtil.isNotBlank(jcsqd.getJgzt())) {
- String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
- for (String jg : split) {
- if (StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
- && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
- && !jg.contains("鏈鏄庢樉") && !jg.contains("姝ｅ父") && !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")) {
- TjJcycxm jcycxm = new TjJcycxm();
- jcycxm.setTjh(order.getTjNumber());
- jcycxm.setYqid(dqyyyqbm);
- String[] split1 = jcsqd.getJcxmid().split(";");
- jcycxm.setProId(split1[0]);
- jcycxm.setProName(jcsqd.getJcxmmc());
- jcycxm.setCreateTime(new Date());
- jcycxm.setJcjg(jg);
- jcycxmService.save(jcycxm);
- }
- }
- }
- }
- }*/
testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
- }else {
-// return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
- resultMsg+="\n妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!";
+ } else {
+ resultMsg += "\n妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!";
}
}
}
- LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
- wq.eq(TjXdtgmdjg::getTjh,tjNumber);
- List<TjXdtgmdjg> list = xdtgmdjgService.list(wq);
- if(null !=list && !list.isEmpty()){
- for (TjXdtgmdjg xdtgmdjg : list) {
- pictureController.saveTjXdtgmdjgByJcbgd(xdtgmdjg);
- }
- }
+ LambdaQueryWrapper<TjXdtgmdjg> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjXdtgmdjg::getTjh, tjNumber);
+ List<TjXdtgmdjg> list = xdtgmdjgService.list(wq);
+ if (null != list && !list.isEmpty()) {
+ for (TjXdtgmdjg xdtgmdjg : list) {
+ pictureController.saveTjXdtgmdjgByJcbgd(xdtgmdjg);
+ }
+ }
if (StrUtil.isBlank(resultMsg))
return AjaxResult.success("鍚屾鎴愬姛");
else return AjaxResult.error(resultMsg);
}
- //鍖栭獙
-// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
- //妫�鏌�
-// jcsqdService.saveLtkjExamJcsqd(order.getCardId());
return AjaxResult.success("鍚屾鎴愬姛");
}
return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
}
return AjaxResult.error("璇ヤ汉鍛樻暟鎹鍦ㄥ悓姝ヤ腑锛岃绋嶇瓑");
} catch (InterruptedException e) {
- log.error(String.valueOf(e),e.getMessage());
+ log.error(String.valueOf(e), e.getMessage());
return AjaxResult.error("璇ヤ汉鍛樻暟鎹鍦ㄥ悓姝ヤ腑锛岃绋嶇瓑");
} finally {
lock.unlock();
@@ -1059,17 +1015,17 @@
/**
* 鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃
*/
- @GetMapping ("/getList")
- @ApiOperation (value = "鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
+ @GetMapping("/getList")
+ @ApiOperation(value = "鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
// @PreAuthorize("@ss.hasPermi('check:check:getList')")
- public AjaxResult getList(@ApiParam (value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam (required = false) Integer checkStatus,
- @ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
- @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
- @ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
- @ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
- @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
- @ApiParam (value = "寮�濮嬫椂闂�") @RequestParam (required = false) String beginTime,
- @ApiParam (value = "缁撴潫鏃堕棿") @RequestParam (required = false) String endTime) {
+ public AjaxResult getList(@ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam(required = false) Integer checkStatus,
+ @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
+ @ApiParam(value = "鍗曚綅") @RequestParam(required = false) Long compId,
+ @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
// String config = configService.selectConfigByKey("tj_confirm");
// DateTime beginTimes = null;
// DateTime endTimes = null;
@@ -1170,17 +1126,16 @@
}
-
- @GetMapping ("/getBghsList")
- @ApiOperation (value = "鎶ュ憡鏍告敹椤甸潰鏌ヨ鎺ュ彛")//0寰�1宸�
+ @GetMapping("/getBghsList")
+ @ApiOperation(value = "鎶ュ憡鏍告敹椤甸潰鏌ヨ鎺ュ彛")//0寰�1宸�
// @PreAuthorize("@ss.hasPermi('check:check:getList')")
- public AjaxResult getBghsList(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
- @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
- @ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
- @ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
- @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
- @ApiParam (value = "寮�濮嬫椂闂�") @RequestParam (required = false) String beginTime,
- @ApiParam (value = "缁撴潫鏃堕棿") @RequestParam (required = false) String endTime) {
+ public AjaxResult getBghsList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
+ @ApiParam(value = "鍗曚綅") @RequestParam(required = false) Long compId,
+ @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
// String config = configService.selectConfigByKey("tj_confirm");
// DateTime beginTimes = null;
// DateTime endTimes = null;
@@ -1281,7 +1236,6 @@
}
-
/**
* 鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅鎺ュ彛
*
@@ -1290,15 +1244,15 @@
* @param checkStatus
* @return
*/
- @PutMapping ("/getTjdetailList")
- @ApiOperation (value = "鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅(骞朵慨鏀圭姸鎬�)鎺ュ彛")
+ @PutMapping("/getTjdetailList")
+ @ApiOperation(value = "鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅(骞朵慨鏀圭姸鎬�)鎺ュ彛")
// @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
- public AjaxResult getTjdetailList(@ApiParam (value = "浣撴tjNumber") @RequestParam String tjNumber,
- @ApiParam (value = "鎬绘寤鸿") @RequestParam (required = false) String advice,
- @ApiParam (value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus) {
+ public AjaxResult getTjdetailList(@ApiParam(value = "浣撴tjNumber") @RequestParam String tjNumber,
+ @ApiParam(value = "鎬绘寤鸿") @RequestParam(required = false) String advice,
+ @ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus) {
String config = configService.selectConfigByKey("sfjcwjhyqxm");
- if(null != config && config.equalsIgnoreCase("Y")){
+ if (null != config && config.equalsIgnoreCase("Y")) {
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
@@ -1343,9 +1297,9 @@
* @param tjNumber
* @return
*/
- @GetMapping ("/updateCheckType")
- @ApiOperation (value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�旈潪鍖栭獙椤圭洰")
- public AjaxResult updateCheckType(@ApiParam (value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping("/updateCheckType")
+ @ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�旈潪鍖栭獙椤圭洰")
+ public AjaxResult updateCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
// if (redisCache.hasKey("updateCheckType" + tjNumber)) {
// List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
// return AjaxResult.success(cacheMapValue);
@@ -1452,9 +1406,9 @@
* @param tjNumber
* @return
*/
- @GetMapping ("/updateCheckTypeHuaYan")
- @ApiOperation (value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�斿寲楠岄」鐩�")
- public AjaxResult updateCheckTypeHuaYan(@ApiParam (value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping("/updateCheckTypeHuaYan")
+ @ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�斿寲楠岄」鐩�")
+ public AjaxResult updateCheckTypeHuaYan(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
// asyncService.updateCheckType(tjNumber);
List<Map<String, Object>> list = new ArrayList<>();
TjOrder one = orderService.getOrderByTjNum(tjNumber);
@@ -1536,9 +1490,9 @@
}
- @GetMapping ("/updateHYANDCGCheckType")
- @ApiOperation (value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�斿父瑙勫拰鍖栭獙椤圭洰")
- public AjaxResult updateHYANDCGCheckType(@ApiParam (value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping("/updateHYANDCGCheckType")
+ @ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�斿父瑙勫拰鍖栭獙椤圭洰")
+ public AjaxResult updateHYANDCGCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
return getResult(tjNumber);
}
@@ -1571,47 +1525,49 @@
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
String ckfw = tjOrderDetail.getStanId();
- if (null !=ckfw && StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
+ if (null != ckfw && StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(), "");
}
if (StrUtil.isNotBlank(ckfw)) {
try {
if (ckfw != null && ckfw.contains("-")) {
- Integer.parseInt(tjOrderDetail.getYcbz());
- String[] split = ckfw.split("-");
- BigDecimal min = new BigDecimal(split[0]);
- BigDecimal max = new BigDecimal(split[1]);
- String proResult = tjOrderDetail.getProResult();
- if(null !=proResult){
- BigDecimal jyjgval = new BigDecimal(proResult);
- if (jyjgval.compareTo(min) < 0) {
- tjOrderDetail.setYcbz("鈫�");
- } else if (jyjgval.compareTo(max) > 0) {
- tjOrderDetail.setYcbz("鈫�");
- } else if(proResult.contains("闃�")) {
- tjOrderDetail.setYcbz("");
- }else {
+ Integer.parseInt(tjOrderDetail.getYcbz());
+ String[] split = ckfw.split("-");
+ BigDecimal min = new BigDecimal(split[0]);
+ BigDecimal max = new BigDecimal(split[1]);
+ String proResult = tjOrderDetail.getProResult();
+ if (null != proResult) {
+ BigDecimal jyjgval = new BigDecimal(proResult);
+ if (jyjgval.compareTo(min) < 0) {
+ tjOrderDetail.setYcbz("鈫�");
+ } else if (jyjgval.compareTo(max) > 0) {
+ tjOrderDetail.setYcbz("鈫�");
+ } else if (proResult.contains("闃�")) {
+ tjOrderDetail.setYcbz("");
+ } else {
+ tjOrderDetail.setYcbz("");
+ }
+ if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().isEmpty()) {
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
+ }
+ } else {
tjOrderDetail.setYcbz("");
}
- if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().isEmpty()) {
- tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
- }
- }else {
- tjOrderDetail.setYcbz("");
- }
- }else {
- if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("");
+ } else {
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("");
- if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("鈫�");
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("鈫�");
}
} catch (NumberFormatException ignored) {
}
- }else {
+ } else {
tjOrderDetail.setYcbz("");
tjOrderDetail.setProResult(tjOrderDetail.getProResult());
}
- if(remark.getOrgType().equals(tjOrderDetail.getOrgType())){
+ if (remark.getOrgType().equals(tjOrderDetail.getOrgType())) {
dels.add(tjOrderDetail);
}
}
@@ -1626,12 +1582,12 @@
if (dels.isEmpty()) {
continue;
}
- dels=dels.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
+ dels = dels.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
dels = dels.stream()
- .sorted(Comparator.comparingInt(
- tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
- ))
- .collect(Collectors.toList());
+ .sorted(Comparator.comparingInt(
+ tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
+ ))
+ .collect(Collectors.toList());
parent.put("sons", dels);
parent.put("remark", remark.getRemark());
parent.put("jgbx", remark.getJgbx());
@@ -1650,10 +1606,10 @@
}
- @GetMapping ("/getTm")
- @ApiOperation (value = "鑾峰彇鏉＄爜")
+ @GetMapping("/getTm")
+ @ApiOperation(value = "鑾峰彇鏉＄爜")
// @PreAuthorize("@ss.hasPermi('check:check:getTm')")
- public AjaxResult getTm(@ApiParam (value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ public AjaxResult getTm(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
return AjaxResult.success(tjNumber);
}
@@ -1662,8 +1618,8 @@
*
* @return
*/
- @PostMapping ("/checkUpdateOrderRemark")
- @ApiOperation (value = "鎬绘淇敼澶囨敞鎺ュ彛")
+ @PostMapping("/checkUpdateOrderRemark")
+ @ApiOperation(value = "鎬绘淇敼澶囨敞鎺ュ彛")
public AjaxResult checkUpdateOrderRemark(@RequestBody List<UpdateOrderRemarkVo> updateOrderRemarkVos) {
if (null != updateOrderRemarkVos && !updateOrderRemarkVos.isEmpty()) {
for (UpdateOrderRemarkVo remarkVo : updateOrderRemarkVos) {
@@ -1716,9 +1672,8 @@
}
-
- @GetMapping ("/getzongjianyishengchakanyichangxiangmu")
- @ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
+ @GetMapping("/getzongjianyishengchakanyichangxiangmu")
+ @ApiOperation(value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
long l = System.currentTimeMillis();
if (StrUtil.isNotBlank(tjNum)) {
@@ -1729,79 +1684,77 @@
}
String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
jcycxmService.deletedByTjh(tjNum);
- configController.zongjianshengchengyichangxiangmu(tjNum,yqbm);
+ configController.zongjianshengchengyichangxiangmu(tjNum, yqbm);
- LambdaQueryWrapper<TjOrderYcxm> wq=new LambdaQueryWrapper<>();
- wq.eq(TjOrderYcxm::getTjh,tjNum);
- List<TjOrderYcxm> list = ycxmService.list(wq);
- if(null !=list && !list.isEmpty()){
- Collections.reverse(list);
- Map<String, List<TjOrderYcxm>> map = list.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
- List<Map<String, Object>> maps = new ArrayList<>();
- for (Map.Entry<String, List<TjOrderYcxm>> entry : map.entrySet()) {
- Map<String, Object> parent = new HashMap<>();
- List<TjOrderDetail> dels = new ArrayList<>();
- for (TjOrderYcxm ycxm : entry.getValue()) {
- TjOrderDetail detail=new TjOrderDetail();
- detail.setOrderDetailId(Long.valueOf(ycxm.getId()));
- detail.setProName(ycxm.getJcxm());
- detail.setProResult(ycxm.getJcjg());
- detail.setStanId(ycxm.getCkfw());
- detail.setProAdvice(ycxm.getDw());
- List<Map<String,Object>> btnrlist=new ArrayList<>();
- String jynr = ycxm.getJynr();
- JSONArray array = JSONUtil.parseArray(jynr);
- for (Object object : array) {
- Map<String,Object> objectMap=new HashMap<>();
- JSONObject jsonObject = (JSONObject) object;
- String bt = jsonObject.getStr("bt");
- String nr = jsonObject.getStr("nr");
- objectMap.put("bt",bt);
- objectMap.put("nr",nr);
- if(null !=bt || null !=nr) btnrlist.add(objectMap);
+ LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderYcxm::getTjh, tjNum);
+ List<TjOrderYcxm> list = ycxmService.list(wq);
+ if (null != list && !list.isEmpty()) {
+ Collections.reverse(list);
+ Map<String, List<TjOrderYcxm>> map = list.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
+ List<Map<String, Object>> maps = new ArrayList<>();
+ for (Map.Entry<String, List<TjOrderYcxm>> entry : map.entrySet()) {
+ Map<String, Object> parent = new HashMap<>();
+ List<TjOrderDetail> dels = new ArrayList<>();
+ for (TjOrderYcxm ycxm : entry.getValue()) {
+ TjOrderDetail detail = new TjOrderDetail();
+ detail.setOrderDetailId(Long.valueOf(ycxm.getId()));
+ detail.setProName(ycxm.getJcxm());
+ detail.setProResult(ycxm.getJcjg());
+ detail.setStanId(ycxm.getCkfw());
+ detail.setProAdvice(ycxm.getDw());
+ List<Map<String, Object>> btnrlist = new ArrayList<>();
+ String jynr = ycxm.getJynr();
+ JSONArray array = JSONUtil.parseArray(jynr);
+ for (Object object : array) {
+ Map<String, Object> objectMap = new HashMap<>();
+ JSONObject jsonObject = (JSONObject) object;
+ String bt = jsonObject.getStr("bt");
+ String nr = jsonObject.getStr("nr");
+ objectMap.put("bt", bt);
+ objectMap.put("nr", nr);
+ if (null != bt || null != nr) btnrlist.add(objectMap);
+ }
+ detail.setAdvices(btnrlist);
+ dels.add(detail);
}
- detail.setAdvices(btnrlist);
- dels.add(detail);
- }
- parent.put("proName",entry.getKey());
- parent.put("jyjc",entry.getValue().get(0).getJyjc());
- parent.put("sone",dels);
+ parent.put("proName", entry.getKey());
+ parent.put("jyjc", entry.getValue().get(0).getJyjc());
+ parent.put("sone", dels);
maps.add(parent);
- }
- List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
+ }
+ List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
- List<Map<String, Object>> collect = mapList.stream()
- .filter(b -> maps.stream()
- .noneMatch(a -> a.get("proName").equals(b.get("proName")))) // 杩囨护鎺夊湪 maps 涓瓨鍦ㄧ殑鐩稿悓鍏冪礌
- .collect(Collectors.toList());
- if(!collect.isEmpty()){
- maps.addAll(collect);
- }
- if(!maps.isEmpty()){
- List<Map<String, Object>> collect1 = maps.stream()
- .sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
+ List<Map<String, Object>> collect = mapList.stream()
+ .filter(b -> maps.stream()
+ .noneMatch(a -> a.get("proName").equals(b.get("proName")))) // 杩囨护鎺夊湪 maps 涓瓨鍦ㄧ殑鐩稿悓鍏冪礌
.collect(Collectors.toList());
- System.out.println("鎬昏�楁椂:"+(System.currentTimeMillis()-l));
- return AjaxResult.success(collect1);
+ if (!collect.isEmpty()) {
+ maps.addAll(collect);
+ }
+ if (!maps.isEmpty()) {
+ List<Map<String, Object>> collect1 = maps.stream()
+ .sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
+ .collect(Collectors.toList());
+ System.out.println("鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛鎬昏�楁椂:" + (System.currentTimeMillis() - l));
+ return AjaxResult.success(collect1);
+ }
+ System.out.println("鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛鎬昏�楁椂:" + (System.currentTimeMillis() - l));
+
+ return AjaxResult.success(maps);
+ } else {
+ List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
+ System.out.println("鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛鎬昏�楁椂:" + (System.currentTimeMillis() - l));
+ return AjaxResult.success(mapList);
}
- System.out.println("鎬昏�楁椂:"+(System.currentTimeMillis()-l));
-
- return AjaxResult.success(maps);
- }else {
- List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
- System.out.println("鎬昏�楁椂:"+(System.currentTimeMillis()-l));
- return AjaxResult.success(mapList);
- }
-
-// return zongjianyishengchakanyichangxiangmu(tjNum);
}
return AjaxResult.error();
}
- @GetMapping ("/delzongjianyishengchakanyichangxiangmu")
- @ApiOperation (value = "鎬绘鍒犻櫎寮傚父椤圭洰鎺ュ彛")
+ @GetMapping("/delzongjianyishengchakanyichangxiangmu")
+ @ApiOperation(value = "鎬绘鍒犻櫎寮傚父椤圭洰鎺ュ彛")
public AjaxResult delzongjianyishengchakanyichangxiangmu(@RequestParam String id) {
ycxmService.removeById(id);
return AjaxResult.success();
@@ -1877,32 +1830,32 @@
List<TjOrderDetail> dels = new ArrayList<>();
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
- if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
- if(!tjOrderDetail.getDeptId().equals("2")){
- List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
- ,tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴� 鈼哴","").replaceAll("\\[.*?\\]", "")
- ,tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
- ,tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴� 鈼哴","").replaceAll("\\[.*?\\]", "")
- ,tjOrderDetail.getProResult());
+ if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
+ if (!tjOrderDetail.getDeptId().equals("2")) {
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
+ , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴� 鈼哴", "").replaceAll("\\[.*?\\]", "")
+ , tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
+ , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴� 鈼哴", "").replaceAll("\\[.*?\\]", "")
+ , tjOrderDetail.getProResult());
- if(null !=maps && !maps.isEmpty()){
+ if (null != maps && !maps.isEmpty()) {
tjOrderDetail.setAdvices(maps);
}
- }else {
+ } else {
String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
- List<Map<String,Object>> mapList=new ArrayList<>();
+ List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
s = s.replaceAll("\n", "");
// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
- Map<String,Object> maps= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(),s,"0");
- if(null !=maps && !maps.isEmpty()){
+ Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0");
+ if (null != maps && !maps.isEmpty()) {
Object bt = maps.get("bt");
Object nr = maps.get("nr");
- if(null !=bt || null !=nr) mapList.add(maps);
+ if (null != bt || null != nr) mapList.add(maps);
}
}
tjOrderDetail.setAdvices(mapList);
@@ -1913,10 +1866,10 @@
dels.add(tjOrderDetail);
}
}
- if(!dels.isEmpty()){
- parent.put("proName",remark.getProName());
- parent.put("jyjc",remark.getJyjc());
- parent.put("sone",dels);
+ if (!dels.isEmpty()) {
+ parent.put("proName", remark.getProName());
+ parent.put("jyjc", remark.getJyjc());
+ parent.put("sone", dels);
list.add(parent);
}
}
@@ -1926,27 +1879,27 @@
return list;
}
- @GetMapping ("/chushenyemianchakanxiangmujieguo")
- @ApiOperation (value = "鍒濆椤甸潰鏌ョ湅椤圭洰缁撴灉鎺ュ彛")
- public AjaxResult chushenyemianchakanxiangmujieguo(@RequestParam String proId,@RequestParam String tjNum) {
- List<Map<String,Object>> maps = projectService.tjCsXmjgcx(tjNum,proId);
+ @GetMapping("/chushenyemianchakanxiangmujieguo")
+ @ApiOperation(value = "鍒濆椤甸潰鏌ョ湅椤圭洰缁撴灉鎺ュ彛")
+ public AjaxResult chushenyemianchakanxiangmujieguo(@RequestParam String proId, @RequestParam String tjNum) {
+ List<Map<String, Object>> maps = projectService.tjCsXmjgcx(tjNum, proId);
return AjaxResult.success(maps);
}
- @GetMapping ("/panduaniscunzaiweijian")
- @ApiOperation (value = "鍒濆椤甸潰鏌ョ湅椤圭洰鍓嶅垽鏂槸鍚﹀叏閮ㄦ湭妫�鎺ュ彛")
+ @GetMapping("/panduaniscunzaiweijian")
+ @ApiOperation(value = "鍒濆椤甸潰鏌ョ湅椤圭洰鍓嶅垽鏂槸鍚﹀叏閮ㄦ湭妫�鎺ュ彛")
public AjaxResult panduaniscunzaiweijian(@RequestParam String tjNum) {
int a = orderRemarkService.panduaniscunzaiweijian(tjNum);
return AjaxResult.success(a);
}
- @PostMapping ("/addOrderYcXmByTjh")
- @ApiOperation (value = "鎬绘鍖荤敓椤甸潰鏂板寮傚父椤圭洰寤鸿")
+ @PostMapping("/addOrderYcXmByTjh")
+ @ApiOperation(value = "鎬绘鍖荤敓椤甸潰鏂板寮傚父椤圭洰寤鸿")
public AjaxResult addOrderYcXmJyByTjh(@RequestBody List<TjOrderYcxm> ycxms) {
- if(null !=ycxms && !ycxms.isEmpty()){
+ if (null != ycxms && !ycxms.isEmpty()) {
String tjh = ycxms.get(0).getTjh();
- if(StringUtils.isNotBlank(tjh)){
+ if (StringUtils.isNotBlank(tjh)) {
ycxmService.delOrderYcXmJyByTjh(tjh);
for (TjOrderYcxm ycxm : ycxms) {
@@ -1961,13 +1914,11 @@
}
-
-
/**
* 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛
*/
- @GetMapping ("/newdataSynchronization")
- @ApiOperation (value = "鏈�鏂板叕鍏卞悓姝ql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
+ @GetMapping("/newdataSynchronization")
+ @ApiOperation(value = "鏈�鏂板叕鍏卞悓姝ql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
@RepeatSubmit
public AjaxResult newdataSynchronization(@RequestParam String tjNumber) {
try {
@@ -1977,20 +1928,18 @@
if (null != order) {
if (null != sfkqdyhis && sfkqdyhis.equals("Y")) {
dataSynchronizationApi(tjNumber);
- }else {
- configController.shoudongtbjyjcwsxmjg("jyjc",tjNumber);
+ } else {
+ configController.shoudongtbjyjcwsxmjg("jyjc", tjNumber);
}
return AjaxResult.success("鍚屾鎴愬姛");
}
return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
} catch (Exception e) {
// throw new RuntimeException(ex);
- log.error(String.valueOf(e),e.getMessage());
+ log.error(String.valueOf(e), e.getMessage());
return AjaxResult.error("璇ヤ汉鍛樻暟鎹鍦ㄥ悓姝ヤ腑锛岃绋嶇瓑");
}
}
-
-
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
index 04f9c4c..78c6249 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
@@ -275,13 +275,18 @@
*/
@GetMapping("/getTjParentProjectList")
@ApiOperation(value = "鑾峰彇浣撴鍗曢」椤圭洰淇℃伅")
- public AjaxResult getTjParentProjectList(@RequestParam(required = false) @ApiParam(value = "鍗曢」鍚�") String proName) {
+ public AjaxResult getTjParentProjectList(@RequestParam(required = false) @ApiParam(value = "鍗曢」鍚�") String proName,
+ @RequestParam(required = false) @ApiParam(value = "鎷奸煶鐮�") String pym) {
LambdaQueryWrapper<TjProject> wq =new LambdaQueryWrapper<>();
wq.eq(TjProject::getProParentId,0);
wq.eq(TjProject::getProStatus,0);
if(null !=proName && !proName.isEmpty()){
wq.like(TjProject::getProName,proName);
}
+ if(null !=pym && !pym.isEmpty()){
+ wq.apply("LOWER(pro_eng_name) LIKE {0}", "%" + pym.toLowerCase() + "%");
+ }
+
List<TjProject> tjProjectList = projectService.list(wq);
return success(tjProjectList);
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
index c4d8bb4..e46c81c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
@@ -45,7 +45,7 @@
/**
* 鏌ヨ浣撴椤圭洰寤鸿瑙勫垯鏂拌〃鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('hosp:advicerules:list')")
+// @PreAuthorize("@ss.hasPermi('hosp:advicerules:list')")
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ浣撴椤圭洰寤鸿瑙勫垯鏂拌〃鍒楄〃")
public TableDataInfo list(TjProAdvicerules tjProAdvicerules) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
index 57093e0..4a56102 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -61,7 +62,14 @@
startPage();
LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
if (tjRules.getProId() != null) {
- wq.eq(TjRules::getProId, tjRules.getProId());
+ List<TjProject> projects = projectService.getTjProjectListBySoneId(tjRules.getProId());
+ if(null !=projects && !projects.isEmpty()){
+ wq.and(w-> w.eq(TjRules::getProId, tjRules.getProId())
+ .or().in(TjRules::getProId,projects.stream().map(TjProject::getProId).collect(Collectors.toList())));
+ }else {
+ wq.eq(TjRules::getProId, tjRules.getProId());
+ }
+
}
if (tjRules.getProName() != null) {
wq.like(TjRules::getProName, tjRules.getProName());
@@ -83,14 +91,7 @@
}
wq.orderByAsc(TjRules::getSort);
List<TjRules> list = tjRulesService.list(wq);
-// if (list != null) {
-// for (TjRules rules : list) {
-// LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();
-// wq1.eq(TjRuleAdvice::getBz, rules.getAid());
-// final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1);
-// rules.setRuleAdvices(list1);
-// }
-// }
+
return getDataTable(list);
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index d229676..8a38e4d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -1,5 +1,6 @@
package com.ltkj.web.controller.system;
+import java.security.Security;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -21,9 +22,13 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import jodd.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
@@ -41,6 +46,7 @@
@RestController
@RequestMapping("/picture/picture")
@Api(tags = "浣撴蹇冪數鍥剧鐞�")
+@Slf4j
public class TjXdPictureController extends BaseController {
@Resource
private ITjXdPictureService tjXdPictureService;
@@ -291,6 +297,8 @@
// orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
// return getResult(page, pageSize, orderList, customerList, map);
// }
+ Long deptId = SecurityUtils.getDeptId();
+ log.info("褰卞儚妫�鏌ュ垪琛�(楠ㄥ瘑搴﹀拰蹇冪數鍥�)鎺ュ彛 褰撳墠鐧诲綍浜虹瀹�"+deptId);
String value = String.valueOf(compId);
if (tjNumber == null) tjNumber = "";
if (compId == null) value = "";
@@ -298,88 +306,100 @@
if (beginTime == null) beginTime = "";
if (endTime == null) endTime = "";
if (tcm == null) tcm = "";
- return AjaxResult.success(orderService.getYxJcList(checkStatus,tjNumber, page, pageSize, value, beginTime, endTime, name,tcm));
+ return AjaxResult.success(orderService.getYxJcList(checkStatus,tjNumber, page, pageSize, value, beginTime, endTime, name,tcm,deptId.toString()));
}
@GetMapping ("/getYxJcXx")
@ApiOperation (value = "褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥鹃〉闈㈢偣鍑讳綋妫�浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛")
public AjaxResult getYxJcXx(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
- List<CsProVo> list = remarkService.getYxJcXx(tjNumber);
+ Long deptId = SecurityUtils.getDeptId();
+ log.info("褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥鹃〉闈㈢偣鍑讳綋妫�浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛褰撳墠鐧诲綍浜虹瀹�"+deptId);
+ List<CsProVo> list = remarkService.getYxJcXx(tjNumber,deptId.toString());
return AjaxResult.success(list);
}
@GetMapping ("/addYxJcXx")
@ApiOperation (value = "鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�")
- @Transactional
+ @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
public AjaxResult addYxJcXx(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber,
@ApiParam (value = "椤圭洰id") @RequestParam String proId,
@ApiParam (value = "妫�鏌ユ墍瑙�") @RequestParam String jcsj,
@ApiParam (value = "妫�鏌ョ粨璁�") @RequestParam String jcjl) {
- SysUser user = SecurityUtils.getLoginUser().getUser();
- TjOrder order = orderService.getOrderByTjNum(tjNumber);
- if(null !=order){
- TjProject project = projectService.getById(proId);
- if(null !=project){
- List<TjProject> projects = projectService.getTjProjectListBySoneId(proId);
- LambdaQueryWrapper<TjOrderDetail>wq1=new LambdaQueryWrapper<>();
- wq1.eq(TjOrderDetail::getProId,projects.get(0).getProParentId());
- wq1.eq(TjOrderDetail::getOrderId,order.getOrderId());
- TjOrderDetail detail = detailService.getOne(wq1);
- if(null !=detail){
- detail.setProResult(jcjl+"銆�"+jcsj);
- detail.setTjStatus(1L);
- detailService.updateById(detail);
- LambdaQueryWrapper<TjOrderRemark>wq2=new LambdaQueryWrapper<>();
- wq2.eq(TjOrderRemark::getProId,proId);
- wq2.eq(TjOrderRemark::getTjNumber,tjNumber);
- TjOrderRemark orderRemark = remarkService.getOne(wq2);
- if(null !=orderRemark){
- orderRemark.setType(1);
- remarkService.updateById(orderRemark);
- xdtgmdjgService.deletedByTJhAndProId(tjNumber, proId);
- TjXdtgmdjg xdtgmdjg=new TjXdtgmdjg();
- xdtgmdjg.setTjh(tjNumber);
- xdtgmdjg.setCardId(order.getCardId());
- xdtgmdjg.setProId(proId);
- xdtgmdjg.setProName(project.getProName());
- xdtgmdjg.setJcsj(jcsj);
- xdtgmdjg.setJcjl(jcjl);
- xdtgmdjg.setCreateBy(user.getNickName());
- xdtgmdjg.setCreateId(user.getUserId().toString());
- xdtgmdjgService.save(xdtgmdjg);
- saveTjXdtgmdjgByJcbgd(xdtgmdjg);
+ try {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if(null !=order){
+ TjProject project = projectService.getById(proId);
+ if(null !=project){
+ List<TjProject> projects = projectService.getTjProjectListBySoneId(proId);
+ LambdaQueryWrapper<TjOrderDetail>wq1=new LambdaQueryWrapper<>();
+ wq1.eq(TjOrderDetail::getProId,projects.get(0).getProParentId());
+ wq1.eq(TjOrderDetail::getOrderId,order.getOrderId());
+ TjOrderDetail detail = detailService.getOne(wq1);
+ if(null !=detail){
+ detail.setProResult(jcjl+"銆�"+jcsj);
+ detail.setTjStatus(1L);
+ detailService.updateById(detail);
+ LambdaQueryWrapper<TjOrderRemark>wq2=new LambdaQueryWrapper<>();
+ wq2.eq(TjOrderRemark::getProId,proId);
+ wq2.eq(TjOrderRemark::getTjNumber,tjNumber);
+ TjOrderRemark orderRemark = remarkService.getOne(wq2);
+ if(null !=orderRemark){
+ orderRemark.setType(1);
+ remarkService.updateById(orderRemark);
+ xdtgmdjgService.deletedByTJhAndProId(tjNumber, proId);
+ TjXdtgmdjg xdtgmdjg=new TjXdtgmdjg();
+ xdtgmdjg.setTjh(tjNumber);
+ xdtgmdjg.setCardId(order.getCardId());
+ xdtgmdjg.setProId(proId);
+ xdtgmdjg.setProName(project.getProName());
+ xdtgmdjg.setJcsj(jcsj);
+ xdtgmdjg.setJcjl(jcjl);
+ xdtgmdjg.setCreateBy(user.getNickName());
+ xdtgmdjg.setCreateId(user.getUserId().toString());
+ xdtgmdjgService.save(xdtgmdjg);
+ saveTjXdtgmdjgByJcbgd(xdtgmdjg);
+ }
}
}
+ return AjaxResult.success();
}
- return AjaxResult.success();
+ return AjaxResult.error("鏆傛棤浣撴璁板綍");
+ } catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ log.error("鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�"+e.getMessage());
+ throw new RuntimeException("鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�");
}
- return AjaxResult.error("鏆傛棤浣撴璁板綍");
}
-
+ @Transactional(propagation = Propagation.REQUIRED) // 鍏变韩浜嬪姟
public void saveTjXdtgmdjgByJcbgd(TjXdtgmdjg xdtgmdjg) {
- int length = xdtgmdjg.getProId().length();
- // 纭繚瀛楃涓查暱搴﹁嚦灏戜负6
- String last6 = length >= 6 ? xdtgmdjg.getProId().substring(length - 6) : xdtgmdjg.getProId();
-
- LtkjExamJcbgd jcbgd=new LtkjExamJcbgd();
- jcsqdService.deletedLtkjJcsqdByTjhandtmh(xdtgmdjg.getCardId(),xdtgmdjg.getTjh()+last6);
- jcbgdService.deletedLtkjJcbgdByTjhandtmh(xdtgmdjg.getCardId(),xdtgmdjg.getTjh()+last6);
- jcbgd.setTjh(xdtgmdjg.getCardId());
- jcbgd.setTmh(xdtgmdjg.getTjh()+last6);
- jcbgd.setXmdm(xdtgmdjg.getProId());
- jcbgd.setXmmc(xdtgmdjg.getProName());
- jcbgd.setBgNr(xdtgmdjg.getJcsj());
- jcbgd.setBgUrl("");
- jcbgd.setShysxm(xdtgmdjg.getCreateBy());
- jcbgd.setShysdm(xdtgmdjg.getCreateId());
- jcbgd.setYxzd(xdtgmdjg.getJcjl());
- jcbgd.setYxbx("鏈寮傚父");
- jcbgd.setZdsj(DateUtil.format(new Date(),"yyyy-MM-dd"));
- jcbgd.setJcbw("");
- jcbgd.setSqsj(DateUtil.format(new Date(),"yyyy-MM-dd"));
- jcbgd.setCreateTime(new Date());
- jcbgdService.save(jcbgd);
- jcsqdService.saveLtkjExamJcsqd(xdtgmdjg.getCardId());
+ try {
+ int length = xdtgmdjg.getProId().length();
+ // 纭繚瀛楃涓查暱搴﹁嚦灏戜负6
+ String last6 = length >= 6 ? xdtgmdjg.getProId().substring(length - 6) : xdtgmdjg.getProId();
+ Date date = new Date();
+ LtkjExamJcbgd jcbgd=new LtkjExamJcbgd();
+ jcsqdService.deletedLtkjJcsqdByTjhandtmh(xdtgmdjg.getCardId(),xdtgmdjg.getTjh()+last6);
+ jcbgdService.deletedLtkjJcbgdByTjhandtmh(xdtgmdjg.getCardId(),xdtgmdjg.getTjh()+last6);
+ jcbgd.setTjh(xdtgmdjg.getCardId());
+ jcbgd.setTmh(xdtgmdjg.getTjh()+last6);
+ jcbgd.setXmdm(xdtgmdjg.getProId());
+ jcbgd.setXmmc(xdtgmdjg.getProName());
+ jcbgd.setBgNr(xdtgmdjg.getJcsj());
+ jcbgd.setBgUrl("");
+ jcbgd.setShysxm(xdtgmdjg.getCreateBy());
+ jcbgd.setShysdm(xdtgmdjg.getCreateId());
+ jcbgd.setYxzd(xdtgmdjg.getJcjl());
+ jcbgd.setYxbx("鏈寮傚父");
+ jcbgd.setZdsj(DateUtil.format(date,"yyyy-MM-dd"));
+ jcbgd.setJcbw("");
+ jcbgd.setSqsj(DateUtil.format(date,"yyyy-MM-dd"));
+ jcbgd.setCreateTime(date);
+ jcbgdService.save(jcbgd);
+ jcsqdService.saveLtkjExamJcsqd(xdtgmdjg.getCardId());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index d60c4e3..761b949 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -1,6 +1,7 @@
import cn.hutool.core.io.FileUtil;
import com.ltkj.LtkjApplication;
+import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.idutil.IdUtils;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
@@ -68,42 +69,9 @@
public static void main(String[] args) throws Exception {
- List<String> numbers = Arrays.asList(
- "25032800283", "25032800284", "25032800285", "25032800286",
- "25032800287", "25032800288", "25032800289", "25032800290",
- "25032800291", "25032800292", "25032800293", "25032800294",
- "25032800295", "25032800296", "25032800297", "25032800298",
- "25032800299", "25032800300", "25032800301", "25032800302",
- "25032800303", "25032800304", "25032800305", "25032800306",
- "25032800307", "25032800308", "25032800309", "25032800310",
- "25032800311", "25032800312", "25032800313", "25032800314",
- "25032800315", "25032800316", "25032800317", "25032800318",
- "25032800319", "25032800320", "25032800321", "25032800322",
- "25032800323", "25032800324", "25032800325", "25032800326",
- "25032800327", "25032800328", "25032800329", "25032800330",
- "25032800331", "25032800332", "25032800333", "25032800334",
- "25032800335", "25032800336", "25032800337", "25032800338",
- "25032800339", "25032800340", "25032800341", "25032800342",
- "25032800343", "25032800344", "25032800345", "25032800346",
- "25032800347", "25032800348", "25032800349", "25032800350",
- "25032800351", "25032800352", "25032800353", "25032800354",
- "25032800355", "25032800356", "25032800357", "25032800358",
- "25032800359", "25032800360", "25032800361", "25032800362",
- "25032800363", "25032800364", "25032800365", "25032800366",
- "25032800367", "25032800368", "25032800369", "25032800370",
- "25032800371", "25032800372", "25032800373", "25032800374"
- );
- Set<String> uniqueNumbers = new HashSet<>(numbers);
- if (uniqueNumbers.size() == numbers.size()) {
- System.out.println("鉁� 娌℃湁閲嶅缂栧彿锛�");
- } else {
- System.out.println("鉂� 鍙戠幇閲嶅缂栧彿锛�");
- numbers.stream()
- .filter(n -> Collections.frequency(numbers, n) > 1)
- .distinct()
- .forEach(n -> System.out.println("閲嶅鐨勭紪鍙凤細" + n));
- }
+ System.out.println(MatchUtils.isIdCard("622723197401030409"));
+ System.out.println(MatchUtils.isMobileNO("15346732733"));
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index 0d75038..bdaed08 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -293,6 +293,6 @@
@Update("UPDATE tj_order_remark a SET a.deleted=1 WHERE a.remark_id=#{remarkId}")
void updateTjOrderRemarkdel(@Param("remarkId")String remarkId);
- @Select("call tj_yxjcymxx(#{tjh,mode=IN})")
- List<CsProVo> getYxJcXx(@Param("tjh")String tjNumber);
+ @Select("call tj_yxjcymxx(#{tjh,mode=IN},#{ks,mode=IN})")
+ List<CsProVo> getYxJcXx(@Param("tjh")String tjNumber,@Param("ks")String ks);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
index a8ea5b7..4026f0b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -97,5 +97,5 @@
List<TjOrderRemark> shoufeiyemianweishoufei(String tjNumber,String jxbz);
- List<CsProVo> getYxJcXx(String tjNumber);
+ List<CsProVo> getYxJcXx(String tjNumber,String ks);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 7f56c09..d6a85fa 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -193,5 +193,6 @@
//瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆)
- Map<String,Object> getYxJcList(Integer checkStatus ,String tjNumber,Integer page,Integer pageSize, String compId, String beginTime, String endTime,String tjname,String tcm);
+ Map<String,Object> getYxJcList(Integer checkStatus ,String tjNumber,Integer page,Integer pageSize,
+ String compId, String beginTime, String endTime,String tjname,String tcm,String deptId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index c117953..a9a82d8 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -194,8 +194,8 @@
}
@Override
- public List<CsProVo> getYxJcXx(String tjNumber) {
- List<CsProVo> yxJcXx = mapper.getYxJcXx(tjNumber);
+ public List<CsProVo> getYxJcXx(String tjNumber,String ks) {
+ List<CsProVo> yxJcXx = mapper.getYxJcXx(tjNumber,ks);
return yxJcXx;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index 6b58b88..f8e54ac 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -438,7 +438,8 @@
}
@Override
- public Map<String, Object> getTjBgdyList(Integer pageNum, Integer pageSize, Integer dyzt, String tjNum, String name, String dw, String djbeginTime, String djendTime) {
+ public Map<String, Object> getTjBgdyList(Integer pageNum, Integer pageSize, Integer dyzt,
+ String tjNum, String name, String dw, String djbeginTime, String djendTime) {
Map<String, Object> map = new HashMap<>();
map.put("page",pageNum);
@@ -458,7 +459,8 @@
}
@Override
- public Map<String, Object> getYxJcList(Integer checkStatus ,String tjNumber, Integer page, Integer pageSize, String compId, String beginTime, String endTime, String tjname,String tcm) {
+ public Map<String, Object> getYxJcList(Integer checkStatus ,String tjNumber, Integer page, Integer pageSize,
+ String compId, String beginTime, String endTime, String tjname,String tcm,String deptId) {
Map<String, Object> map = new HashMap<>();
map.put("checkStatus",checkStatus);
map.put("page",page);
@@ -469,6 +471,7 @@
map.put("tcm",tcm);
map.put("beginTime",beginTime);
map.put("endTime",endTime);
+ map.put("ks",deptId);
List<List<?>> list = tjOrderMapper.getYxJcList(map);
Map<String,Object> map1=new HashMap<>();
map1.put("customers",list);
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
index a256507..23d66cf 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -425,6 +425,7 @@
#{beginTime,mode=IN,jdbcType=VARCHAR},
#{endTime,mode=IN,jdbcType=VARCHAR},
#{tcm,mode=IN,jdbcType=VARCHAR},
+ #{ks,mode=IN,jdbcType=VARCHAR},
#{total,mode=OUT,jdbcType=INTEGER}
)}
</select>
--
Gitblit v1.8.0