From edd6968aa0f62dce0229f6addb8a0762696eed0d Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 28 十一月 2024 16:49:50 +0800
Subject: [PATCH] 2024-11-28
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 43 +++--
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 11
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java | 11 +
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java | 6
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java | 3
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 94 +++++++------
ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 16 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 203 +++++++++++++++++++++++++++++
ltkj-common/src/main/java/com/ltkj/common/utils/pdfutils/PdfUtils.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java | 18 +
15 files changed, 334 insertions(+), 82 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 e01b1b9..bc4109c 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
@@ -1,17 +1,219 @@
package com.ltkj.web.controller.his;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.controller.BaseController;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.framework.config.UserHoder;
+import com.ltkj.hosp.domain.LtkjJianchajianyanTree;
+import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.hisDto.*;
+import com.ltkj.hosp.mapper.TestMapper;
+import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
+import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
+import com.ltkj.hosp.vodomain.CsProVo;
+import com.ltkj.web.controller.system.TjCheckController;
import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
@Api(tags = "AAAAA-----HISAPI鐩稿叧鎺ュ彛鏂囨。")
@RestController
@RequestMapping("/api/His")
public class HisApiController extends BaseController {
+
+ @Autowired
+ private TestMapper testMapper;
+ @Autowired
+ private ITjOrderService tjOrderService;
+ @Autowired
+ private TjCheckController tjCheckController;
+ @Autowired
+ private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
+ @Autowired
+ private LtkjExamJcsqdService ltkjExamJcsqdService;
+ @Autowired
+ private LtkjExamJcbgdService ltkjExamJcbgdService;
+ @Autowired
+ private ITjProjectService projectService;
+
+ /**
+ * 鑾峰彇pacs妫�鏌ユ暟鎹�
+ * @param json
+ * @return
+ */
+ @PostMapping("/pacs/getAll")
+ public AjaxResult getAllList(@RequestBody String json) {
+ cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj(json);
+ String tjNum = StrUtil.isBlank(parseObj.getStr("tjNum")) ? null : parseObj.getStr("tjNum");
+ String name = StrUtil.isBlank(parseObj.getStr("name")) ? null : parseObj.getStr("name");
+ String start = StrUtil.isBlank(parseObj.getStr("start")) ? null : parseObj.getStr("start");
+ String end = StrUtil.isBlank(parseObj.getStr("end")) ? null : parseObj.getStr("end");
+ String mzh = null;
+ if (tjNum == null && name == null){
+ return AjaxResult.error("浣撴鍙峰拰鍚嶅瓧涓嶈兘閮戒负绌�");
+ }
+ if (tjNum != null) {
+ LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjOrder::getTjNumber,tjNum);
+ TjOrder order = tjOrderService.getOne(wrapper);
+ mzh = order.getCardId();
+ }
+ List<Map<String, Object>> jcList = testMapper.getPacsJcList(name, mzh, start, end);
+ if (jcList.isEmpty()){
+ return AjaxResult.success();
+ }
+ if (tjNum == null){
+ String string = jcList.get(0).get("mzh").toString();
+ LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjOrder::getCardId,string);
+ TjOrder order = tjOrderService.getOne(wrapper);
+ if (order == null) return AjaxResult.error("");
+ tjNum = order.getTjNumber();
+ }
+ List<CsProVo> proVos = tjCheckController.getCsProVos(tjNum,true);
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("pacs",jcList);
+ hashMap.put("vo",proVos);
+ return AjaxResult.success(hashMap);
+ }
+
+ /**
+ * 鑾峰彇pacs妫�鏌ユ暟鎹�
+ * @param json
+ * @return
+ */
+ @PostMapping("/pacs/getList")
+ public AjaxResult getList(@RequestBody String json) {
+ log.info("pacs鎺ュ彛鍙傛暟->{}",JSONUtil.toJsonStr(json));
+// cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj(json);
+// String tjNum = StrUtil.isBlank(parseObj.getStr("tjNum")) ? null : parseObj.getStr("tjNum");
+// String name = StrUtil.isBlank(parseObj.getStr("name")) ? null : parseObj.getStr("name");
+// String start = StrUtil.isBlank(parseObj.getStr("start")) ? null : parseObj.getStr("start");
+// String end = StrUtil.isBlank(parseObj.getStr("end")) ? null : parseObj.getStr("end");
+// String mzh = null;
+// if (tjNum == null && name == null){
+// return AjaxResult.error("浣撴鍙峰拰鍚嶅瓧涓嶈兘閮戒负绌�");
+// }
+// if (tjNum != null) {
+// LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjOrder::getTjNumber,tjNum);
+// TjOrder order = tjOrderService.getOne(wrapper);
+// mzh = order.getCardId();
+// }
+// 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));
+ }
+
+ @GetMapping("/getTjList")
+ public AjaxResult getTjList(@RequestParam("code")String code){
+ log.info("tjList鎺ュ彛鍙傛暟->{}",code);
+// LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
+// queryWrapper.eq(TjOrder::getCardId,code);
+// TjOrder order = tjOrderService.getOne(queryWrapper);
+// if (order == null){
+// return AjaxResult.error("闂ㄨ瘖鍙�:"+code+"鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
+// }
+// List<CsProVo> proVos = tjCheckController.getCsProVos(order.getTjNumber(),true);
+// return AjaxResult.success(proVos);
+ String json = "[{\"deptName\":\"CT瀹",\"proName\":\"(tj)鑳搁儴CT骞虫壂\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"}]";
+ return AjaxResult.success(JSONUtil.parseArray(json));
+ }
+
+ @Transactional
+ @PostMapping("/asyncPacs")
+ public AjaxResult asyncPacs(@RequestBody String json) {
+ log.info("鍚堝苟妫�娴嬪悓姝ュ弬鏁� ->{}",json);
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException ignored) {
+
+ }
+// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj( json);
+// cn.hutool.json.JSONObject pacs = parseObj.getJSONObject("pacs");
+// cn.hutool.json.JSONObject tj = parseObj.getJSONObject("tj");
+// LtkjExamJcsqd ltkjExamJcsqd = new LtkjExamJcsqd();
+// ltkjExamJcsqd.setTjh(pacs.getStr("mzh"));
+//
+// LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+// queryWrapper.eq(LtkjJianchajianyanTree::getCardId, pacs.getStr("mzh"));
+// String xmdm = projectService.getById(tj.getStr("proId")).getHisXmbm();
+// queryWrapper.eq(LtkjJianchajianyanTree::getType,"妫�鏌�");
+// queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm,xmdm);
+//
+// LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
+// ltkjExamJcsqd.setTmh("M_"+tree.getSqdh()+"_"+tree.getHisXmdm());
+// ltkjExamJcsqd.setBgys(pacs.getStr("checkDoctorName"));
+// ltkjExamJcsqd.setBgysid(pacs.getStr("checkDoctorCode"));
+// ltkjExamJcsqd.setSqsj(format.format(tree.getCreateTime()));
+// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+// Date reportDate = null;
+// try {
+// reportDate = dateFormat.parse(pacs.getStr("reportDate"));
+// ltkjExamJcsqd.setJgsj(format.format(reportDate));
+// } catch (ParseException ignored) {
+// ltkjExamJcsqd.setJgsj(format.format(new Date()));
+// }
+// String checkParts = pacs.getStr("checkParts");
+// ltkjExamJcsqd.setJcxmmc(checkParts);
+// ltkjExamJcsqd.setJcxmid(xmdm);
+// ltkjExamJcsqd.setBw(checkParts);
+// ltkjExamJcsqd.setJgzt(pacs.getStr("diagnosis"));
+// ltkjExamJcsqd.setJgbx(pacs.getStr("examination"));
+// boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
+//
+// LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
+// ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
+// ltkjExamJcbgd.setTmh(ltkjExamJcsqd.getTmh());
+// ltkjExamJcbgd.setXmdm(ltkjExamJcsqd.getJcxmid());
+// ltkjExamJcbgd.setXmmc(ltkjExamJcsqd.getJcxmmc());
+// ltkjExamJcbgd.setBgUrl("");
+// ltkjExamJcbgd.setShysxm(pacs.getStr("reportDoctorName"));
+// ltkjExamJcbgd.setShysdm(pacs.getStr("reportDoctorCode"));
+// ltkjExamJcbgd.setYxzd(ltkjExamJcsqd.getJgzt());
+// ltkjExamJcbgd.setYxbx(ltkjExamJcsqd.getJgbx());
+// ltkjExamJcbgd.setZdsj(ltkjExamJcsqd.getJgsj());
+// ltkjExamJcbgd.setSqsj(ltkjExamJcsqd.getSqsj());
+// ltkjExamJcbgd.setJcbw(ltkjExamJcsqd.getJcxmmc());
+// boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
+// if (save1 && save2) {
+// LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjOrder::getCardId, ltkjExamJcbgd.getTjh());
+// TjOrder order = tjOrderService.getOne(wrapper);
+// try {
+// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+// }catch (Exception e){
+// log.error(String.valueOf(e));
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+// }
+// } else {
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+// }
+ return AjaxResult.success();
+ }
+
@PostMapping(value = "/callback")
@@ -26,6 +228,7 @@
+
// @Autowired
// private ITjCustomerService tjCustomerService;
//
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 136cd37..111bff4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -99,15 +99,17 @@
@Logger
public AjaxResult HisApiMethods(TjCustomer customer,TjOrder tjOrder) {
String jzh=null;
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
try {
// TjOrder tjOrder = orderService.getById(orderId);
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
outpinregapplyDto.setPationid(customer.getPationId());
- outpinregapplyDto.setSqysbm("00029");
- outpinregapplyDto.setMzksbm("0101");
- outpinregapplyDto.setCzybm("00029");
+ outpinregapplyDto.setSqysbm(ysbm);
+ outpinregapplyDto.setMzksbm(dept);
+ outpinregapplyDto.setCzybm(ysbm);
outpinregapplyDto.setSfjz("0");
outpinregapplyDto.setGhzlbm("01");
outpinregapplyDto.setYwckbm("0001");
@@ -133,7 +135,7 @@
hisApiGetMethodService.save(object4, "Outpinregapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(outpinregapplyDto)));
//闂ㄨ瘖鍖荤敓鎺ヨ瘖
- AjaxResult result = controller.Outpinconapply(hisRegistrationId, date, "00029");
+ AjaxResult result = controller.Outpinconapply(hisRegistrationId, date, ysbm);
String result3 = getAjaxResult(result);
JSONObject object2 = getJSONObject(result3);
String code2 = object2.getStr("ResultCode");
@@ -156,12 +158,12 @@
OutpinimpapplyDto dto=new OutpinimpapplyDto();
dto.setHisRegistrationId(tjOrder.getCardId());
dto.setMzzdid(1);
- dto.setSqysbm("00029");
- dto.setMzksbm("0101");
+ dto.setSqysbm(ysbm);
+ dto.setMzksbm(dept);
dto.setFbrq(date);
dto.setZdrq(date);
- dto.setCzybm("00029");
- dto.setCzyksbm("0101");
+ dto.setCzybm(ysbm);
+ dto.setCzyksbm(dept);
dto.setZs("鍋ュ悍鏌ヤ綋");
dto.setBs("涓嶈");
dto.setClyz("");
@@ -190,7 +192,9 @@
//浣撴瀵筯is鐢宠鍗曡皟鐢ㄦ柟娉�
public AjaxResult tijianshenqing(TjCustomer customer, String date,String cardId) {
-
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
+ String ysmc = configService.selectConfigByKey("request_default_ysmc");
List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
@@ -198,11 +202,11 @@
OutpintestapplyDto dto = new OutpintestapplyDto();
dto.setHisRegistrationId(cardId);
dto.setSfzh(customer.getCusIdcard());
- dto.setSqysbm("00029");
- dto.setMzksbm("0101");
+ dto.setSqysbm(ysbm);
+ dto.setMzksbm(dept);
dto.setSjrq(date);
- dto.setCzybm("00029");
- dto.setCzyksbm("0101");
+ dto.setCzybm(ysbm);
+ dto.setCzyksbm(dept);
dto.setSfjz("0");
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
@@ -310,10 +314,10 @@
OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
outpinexamapplyDto.setHisRegistrationId(cardId);
outpinexamapplyDto.setSfzh(customer.getCusIdcard());
- outpinexamapplyDto.setSqysbm("00029");
- outpinexamapplyDto.setMzksbm("0101");
- outpinexamapplyDto.setCzybm("00029");
- outpinexamapplyDto.setCzyksbm("0101");
+ outpinexamapplyDto.setSqysbm(ysbm);
+ outpinexamapplyDto.setMzksbm(dept);
+ outpinexamapplyDto.setCzybm(ysbm);
+ outpinexamapplyDto.setCzyksbm(dept);
outpinexamapplyDto.setSfjz("0");
// List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
@@ -412,11 +416,11 @@
OutpintreatapplyDto dao = new OutpintreatapplyDto();
dao.setHisRegistrationId(cardId);
dao.setSfzh(customer.getCusIdcard());
- dao.setSqysbm("00029");
- dao.setMzksbm("0101");
+ dao.setSqysbm(ysbm);
+ dao.setMzksbm(dept);
dao.setSjrq(date);
- dao.setCzybm("00029");
- dao.setCzyksbm("0101");
+ dao.setCzybm(ysbm);
+ dao.setCzyksbm(dept);
dao.setSfjz("0");
// List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
@@ -514,11 +518,11 @@
OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
dto1.setHisRegistrationId(cardId);
dto1.setSfzh(customer.getCusIdcard());
- dto1.setSqysbm("00029");
- dto1.setMzksbm("0101");
+ dto1.setSqysbm(ysbm);
+ dto1.setMzksbm(dept);
dto1.setSjrq(date);
- dto1.setCzybm("00029");
- dto1.setCzyksbm("0101");
+ dto1.setCzybm(ysbm);
+ dto1.setCzyksbm(dept);
dto1.setCflxbm("A");
dto1.setYfbm("1");
dto1.setFyts("1");
@@ -538,11 +542,11 @@
cf.setCardId(cardId);
cf.setSfzh(customer.getCusIdcard());
cf.setCfh(cfh);
- cf.setSqysbm("00029");
- cf.setSqysxm("鐜嬪仴钀�");
- cf.setMzksbn("0101");
+ cf.setSqysbm(ysbm);
+ cf.setSqysxm(ysmc);
+ cf.setMzksbn(dept);
cf.setSqrq(date);
- cf.setCzybm("00029");
+ cf.setCzybm(ysbm);
cf.setYpbm(detilsDto.getYpbm());
cf.setYpmc("灏跨礌[14C]鍛兼皵璇曢獙鑽洅");
cf.setSl(String.valueOf(detilsDto.getSl()));
@@ -792,6 +796,8 @@
//閫�璐瑰悗鍙栨秷鎺ヨ瘖浣滃簾鐢宠鍗曠瓑鎿嶄綔
@Transactional
public boolean ZfHisApiMethods(TjCustomer customer, TjOrder order,Boolean isUseLisAndPacsRegister) {
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
+
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
@@ -846,7 +852,7 @@
//2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
if (null != jcsqdh && jcsqdh.size()>0) {
for (String s : jcsqdh) {
- AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", s);
+ AjaxResult result = controller.Outpindelexamapply(order.getCardId(), ysbm, s);
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
@@ -862,7 +868,7 @@
//2.1.6.3 浣滃簾闂ㄨ瘖妫�楠岀敵璇�
if (null != jysqdh && jysqdh.size()>0) {
for (String s : jysqdh) {
- ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", s);
+ ajaxResult = controller.Outpindeltestapply(order.getCardId(), ysbm, s);
result2 = getAjaxResult(ajaxResult);
object1 = getJSONObject(result2);
code1 = object1.getStr("ResultCode");
@@ -878,7 +884,7 @@
//2.1.6.9 浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠
if (null != zlsqdh && zlsqdh.size()>0) {
for (String s : zlsqdh) {
- ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", s);
+ ajaxResult = controller.Outpintdelreatapply(order.getCardId(), ysbm, s);
result2 = getAjaxResult(ajaxResult);
object1 = getJSONObject(result2);
code1 = object1.getStr("ResultCode");
@@ -891,7 +897,7 @@
//浣滃簾鑽搧鐢宠
if(null !=cfhs && cfhs.size()>0){
for (String cfh : cfhs) {
- AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), "00029", cfh);
+ AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), ysbm, cfh);
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
@@ -903,7 +909,7 @@
// }
//2.1.3 闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖
- ajaxResult = controller.Outpinunconapply(order.getCardId(), date, "00029");
+ ajaxResult = controller.Outpinunconapply(order.getCardId(), date, ysbm);
result2 = getAjaxResult(ajaxResult);
object1 = getJSONObject(result2);
code1 = object1.getStr("ResultCode");
@@ -920,6 +926,7 @@
log.info("bldhs ->{}",JSONUtil.toJsonStr(bldhs));
if(null !=bldhs && bldhs.size()>0){
log.info("杩涘叆鍒ゆ柇");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
try {
for (String bldh : bldhs) {
@@ -978,7 +985,7 @@
// 2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
if (null != jcsqdh && jcsqdh.size()>0) {
for (String s : jcsqdh) {
- AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", s);
+ AjaxResult result = controller.Outpindelexamapply(order.getCardId(), ysbm, s);
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
@@ -993,7 +1000,7 @@
//2.1.6.3 浣滃簾闂ㄨ瘖妫�楠岀敵璇�
if (null != jysqdh && jysqdh.size()>0) {
for (String s : jysqdh) {
- ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", s);
+ ajaxResult = controller.Outpindeltestapply(order.getCardId(), ysbm, s);
result2 = getAjaxResult(ajaxResult);
object1 = getJSONObject(result2);
code1 = object1.getStr("ResultCode");
@@ -1008,7 +1015,7 @@
//2.1.6.9 浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠
if (null != zlsqdh && zlsqdh.size()>0) {
for (String s : zlsqdh) {
- ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", s);
+ ajaxResult = controller.Outpintdelreatapply(order.getCardId(), ysbm, s);
result2 = getAjaxResult(ajaxResult);
object1 = getJSONObject(result2);
code1 = object1.getStr("ResultCode");
@@ -1023,7 +1030,7 @@
//浣滃簾鑽搧鐢宠
if(null !=cfhs && cfhs.size()>0){
for (String cfh : cfhs) {
- AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), "00029", cfh);
+ AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), ysbm, cfh);
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
@@ -1047,6 +1054,7 @@
//閫�璐瑰悗鍙栨秷鎺ヨ瘖浣滃簾鐢宠鍗曠瓑鎿嶄綔
public boolean ZfHisApiMethod(String jzh) {
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
@@ -1063,7 +1071,7 @@
//2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
if (null != jcsqdh && jcsqdh.size()>0) {
for (String s : jcsqdh) {
- AjaxResult result = controller.Outpindelexamapply(jzh, "00029", s);
+ AjaxResult result = controller.Outpindelexamapply(jzh, ysbm, s);
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
@@ -1084,7 +1092,7 @@
if (null != jysqdh && jysqdh.size()>0) {
for (String s : jysqdh) {
- ajaxResult = controller.Outpindeltestapply(jzh, "00029", s);
+ ajaxResult = controller.Outpindeltestapply(jzh, ysbm, s);
result2 = getAjaxResult(ajaxResult);
object1 = getJSONObject(result2);
code1 = object1.getStr("ResultCode");
@@ -1097,7 +1105,7 @@
//2.1.6.9 浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠
if (null != zlsqdh && zlsqdh.size()>0) {
for (String s : zlsqdh) {
- ajaxResult = controller.Outpintdelreatapply(jzh, "00029", s);
+ ajaxResult = controller.Outpintdelreatapply(jzh, ysbm, s);
result2 = getAjaxResult(ajaxResult);
object1 = getJSONObject(result2);
code1 = object1.getStr("ResultCode");
@@ -1110,7 +1118,7 @@
//浣滃簾鑽搧鐢宠
if(null !=cfhs && cfhs.size()>0){
for (String cfh : cfhs) {
- AjaxResult result = controller.Outpindelmedicapply(jzh, "00029", cfh);
+ AjaxResult result = controller.Outpindelmedicapply(jzh, ysbm, cfh);
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
@@ -1122,7 +1130,7 @@
//2.1.3 闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖
- ajaxResult = controller.Outpinunconapply(jzh, date, "00029");
+ ajaxResult = controller.Outpinunconapply(jzh, date, ysbm);
result2 = getAjaxResult(ajaxResult);
object1 = getJSONObject(result2);
code1 = object1.getStr("ResultCode");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
index 3eb115f..d7975e6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
@@ -7,6 +7,7 @@
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.hisDto.*;
import com.ltkj.hosp.service.ITjCustomerService;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.wxUtils.HttpClientUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,8 @@
public class HisApiMethodService {
@Autowired
private ITjCustomerService tjCustomerService;
+ @Autowired
+ private ISysConfigService configService;
private static String HIS_URL = "";
@@ -65,6 +68,7 @@
// @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖娉ㄥ唽淇℃伅")
public AjaxResult Outpincreateapply (TjCustomer customer) {
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
Map<String, Object> map = new HashMap<> ();
if (null != customer.getPationId () && !customer.getPationId().equals("0")) {
map.put ("Pationid", customer.getPationId ());
@@ -95,7 +99,7 @@
map.put ("mz", null);
map.put ("zy","鑱屽憳");
map.put ("fbbm", null);
- map.put ("czy", "00029");
+ map.put ("czy", ysbm);
map.put ("jkkkh",null);
map.put ("mindex_id",null);
// map.put ("zybm","鑱屽憳");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
index a824950..ada03db 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
@@ -79,6 +79,8 @@
@Deprecated
public Boolean save(TjOrder tjOrder, TjCustomer tjCustomer, List<TbTransition> detailList){
if (detailList != null && !detailList.isEmpty()) {
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
wq.in(TjProject::getDeptId,deptService.getJyDeptIds());
@@ -112,8 +114,8 @@
lisSaveSqdxxDto.setCyrq("");
lisSaveSqdxxDto.setLczd("");
lisSaveSqdxxDto.setBz("");
- lisSaveSqdxxDto.setKsbm("0101");
- lisSaveSqdxxDto.setSqys("00029");
+ lisSaveSqdxxDto.setKsbm(dept);
+ lisSaveSqdxxDto.setSqys(ysbm);
lisSaveSqdxxDto.setKfbz("1");
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>();
@@ -193,6 +195,8 @@
}
public Boolean save(TjSampling sampling,TjOrder tjOrder,TjCustomer tjCustomer){
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
AtomicInteger xh = new AtomicInteger();
LisSaveSqdxxDto lisSaveSqdxxDto = new LisSaveSqdxxDto();
// String jyxh = idUtils.generateLisID();
@@ -213,8 +217,8 @@
lisSaveSqdxxDto.setCyrq("");
lisSaveSqdxxDto.setLczd("");
lisSaveSqdxxDto.setBz("");
- lisSaveSqdxxDto.setKsbm("0101");
- lisSaveSqdxxDto.setSqys("00029");
+ lisSaveSqdxxDto.setKsbm(dept);
+ lisSaveSqdxxDto.setSqys(ysbm);
lisSaveSqdxxDto.setKfbz("1");
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>();
@@ -326,6 +330,8 @@
// List<TjProject> projects = projectService.list(wq);
if (projects != null && !projects.isEmpty()) {
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
// 鏍规嵁project琛ㄧ殑his_xmbm鏌ョ粍鍚堝叧鑱旇〃 ltkj_jfzhgljyxmzd 鏍规嵁瀛楁`zhxmdm`
// - 鏌ュ埌 浣跨敤瀛楁`jyxmdm`鏌ユ楠岄」鐩瓧鍏歌〃 ltkj_jyxmzd 鏍规嵁瀛楁`jyxmdm`
// - 鏈煡鍒� 鏌ラ」鐩叧鑱旇〃ltkj_jfxmgljyxmzd 鏍规嵁瀛楁`xmdm`
@@ -354,8 +360,8 @@
lisSaveSqdxxDto.setCyrq("");
lisSaveSqdxxDto.setLczd("");
lisSaveSqdxxDto.setBz("");
- lisSaveSqdxxDto.setKsbm("0101");
- lisSaveSqdxxDto.setSqys("00029");
+ lisSaveSqdxxDto.setKsbm(dept);
+ lisSaveSqdxxDto.setSqys(ysbm);
lisSaveSqdxxDto.setKfbz("1");
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
index f4d4e2b..6a9786b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
@@ -15,6 +15,7 @@
import com.ltkj.hosp.hisDto.OutpintestapplyDetailsDto;
import com.ltkj.hosp.pacsDto.SavePacsApply;
import com.ltkj.hosp.service.*;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import lombok.extern.slf4j.Slf4j;
@@ -48,6 +49,8 @@
private LtkjEjjfxmzdService ltkjEjjfxmzdService;
@Autowired
private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
+ @Autowired
+ private ISysConfigService configService;
/**
@@ -127,6 +130,8 @@
public int saveProjects(TjOrder tjOrder, TjCustomer tjCustomer, List<TjProject> projects, JSONArray array, ArrayList<SavePacsApply> successPacsList, ArrayList<SavePacsApply> errorPacsList) {
int allTotal = 0;
if (projects != null && !projects.isEmpty()) {
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
for (TjProject project : projects) {
if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
if (null != project.getHisXmbm()) {
@@ -154,11 +159,11 @@
savePacsApply.setCheckPosition("-");
savePacsApply.setAmount(project.getProPrice());
savePacsApply.setApplyDate(DateFormatUtils.format(date, "yyyy-MM-dd HH:mm:ss"));
- savePacsApply.setApplyDepment("0101");
+ savePacsApply.setApplyDepment(dept);
savePacsApply.setApplyDepmentName("浣撴涓績");
- savePacsApply.setApplyDoctor("00029");
+ savePacsApply.setApplyDoctor(ysbm);
savePacsApply.setApplyDoctorName("鐜嬪仴钀�");
- savePacsApply.setExecDepment("0101");
+ savePacsApply.setExecDepment(dept);
savePacsApply.setExecDepmentName("浣撴涓績");
savePacsApply.setCreateTime(savePacsApply.getApplyDate());
// TODO 妫�鏌ヨ澶�
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index cbb0c92..9dc05e7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -1282,6 +1282,9 @@
public AjaxResult tijianbulushenqing(TjCustomer customer, String date,String cardId,String jxbz,ArrayList<TjProject> jianChaProjects,Boolean isTuanTiPiao) {
TjOrder order = orderService.getOrderByCardId(cardId);
if(null !=order){
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
+ String ysmc = configService.selectConfigByKey("request_default_ysmc");
List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(),cardId,jxbz);
Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
@@ -1332,11 +1335,11 @@
OutpintestapplyDto dto = new OutpintestapplyDto();
dto.setHisRegistrationId(cardId);
dto.setSfzh(customer.getCusIdcard());
- dto.setSqysbm("00029");
- dto.setMzksbm("0101");
+ dto.setSqysbm(ysbm);
+ dto.setMzksbm(dept);
dto.setSjrq(date);
- dto.setCzybm("00029");
- dto.setCzyksbm("0101");
+ dto.setCzybm(ysbm);
+ dto.setCzyksbm(dept);
dto.setSfjz("0");
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
@@ -1437,10 +1440,10 @@
OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
outpinexamapplyDto.setHisRegistrationId(cardId);
outpinexamapplyDto.setSfzh(customer.getCusIdcard());
- outpinexamapplyDto.setSqysbm("00029");
- outpinexamapplyDto.setMzksbm("0101");
- outpinexamapplyDto.setCzybm("00029");
- outpinexamapplyDto.setCzyksbm("0101");
+ outpinexamapplyDto.setSqysbm(ysbm);
+ outpinexamapplyDto.setMzksbm(dept);
+ outpinexamapplyDto.setCzybm(ysbm);
+ outpinexamapplyDto.setCzyksbm(dept);
outpinexamapplyDto.setSfjz("0");
// List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
@@ -1539,11 +1542,11 @@
OutpintreatapplyDto dao = new OutpintreatapplyDto();
dao.setHisRegistrationId(cardId);
dao.setSfzh(customer.getCusIdcard());
- dao.setSqysbm("00029");
- dao.setMzksbm("0101");
+ dao.setSqysbm(ysbm);
+ dao.setMzksbm(dept);
dao.setSjrq(date);
- dao.setCzybm("00029");
- dao.setCzyksbm("0101");
+ dao.setCzybm(ysbm);
+ dao.setCzyksbm(dept);
dao.setSfjz("0");
// List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
@@ -1642,11 +1645,11 @@
OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
dto1.setHisRegistrationId(cardId);
dto1.setSfzh(customer.getCusIdcard());
- dto1.setSqysbm("00029");
- dto1.setMzksbm("0101");
+ dto1.setSqysbm(ysbm);
+ dto1.setMzksbm(dept);
dto1.setSjrq(date);
- dto1.setCzybm("00029");
- dto1.setCzyksbm("0101");
+ dto1.setCzybm(ysbm);
+ dto1.setCzyksbm(dept);
dto1.setCflxbm("A");
dto1.setYfbm("1");
dto1.setFyts("1");
@@ -1667,11 +1670,11 @@
cf.setCardId(cardId);
cf.setSfzh(customer.getCusIdcard());
cf.setCfh(cfh);
- cf.setSqysbm("00029");
- cf.setSqysxm("鐜嬪仴钀�");
- cf.setMzksbn("0101");
+ cf.setSqysbm(ysbm);
+ cf.setSqysxm(ysmc);
+ cf.setMzksbn(dept);
cf.setSqrq(date);
- cf.setCzybm("00029");
+ cf.setCzybm(ysbm);
cf.setYpbm(detilsDto.getYpbm());
cf.setYpmc("灏跨礌[14C]鍛兼皵璇曢獙鑽洅");
cf.setSl(String.valueOf(detilsDto.getSl()));
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 75860ff..968a99b 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
@@ -630,6 +630,7 @@
try {
boolean tryLock = lock.tryLock(3L, TimeUnit.SECONDS);
if (tryLock){
+ String doctorId = configService.selectConfigByKey("request_default_check_doctorId");
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
@@ -641,9 +642,9 @@
if ("Y".equals(getInfoFromSqlData)) {
tbhyxm(order);
//鍚屾鍖栭獙椤圭洰
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
//鍚屾妫�鏌ラ」鐩�
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
+ testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
asyncService.updateCheckType(order.getTjNumber());
}
@@ -699,7 +700,7 @@
}
}
//鍚屾鍖栭獙椤圭洰
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
}
/*鍚屾妫�鏌� his鎺ュ彛*/
if (null != jianChaBaoGaoDan && jianChaBaoGaoDan.size() > 0) {
@@ -757,7 +758,7 @@
jcbgdService.save(jcbgd);
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
+ testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
}else {
return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
@@ -766,7 +767,7 @@
return AjaxResult.success("鍚屾鎴愬姛");
}
//鍖栭獙
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
//妫�鏌�
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
return AjaxResult.success("鍚屾鎴愬姛");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index d5e1209..ba19171 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -105,7 +105,7 @@
@ApiOperation(value = "浠庢湰鍦板瓨鍌ㄦā鏉垮埌鏁版嵁搴�")
public AjaxResult savePdf() {
//浠庢枃浠跺湴鍧�璇诲叆PDF鏂囦欢 浠呭瓨鍌ㄤ竴娆�
- String base64String = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\浣撴妯℃澘5.pdf");
+ String base64String = PDFBinaryUtil.getPDFBinary(configService.selectConfigByKey("default_pdf5Template"));
TjReportTemplate tem = new TjReportTemplate();
tem.setName("浣撴鎶ュ憡妯℃澘5");
tem.setRemark("浣撴鎶ュ憡妯℃澘5");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index a2db689..8de1d8d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -103,7 +103,7 @@
@ApiOperation(value = "瀵煎嚭excel琛ㄦā鏉�")
public void importTemplate(HttpServletResponse response) {
//鍘熸潵鐨勪笅杞芥ā鏉胯皟鐢ㄦ帴鍙�
- String base64String = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\瑗垮畨璺嘲鏈虹數绉戞妧鏈夐檺鍏徃.xls");
+ String base64String = PDFBinaryUtil.getPDFBinary(configService.selectConfigByKey("default_excelTemplate"));
if(null !=base64String){
PDFBinaryUtil.base64StringToPDF(base64String, FileUtil.mkdir(value).getPath() + "\\" + "鍥綋棰勭害Excel妯＄増.xls");
String filePath = value + "\\" + "鍥綋棰勭害Excel妯＄増.xls";
diff --git a/ltkj-common/src/main/java/com/ltkj/common/utils/pdfutils/PdfUtils.java b/ltkj-common/src/main/java/com/ltkj/common/utils/pdfutils/PdfUtils.java
index 6672861..98c2a5e 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/utils/pdfutils/PdfUtils.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/utils/pdfutils/PdfUtils.java
@@ -6,6 +6,7 @@
import com.itextpdf.text.pdf.PdfPTable;
import javax.servlet.http.HttpServletResponse;
+import java.io.File;
import java.io.IOException;
import java.net.URLEncoder;
@@ -19,7 +20,7 @@
/**
* 瀛椾綋瀛樻斁鐨勮窡璺緞锛岄粯璁や负'C:\Windows\Fonts\'
*/
- private static final String FONT_PATH = "C:\\Windows\\Fonts\\";
+ private static final String FONT_PATH = System.getProperty("user.dir") + File.separator + "ltkj-admin"+File.separator+"src"+File.separator+"main"+File.separator+"resources"+File.separator+"Font"+File.separator;
/**
* 绾稿紶澶у皬
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
index 528d16a..9a9198b 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
@@ -21,7 +21,7 @@
"/cus/package/getPackageList",
"/cus/package/projectListByPacId/**",
"/cus/hospital/getHospList",
- "/lis/**"
+ "/lis/**","/api/His/**"
});
}
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
index 5d45f06..3465685 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -207,4 +207,20 @@
public List<Map<String,Object>> getTjYxjcList(@Param("patname")String patname,
@Param("sex")String sex,
@Param("nn")String nn);
+
+ @DataSource(value = DataSourceType.SLAVE_PACS)
+ @Select({"<script>" +
+ "select * from V_JCBGLBHIS where mzh is not null " +
+ "<when test='name != null'>" +
+ "and name = #{name}" +
+ "</when>" +
+ "<when test='mzh != null'>" +
+ "and mzh = #{mzh}" +
+ "</when>" +
+ "<when test='start != null and end != null'>" +
+ "and examinationDate between #{start} and #{end}" +
+ "</when>" +
+ "order by examinationDate" +
+ "</script>"})
+ List<Map<String ,Object>> getPacsJcList(@Param("name")String name,@Param("mzh")String mzh,@Param("start")String start,@Param("end")String end);
}
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 8faeaf1..ee4452c 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
@@ -110,6 +110,7 @@
@Select({"<script>" +
"SELECT\n" +
+ " pro.pro_id,\n" +
" dep.dept_name,\n" +
" pro.pro_name,\n" +
" re.type,\n" +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java
index a56498d..9278fbe 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java
@@ -21,4 +21,5 @@
private String bw;
private String jgzt;
private String jgbx;
+ private String jgsj;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java
index 3456ea1..2826b47 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java
@@ -20,6 +20,9 @@
@Data
public class CsProVo {
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("椤圭洰id")
+ private Long proId;
@ApiModelProperty("閮ㄩ棬")
private String deptName;
--
Gitblit v1.8.0