检查信息模糊搜索代码修改

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -1301,8 +1301,7 @@ public class ConsoleFacade {
 
 
 public List<MedicalCheckExportDTO> medicalCheckExport(@Param("filterVO") FilterMedicalCheckVO filterVO) {
-    //filterFacade.getMedicalCheckVOSet(filterVO);
-    filterVO.setHospitalId("2");
+    filterFacade.getMedicalCheckVOSet(filterVO);
     //colums
     QueryWrapper<SysHospitalSet> hospitalSetQueryWrapper = new QueryWrapper<>();
     hospitalSetQueryWrapper.eq("is_deleted", 'N')
@@ -1449,8 +1448,7 @@ public List<MedicalCheckExportDTO> medicalCheckExport(@Param("filterVO") FilterM
      * @return
      */
     public IPage<MedicalCheckDTO> getMedicalCheck(@Param("filterVO") FilterMedicalCheckVO filterVO) {
-        //filterFacade.getMedicalCheckVOSet(filterVO);
-        filterVO.setHospitalId("2");
+        filterFacade.getMedicalCheckVOSet(filterVO);
         //colums
         QueryWrapper<SysHospitalSet> hospitalSetQueryWrapper = new QueryWrapper<>();
         hospitalSetQueryWrapper.eq("is_deleted", 'N')
@@ -1571,8 +1569,7 @@ public List<MedicalCheckExportDTO> medicalCheckExport(@Param("filterVO") FilterM
      */
     public List<ColumnDTO> getMedicalCheckTitle() {
         //运行病历稽查入参拼接
-        // String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String hospitalId = "2";
+         String hospitalId = SysUserUtils.getCurrentHospitalID();
         //colums
         QueryWrapper<SysHospitalSet> hospitalSetQueryWrapper = new QueryWrapper<>();
         hospitalSetQueryWrapper.eq("is_deleted", 'N')

src/main/java/com/diagbot/facade/DoctorAdviceFacade.java

@@ -28,8 +28,7 @@ public class DoctorAdviceFacade extends DoctorAdviceServiceImpl {
      * @return 医嘱翻页信息
      */
     public IPage<DoctorAdviceDTO> getPageFac(DoctorAdviceVO doctorAdviceVO) {
-        doctorAdviceVO.setHospitalId(2l);
-        //doctorAdviceVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+        doctorAdviceVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
         if (null != doctorAdviceVO.getDaStartDateStart()) {
             doctorAdviceVO.setDaStartDateStart(DateUtil.getFirstTimeOfDay(doctorAdviceVO.getDaStartDateStart()));
         }

src/main/java/com/diagbot/facade/MedLisInfoFacade.java

@@ -35,8 +35,7 @@ public class MedLisInfoFacade extends MedLisInfoServiceImpl {
      */
 
     public IPage<ExamineInfoDTO> getExaminePage(ExamineInfoVO examineInfoVO) {
-        //examineInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
-        examineInfoVO.setHospitalId(2l);
+        examineInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
         if (null != examineInfoVO.getJyDateStart()) {
             examineInfoVO.setJyDateStart(DateUtil.getFirstTimeOfDay(examineInfoVO.getJyDateStart()));
           }
@@ -58,8 +57,7 @@ public class MedLisInfoFacade extends MedLisInfoServiceImpl {
      */
 
     public IPage<ExamineSonInfoDTO> getExamineSonPage(ExamineSonInfoVO examineSonInfoVO)  {
-//        examineSonInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
-        examineSonInfoVO.setHospitalId(2l);
+       examineSonInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
         return this.getExamineSonInfo(examineSonInfoVO);
     }
 

src/main/java/com/diagbot/facade/MedPacsInfoFacade.java

@@ -24,8 +24,7 @@ public class MedPacsInfoFacade extends MedPacsInfoServiceImpl {
      * @return 检查翻页信息
      */
     public IPage<CheckInfoDTO> getCheckPage(CheckInfoVO checkInfoVO) {
-        //checkInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
-        checkInfoVO.setHospitalId(2l);
+        checkInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
         if (null != checkInfoVO.getJxDateStart()) {
             checkInfoVO.setJxDateStart(DateUtil.getFirstTimeOfDay(checkInfoVO.getJxDateStart()));
         }

src/main/resources/mapper/MedLisInfoMapper.xml

@@ -23,8 +23,24 @@
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
     </resultMap>
+
+
+    <resultMap id="ExamineInfoMap" type="com.diagbot.dto.ExamineInfoDTO">
+        <result column="repNo" property="repNo"/>
+        <result column="examineItemName" property="examineItemName"/>
+        <result column="examineItemType" property="examineItemType"/>
+        <result column="rTime" property="rTime"/>
+        <result column="cTime" property="cTime"/>
+        <result column="doctorName" property="doctorName"/>
+        <result column="hospitalId" property="hospitalId"/>
+        <result column="behospitalCode" property="behospitalCode"/>
+        <collection property="info"
+                    ofType="java.lang.String">
+            <result column="info" property="info"/>
+        </collection>
+    </resultMap>
 <!--获取检验信息-->
-    <select id="getExamineInfo"  resultType="com.diagbot.dto.ExamineInfoDTO">
+    <select id="getExamineInfo"  resultMap="ExamineInfoMap">
         select b.*
         from(
         SELECT

src/main/resources/mapper/MedPacsInfoMapper.xml

@@ -60,7 +60,7 @@
             and t1.rep_type_name like CONCAT('%',#{checkInfoVO.checkItemType},'%')
         </if>
         <if test="checkInfoVO.checkItemName != null and checkInfoVO.checkItemName != ''">
-            and t1.rep_name like CONCAT('%',#{checkInfoVO.checkItemName},'%')
+            and t2.rept_name like CONCAT('%',#{checkInfoVO.checkItemName},'%')
         </if>
         <if test="checkInfoVO.jxDateStart != null">
             <![CDATA[ AND date_format (t1.check_date,'%Y-%m-%d %H:%i:%s')  >= #{checkInfoVO.jxDateStart}]]>