From 7b93b49469e5dab9ac01dc154b2e3572e9acfb43 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:13:02 +0800
Subject: [PATCH] zjh20250519
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java | 7 ++
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 45 ++++++++++++++
ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml | 56 ++++++------------
ltkj-admin/src/main/java/com/ltkj/web/controller/dto/PutAskMedicalHistoryDto.java | 6 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 59 +++++++++++++++++++
6 files changed, 136 insertions(+), 41 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
index 02ab055..f3fdf6d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -95,7 +95,7 @@
private void exec() {
String dsqkssj = configService.selectConfigByKey("dsqkssj");
String dsqjssj = configService.selectConfigByKey("dsqjssj");
- String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
+// String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm");
boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
log.info("瀹氭椂鍣ㄨ嚜鍔ㄥ悓姝ユ楠屾鏌ョ粨鏋�");
@@ -155,7 +155,7 @@
&& !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
TjJcycxm jcycxm=new TjJcycxm();
jcycxm.setTjh(s);
- jcycxm.setYqid(yqbm);
+ jcycxm.setYqid(dqyyyqbm);
String[] split1 = jcsqd.getJcxmid().split(";");
jcycxm.setProId(split1[0]);
jcycxm.setProName(jcsqd.getJcxmmc());
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 207d85a..2aa683c 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
@@ -259,6 +259,12 @@
@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 7864f34..19e1285 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
@@ -4,6 +4,7 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.date.DateTime;
@@ -316,6 +317,48 @@
}
+ @GetMapping ("/chaxunjyjcwsxmjg")
+ @ApiOperation(value = "鏌ヨ妫�楠屾鏌ラ」鐩粨鏋滄帴鍙�")
+ public AjaxResult chaxunjyjcwsxmjg(@RequestParam @ApiParam(value = "jy妫�楠� jc妫�鏌� jyjc妫�楠屽拰妫�鏌�") String tblx,
+ @ApiParam(value = "浣撴鍙�")@RequestParam String tjh) {
+ String hospId = configService.selectConfigByKey("dqyyyqbm");
+ 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")//鎵ц
@@ -370,7 +413,7 @@
// @PreAuthorize("@ss.hasPermi('system:config:tbhisproprice')")
@ApiOperation (value = "tjjcycxm")
public AjaxResult tjjcycxm(@RequestParam(required = false)@ApiParam(value = "浣撴鍙�") String tjh) {
- String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
+ String yqbm = configService.selectConfigByKey("dqyyyqbm");
if(StringUtil.isNotBlank(tjh)){
zongjianshengchengyichangxiangmu(tjh, yqbm);
return AjaxResult.success();
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 37d3346..ba75448 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
@@ -255,6 +255,13 @@
@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 0c626e7..dba1e62 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
@@ -455,4 +455,63 @@
@Select("select * from v_gnkssctp where gnlx=#{gnlx}")
List<Map<String ,Object>> getExeUploadImgListByGnLx(@Param("gnlx") String gnlx);
+
+ @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" +
+ " 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_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);
+
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
index 2a18dab..de1c800 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
@@ -70,42 +70,10 @@
<sql id="selectTjAskMedicalHistoryVo">
select ask_id,
cus_id,
- cus_name,
- work,
- work_status,
- medical_history_ids,
- medical_history,
- medical_history_other,
- chuchao,
- jingqi,
- zhouqi,
- mociage,
- zinv,
- liuchan,
- zaochan,
- sichan,
- yichangtai,
- xiyan,
- xiyanpinlv,
- xiyanyear,
- yinjiu,
- yinjiupinlv,
- yinjiuyear,
- qita,
- remark,
- create_by,
- create_time,
- update_by,
- update_time,
- deleted,
- from_by,
- zzsjj,
- contact_poison,
- gong_zhong,
- gong_ling,
- jhgl,
- dwmc,
- ygdw
+ cus_name, work, work_status, medical_history_ids, medical_history, medical_history_other, chuchao,
+ jingqi, zhouqi, mociage, zinv, liuchan, zaochan, sichan, yichangtai, xiyan, xiyanpinlv, xiyanyear, yinjiu, yinjiupinlv,
+ yinjiuyear, qita, remark, create_by, create_time, update_by, update_time, deleted, from_by, zzsjj, contact_poison,
+ gong_zhong, gong_ling, jhgl, dwmc, ygdw, tjwhys, jcwhys,yjsfyc
from tj_ask_medical_history
</sql>
@@ -176,8 +144,8 @@
sub_update_time,
b.deleted as
sub_deleted,
- a.dwmc,
- a.ygdw
+ a.dwmc,
+ a.ygdw
from tj_ask_medical_history a
left join tj_ask_historys b on b.ask_id = a.ask_id
where a.ask_id = #{askId}
@@ -251,6 +219,12 @@
</if>
<if test="ygdw != null">ygdw,
</if>
+ <if test="tjwhys != null">tjwhys,
+ </if>
+ <if test="jcwhys != null">jcwhys,
+ </if>
+ <if test="yjsfyc != null">yjsfyc,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="cusId != null">#{cusId},
@@ -317,6 +291,12 @@
</if>
<if test="ygdw != null">#{ygdw},
</if>
+ <if test="ygdw != null">#{tjwhys},
+ </if>
+ <if test="ygdw != null">#{jcwhys},
+ </if>
+ <if test="ygdw != null">#{yjsfyc},
+ </if>
</trim>
</insert>
--
Gitblit v1.8.0