From 521f57c6b50ac3075602526193031d8cab4248b7 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 14 三月 2025 18:15:04 +0800
Subject: [PATCH] 修改手动同步问题
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 15 ++++++++++++++-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 4 ++--
2 files changed, 16 insertions(+), 3 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 719cc7e..16601de 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
@@ -239,7 +239,20 @@
LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(LtkjJianchajianyanTree::getCardId, order.getCardId());
- String xmdm = projectService.getById(tj.getStr("proId")).getHisXmbm();
+ TjProject project = projectService.getById(tj.getStr("proId"));
+ String xmdm = project.getHisXmbm();
+ if (project.getSfzhfy().equals("N")){
+ LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjProject::getProParentId,project.getProId());
+ List<TjProject> list = projectService.list(wrapper);
+ for (TjProject tjProject : list) {
+ if (StrUtil.isNotBlank(tjProject.getHisXmbm())){
+ xmdm = tjProject.getHisXmbm();
+ break;
+ }
+ }
+ }
+
queryWrapper.eq(LtkjJianchajianyanTree::getType,"妫�鏌�");
queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm,xmdm);
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 a6846ab..fef5a9f 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
@@ -219,7 +219,7 @@
@DataSource(value = DataSourceType.SLAVE_PACS)
@Select({"<script>" +
"select * from V_JCBGLBHIS where mzh is not null " +
- "and (mzh = #{mzh} or name like '%' + #{name} + '%' )" +
+ "and (mzh = #{mzh} or name = #{name} )" +
"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);
@@ -227,7 +227,7 @@
@DataSource(value = DataSourceType.SLAVE_HIS)
@Select({"<script>" +
"select * from V_JYBGHIS where mzh is not null " +
- "and (mzh = #{mzh} or name like '%' + #{name} + '%' )" +
+ "and (mzh = #{mzh} or name = #{name} )" +
"order by examinationDate" +
"</script>"})
List<Map<String ,Object>> getLisJyList(@Param("name")String name,@Param("mzh")String mzh,@Param("start")String start,@Param("end")String end);
--
Gitblit v1.8.0