From c4f1fcc51989a014f9737689c123b3266f13ccda Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 20 二月 2024 18:07:44 +0800
Subject: [PATCH] zjh 2024/02/20--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 30 +++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 15 +++++++
ltkj-hosp/src/main/java/com/ltkj/mall/mapper/MallKeywordMapper.java | 4 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java | 41 --------------------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 23 +++++++++++
5 files changed, 70 insertions(+), 43 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
index bc74ee9..793c2d9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -406,4 +406,19 @@
// }
return AjaxResult.success("鍚屾鎴愬姛");
}
+
+
+
+ @GetMapping("/getTjYxjcList")
+ @ApiOperation(value = "鏌ヨ褰卞搷妫�鏌ラ」鐩�")
+ public AjaxResult getTjYxjcList() {
+ List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList("鏉ㄤ簯浜�",null,null,null);
+ return AjaxResult.success(tjYxjcList);
+ }
+
+
+
+
+
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index e00a6a5..eff536a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -17,6 +17,7 @@
import com.ltkj.common.utils.bean.BeanUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.system.domain.SysPost;
import com.ltkj.system.domain.SysUserPost;
@@ -98,6 +99,8 @@
private ITjRulesService tjRulesService;
@Autowired
public RedisTemplate<Object,Object> redisTemplate;
+ @Resource
+ private TestMapper testMapper;
/**
@@ -834,6 +837,33 @@
}
+ @GetMapping("/getTjYxjcList")
+ @ApiOperation("鏌ヨ涓汉褰卞搷妫�鏌ラ」鐩粨鏋滈泦")
+ public AjaxResult getTjYxjcList(@ApiParam(value = "濮撳悕") @RequestParam String patname,
+ @ApiParam(value = "鎬у埆") @RequestParam String sex,
+ @ApiParam(value = "骞撮緞") @RequestParam String patage,
+ @ApiParam(value = "骞撮緞鍗曚綅") @RequestParam String patagename,
+ @ApiParam(value = "鐢熸棩)") @RequestParam Date patbirth) {
+
+ String format = DateUtil.format(patbirth, "yyyy.MM.dd");
+
+ List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,patage+patagename,format);
+ return AjaxResult.success(tjYxjcList);
+ }
+
+
+// @GetMapping("/getSsTjYxjcList")
+// @ApiOperation("鏌ヨ涓汉褰卞搷妫�鏌ラ」鐩粨鏋滈泦(鎼滅礌鐢�)")
+// public AjaxResult getSsTjYxjcList(@ApiParam(value = "濮撳悕") @RequestParam String patname,
+// @ApiParam(value = "鎬у埆") @RequestParam String sex,
+// @ApiParam(value = "骞撮緞") @RequestParam String patage) {
+//
+//
+// List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,null,null);
+// return AjaxResult.success(tjYxjcList);
+// }
+
+
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
index 22e4080..8fec6a9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
@@ -77,51 +77,10 @@
List<TjPackage> list = tjPackageService.selectTjPackageList(tjPackage);
if (null != list && list.size() > 0) {
for (TjPackage aPackage : list) {
-// StringBuilder allProName = new StringBuilder();
-// StringBuilder allSonName = new StringBuilder();
-//
-// List<TjProject> tjProjectList = new ArrayList<>();
-// List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
-// if (null != pplist) {
-// for (TjPackageProject packageProject : pplist) {
-// StringBuilder allSonProName = new StringBuilder(); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
-// TjProject tjProject = tjProjectService.getById(packageProject.getProId());
-// if (null != tjProject) {
-// allProName.append(tjProject.getProName()).append("锛�");
-// List<TjProject> listBySoneId = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
-//// for (TjProject project : listBySoneId) {
-//// allSonProName.append(project.getProName()).append(";"); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
-//// allSonName.append(project.getProName()).append(";");
-//// }
-// tjProject.setAllSonProName(allSonProName.toString()); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
-// tjProjectList.add(tjProject);
-// //鐜颁环璧嬪�煎垽鏂璶ull璧嬪師浠� 2023.2.8
-// if (packageProject.getPriceNow() != null) {
-// tjProject.setPriceNow(packageProject.getPriceNow());
-// } else {
-// tjProject.setPriceNow(tjProject.getProPrice());
-// }
-//
-// }
-// }
-// }
-// aPackage.setTjProjectList(tjProjectList);
aPackage.setAllProName(tjPackageService.getTjPacProNames(String.valueOf(aPackage.getPacId())));
-// aPackage.setAllSonName(allSonName.toString());
-
-// StringBuffer a = new StringBuffer();
-// List<String> b = new ArrayList<>();
final String keywords = aPackage.getKeywords();
if (keywords != null) {
final String[] strings = keywords.split(",");
-// for (String string : strings) {
-// final MallKeyword byId = mallKeywordService.getById(string);
-// if (byId != null) {
-// a.append(byId.getKeyword());
-// a.append(";");
-// b.add((byId.getId()).toString());
-// }
-// }
aPackage.setKeyNames(mallKeywordService.getKeyNames(strings));
aPackage.setKeyIds(mallKeywordService.getKeyIds(strings));
}
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 f63179e..bf2e759 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
@@ -187,4 +187,27 @@
@Select("SELECT * FROM histjv_ltkj_userinfo")
@DataSource(value = DataSourceType.SLAVE_HIS)
public List<LtkjHisUser> getLtkjHisUser();
+
+
+ @DataSource(value = DataSourceType.SLAVE_PACS)
+ @Select({"<script> select bgid xh,patname pacName ,rptid pacCode,patage+patagename+'['+sex+']'+patbirth detail,djrq+jcxm pacRemark,lxhd price \n" +
+ "\tfrom V_HIS_PACS_SQ\n" +
+ "\twhere 1=1 " +
+ " <when test='patname!=null'>" +
+ " AND patname=#{patname}" +
+ "</when>"+
+ " <when test='sex!=null'>" +
+ " AND sex=#{sex} "+
+ "</when>"+
+ " <when test='nn!=null'>" +
+ " AND patage+patagename=#{nn}" +
+ "</when>"+
+ " <when test='sr!=null'>" +
+ " AND patbirth=#{sr}" +
+ "</when>"+
+ "</script>"})
+ public List<Map<String,Object>> getTjYxjcList(@Param("patname")String patname,
+ @Param("sex")String sex,
+ @Param("nn")String nn,
+ @Param("sr")String sr);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/mall/mapper/MallKeywordMapper.java b/ltkj-hosp/src/main/java/com/ltkj/mall/mapper/MallKeywordMapper.java
index bcbfa6f..9294d12 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/mall/mapper/MallKeywordMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/mall/mapper/MallKeywordMapper.java
@@ -66,14 +66,14 @@
public int deleteMallKeywordByIds(Long[] ids);
- @Select({"<script>"," SELECT * FROM mall_keyword a WHERE a.id IN", "<foreach collection='ids' item='id' open='(' separator=',' close=')'>",
+ @Select({"<script>"," SELECT GROUP_CONCAT(a.keyword ORDER BY a.keyword) AS names FROM mall_keyword a WHERE a.id IN", "<foreach collection='ids' item='id' open='(' separator=',' close=')'>",
"#{id}",
"</foreach>",
"</script>" })
String getKeyNames(@Param("ids")String[] ids);
- @Select({"<script>"," SELECT GROUP_CONCAT(a.keyword ORDER BY a.keyword) AS names FROM mall_keyword a WHERE a.id IN ", "<foreach collection='ids'" +
+ @Select({"<script>"," SELECT a.id FROM mall_keyword a WHERE a.id IN ", "<foreach collection='ids'" +
" item='id' open='(' separator=',' close=')'>",
"#{id}",
"</foreach>",
--
Gitblit v1.8.0