From 18e5f7bfe225b284dfc62033ef7963ead120a19f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 18 三月 2025 17:43:11 +0800
Subject: [PATCH] 修改泾川手动检验检查

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

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 fef5a9f..1575abc 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
@@ -217,22 +217,36 @@
                                                   @Param("nn")String nn);
 
     @DataSource(value = DataSourceType.SLAVE_PACS)
-    @Select({"<script>" +
-                "select * from V_JCBGLBHIS where mzh is not null " +
-                "and (mzh = #{mzh} or name = #{name} )" +
-                "order by examinationDate" +
+//    @Select({"<script>" +
+//                "select * from V_JCBGLBHIS where mzh is not null " +
+//                "and (mzh = #{mzh} or name = #{name} )" +
+//                "order by examinationDate" +
+//            "</script>"})
+    @Select({"<script>",
+            "SELECT * FROM V_JCBGLBHIS ",
+            "WHERE name = #{name} ",
+            "<if test='mzh != null and mzh != \"\"'>",
+            "   OR mzh = #{mzh} ",
+            "</if>",
+            "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);
+    List<Map<String, Object>> getPacsJcList(@Param("name") String name, @Param("mzh") String mzh, @Param("start") String start, @Param("end") String end);
+
 
     @DataSource(value = DataSourceType.SLAVE_HIS)
-    @Select({"<script>" +
-            "select * from V_JYBGHIS where mzh is not null " +
-            "and (mzh = #{mzh} or name = #{name} )" +
-            "order by examinationDate" +
+//    @Select({"<script>" +
+//            "select * from V_JYBGHIS where mzh is not null " +
+//            "and (mzh = #{mzh} or name = #{name} )" +
+//            "order by examinationDate" +
+//            "</script>"})
+    @Select({"<script>",
+            "select * from V_JYBGHIS where name = #{name}",
+            "<if test='mzh != null and mzh != \"\"'>",
+            "   OR mzh = #{mzh} ",
+            "</if>",
+            "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);
-
-
 
     @DataSource(value = DataSourceType.SLAVE_LIS)
     @Select("select t.* from vi_his_patientresult t \n" +

--
Gitblit v1.8.0