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); 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);