From f108728043f84f623a028fcbb60101fdc8648399 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:16:27 +0800
Subject: [PATCH] zjh20250519
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java | 9 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 42 +++++++++++++
ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml | 4 +
ltkj-admin/src/main/java/com/ltkj/web/controller/dto/PutAskMedicalHistoryDto.java | 7 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 88 +++++++++++++++++++++++++---
5 files changed, 137 insertions(+), 13 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/dto/PutAskMedicalHistoryDto.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/dto/PutAskMedicalHistoryDto.java
index fbe8f4a..a6a25b1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/dto/PutAskMedicalHistoryDto.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/dto/PutAskMedicalHistoryDto.java
@@ -257,6 +257,13 @@
@ApiModelProperty(value = "鎺ュ宸ラ緞")
private String jhgl;
+ @ApiModelProperty(value = "浣撴鍗卞鍥犵礌")
+ private String tjwhys;
+
+ @ApiModelProperty(value = "鎺ヨЕ鍗卞鍥犵礌")
+ private String jcwhys;
+
+
/**
* 鍗曚綅鍚嶇О
*/
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index e6a80cb..7e87202 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -337,6 +337,46 @@
}
+ @GetMapping ("/chaxunjyjcwsxmjg")
+ @ApiOperation(value = "鏌ヨ妫�楠屾鏌ラ」鐩粨鏋滄帴鍙�")
+ public AjaxResult chaxunjyjcwsxmjg(@RequestParam @ApiParam(value = "jy妫�楠� jc妫�鏌� jyjc妫�楠屽拰妫�鏌�") String tblx,
+ @ApiParam(value = "浣撴鍙�")@RequestParam String tjh, HttpServletRequest request) {
+ String hospId = request.getHeader("hospId");
+ log.info("鎵嬪姩鏌ヨ妫�楠屾垨妫�鏌ョ粨鏋滃紑濮�->{}{}",hospId,DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
+ try {
+
+ switch (tblx){
+ case "jy":
+ List<Map<String, Object>> hysqdList = testMapper.sysgetCcXZxYyLtkjHysqdByLisVi(tjh,hospId);
+ if (null != hysqdList && !hysqdList.isEmpty()) {
+ for (Map<String, Object> map : hysqdList) {
+ List<Map<String, Object>> hybgdList = testMapper.sysgetCcXZxYyLtkjHybgdByLisVi(map.get("鏉＄爜鍙�").toString());
+ map.put("jybgd",hybgdList);
+ }
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+
+ log.info("褰撳墠鏌ヨ鐨勬槸->{} 缁撴灉","妫�楠�");
+ return AjaxResult.success(hysqdList);
+
+ case "jc":
+ List<Map<String, Object>> jcsqdList = testMapper.sysgetCcXZxYyPacsLtkjExamJcsqd(tjh,hospId);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ log.info("褰撳墠鏌ヨ鐨勬槸->{} 缁撴灉","妫�鏌�");
+ return AjaxResult.success(jcsqdList);
+ default:
+ log.info("娌℃湁鎵惧埌鎵�鍖归厤鐨勫悓姝ョ被鍨�");
+// return AjaxResult.error("娌℃湁鎵惧埌鎵�鍖归厤鐨勫悓姝ョ被鍨�!");
+ }
+ log.info("鎵嬪姩鏌ヨ妫�楠屾垨妫�鏌ョ粨鏋滃紑濮�->{}",DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
+ return AjaxResult.error("娌℃湁鎵惧埌鎵�鍖归厤鐨勫悓姝ョ被鍨�!");
+
+ } catch (Exception e) {
+ log.error(String.valueOf(e));
+ return AjaxResult.error();
+ }
+ }
+
@GetMapping ("/zxsq")//鎵ц
@@ -390,7 +430,7 @@
@GetMapping ("/tjjcycxm")//鍚屾his椤圭洰鍗曚环淇℃伅
@ApiOperation (value = "tjjcycxm")
public AjaxResult tjjcycxm(@ApiParam("浣撴鍙�") @RequestParam(required = false)String tjh) {
- String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
+ String yqbm = configService.selectConfigByKey("dqyyyqbm");
if(StringUtil.isNotBlank(tjh)){
extracted(tjh, yqbm);
}else {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java
index c7960f5..ef1b707 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java
@@ -252,9 +252,18 @@
private String gongZhong;
@ApiModelProperty(value = "宸ラ緞")
private String gongLing;
+
@ApiModelProperty(value = "鎺ュ宸ラ緞")
private String jhgl;
+ @ApiModelProperty(value = "浣撴鍗卞鍥犵礌")
+ private String tjwhys;
+
+ @ApiModelProperty(value = "鎺ヨЕ鍗卞鍥犵礌")
+ private String jcwhys;
+
+
+
/**
* 鏃㈠線鐥呭彶 ids
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 e8d18e9..eaf00bf 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
@@ -302,6 +302,30 @@
+ @DataSource(value = DataSourceType.SLAVE_LIS)
+ @Select("SELECT\n" +
+ " a.GH_PATIENTNO '浣撴鍙�',\n" +
+ " a.SAMPLEID '鏉＄爜鍙�',\n" +
+ " a.SFXMID '椤圭洰ID',\n" +
+ " REPLACE(a.SFXMNAME,'tj_','') '椤圭洰鍚�',\n" +
+ " a.SENDDATE '鐢宠鏃堕棿',\n" +
+ " a.SENDDOCTOR '鐢宠鍖荤敓',\n" +
+ " a.CHECKDATE '鎶ュ憡鏃堕棿',\n" +
+ " a.TXM '鐢宠鍗曞彿',\n" +
+ " a.SENDDOCTOR '鐢宠浜哄鍚�',\n" +
+ " '8001' '鐢宠浜轰唬鐮�',\n" +
+ " a.AUDITDOCTOR '瀹℃牳浜哄鍚�',\n" +
+ " '宸插' '妫�楠屾姤鍛婄粨鏋�'\n" +
+ " \n" +
+ "FROM\n" +
+ " vi_his_patientinfo a\n" +
+ "WHERE a.PATIENTTYPE=3 AND a.GH_PATIENTNO =#{tjNum} AND a.HOSPITALID = #{hosp}")
+ List<Map<String, Object>> sysgetCcXZxYyLtkjHysqdByLisVi(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
+
+
+
+
+
@DataSource(value = DataSourceType.SLAVE_LIS)
@Select("SELECT\n" +
@@ -327,6 +351,28 @@
"WHERE b.PATIENTTYPE=3 AND\n" +
" a.SAMPLEID = #{tmh}")
List<LtkjHybgd> getCcXZxYyLtkjHybgdByLisVi(String tmh);
+
+
+ @DataSource(value = DataSourceType.SLAVE_LIS)
+ @Select("SELECT\n" +
+ " a.SAMPLEID '鏉＄爜鍙�',\n" +
+ " a.ITEMCODE '妫�鏌ラ」鐩甀D',\n" +
+ " a.ITEMNAME '妫�鏌ラ」鐩�',\n" +
+ " a.RESULT '妫�楠岀粨鏋�',\n" +
+ " a.UNIT '缁撴灉鍗曚綅',\n" +
+ " a.RANGEDOWN '鑼冨洿鏈�灏忓��',\n" +
+ " a.RANGEUP '鑼冨洿鏈�澶у��',\n" +
+ " CONCAT(a.RANGEDOWN,'-',a.RANGEUP) '鑼冨洿鍊�',\n" +
+ " b.CHECKDATE '妫�楠屾椂闂�',\n" +
+ " b.CHECKER '妫�楠屽尰鐢�',\n" +
+ " b.AUDITDATE '瀹℃牳鏃堕棿',\n" +
+ " b.AUDITDOCTOR '瀹℃牳鍖荤敓',\n" +
+ " a.JUDGE '寮傚父鏍囧織'\n" +
+ "FROM\n" +
+ " vi_his_patientresult a JOIN vi_his_patientinfo b ON b.SAMPLEID=a.SAMPLEID\n" +
+ "WHERE b.PATIENTTYPE=3 AND\n" +
+ " a.SAMPLEID = #{tmh}")
+ List<Map<String, Object>> sysgetCcXZxYyLtkjHybgdByLisVi(String tmh);
// @DataSource(value = DataSourceType.SLAVE_WS)
@@ -407,22 +453,42 @@
@DataSource(value = DataSourceType.SLAVE_PACS)
@Select(" SELECT\n" +
+ " trim(a.HIS_ID) 浣撴鍙�,\n" +
+ " trim(a.HIS_ID) 鏉＄爜鍙�,\n" +
+ " trim(a.JCMID) 椤圭洰浠ｇ爜,\n" +
+ " a.JCMC 椤圭洰鍚嶇О,\n" +
+ " TRIM(a.JCSJ) 鎶ュ憡鍐呭,\n" +
+ " a.SHYS 瀹℃牳鍖荤敓浠ｇ爜,\n" +
+ " a.SHYS 瀹℃牳鍖荤敓濮撳悕,\n" +
+ " TRIM(a.JCJL) 寮傚父琛ㄧ幇,\n" +
+ " a.BGSJ 璇婃柇鏃堕棿,\n" +
+ " a.SQRJ 鐢宠鏃堕棿,\n" +
+ " a.JCBW 妫�鏌ラ儴浣峔n" +
+ "FROM\n" +
+ "V_TJ_JCBGXX_NEWTJ a WHERE a.HIS_ID=#{tjNum} AND a.HOSTPITALID = #{hosp}")
+ List<Map<String, Object>> sysgetCcXZxYyPacsLtkjExamJcsqd(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
+
+
+
+ @DataSource(value = DataSourceType.SLAVE_PACS)
+ @Select("SELECT\n" +
" trim(a.HIS_ID) tjh,\n" +
" trim(a.HIS_ID) tmh,\n" +
- " trim(a.JCMID) xmdm,\n" +
- " a.JCMC xmmc,\n" +
- " NULL bg_mig,\n" +
- " NULL bg_url,\n" +
- " TRIM(a.JCSJ) bg_nr,\n" +
- " a.SHYS shysdm,\n" +
- " a.SHYS shysxm,\n" +
- " TRIM(a.JCJL) yxbx,\n" +
- " a.BGSJ zdsj,\n" +
+ " a.JCLX jclx,\n" +
+ " NULL jczlx,\n" +
+ " a.BGYS bgys,\n" +
+ " NULL bgysid,\n" +
" a.SQRJ sqsj,\n" +
- " a.JCBW jcbw,\n" +
+ " a.BGSJ jgsj,\n" +
+ " REPLACE(a.JCMC,'tj_','') jcxmmc,\n" +
+ " trim(a.JCMID) jcxmid,\n" +
+ " a.JCBW bw,\n" +
+ " TRIM(a.JCJL) jgzt,\n" +
+ " TRIM(a.JCSJ) jgbx,\n" +
" SYSDATE create_time\n" +
+ " \n" +
"FROM\n" +
- " ris.V_TJ_JCBGXX_NEWTJ a WHERE a.HIS_ID=#{tjNum} AND a.HOSTPITALID = #{hosp}")
+ " ris.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID = #{hosp}")
List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
index 837b1dd..dfbbb14 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
@@ -104,7 +104,9 @@
gong_ling,
jhgl,
dwmc,
- ygdw
+ ygdw,
+ tjwhys,
+ jcwhys,yjsfyc
from tj_ask_medical_history
</sql>
--
Gitblit v1.8.0