提交

src/main/java/com/diagbot/service/impl/DoctorAdviceServiceImpl.java

@@ -41,7 +41,7 @@ public class DoctorAdviceServiceImpl extends ServiceImpl<DoctorAdviceMapper, Doc
         Set<String> infoSet = new HashSet<>();
 
         for (String s : infos) {
-            if (s.contains("医嘱")) {
+            if (s.contains("医嘱:")) {
                 String[] split = s.split("、");
                 for (String info : split) {
                     String[] targetInfos = info.split(":");

src/main/java/com/diagbot/service/impl/MedLisInfoServiceImpl.java

@@ -41,7 +41,7 @@ public class MedLisInfoServiceImpl extends ServiceImpl<MedLisInfoMapper, MedLisI
 
         Set<String> infoSet = new HashSet<>();
         for (String s : infos) {
-            if (s.contains("检验")) {
+            if (s.contains("检验:")) {
                 String[] split = s.split("、");
                 for (String info : split) {
                     String[] targetInfos = info.split(":");

src/main/java/com/diagbot/service/impl/MedPacsInfoServiceImpl.java

@@ -1,15 +1,12 @@
 package com.diagbot.service.impl;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.CheckInfoDTO;
-import com.diagbot.dto.DoctorAdviceDTO;
 import com.diagbot.entity.MedPacsInfo;
 import com.diagbot.mapper.MedPacsInfoMapper;
 import com.diagbot.service.MedPacsInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.CheckInfoVO;
 import org.springframework.stereotype.Service;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -32,14 +29,15 @@ public class MedPacsInfoServiceImpl extends ServiceImpl<MedPacsInfoMapper, MedPa
 
         Set<String> infoSet = new HashSet<>();
         for (String s : infos) {
-            if (s.contains("检查")) {
+            if (s.contains("检查:")) {
                 String[] split = s.split("、");
                 for (String info : split) {
                     String[] targetInfos = info.split(":");
                     for (String targetInfo : targetInfos) {
                         if (!targetInfo.contains("检查")) {
                             String[] target = targetInfo.split(",");
-                            infoSet.add(target[0] + ")");
+                           // infoSet.add(target[0] + ")");
+                            infoSet.add(target[0]);
                         }
 
                     }
@@ -48,6 +46,8 @@ public class MedPacsInfoServiceImpl extends ServiceImpl<MedPacsInfoMapper, MedPa
             }
         }
 
+       String s = checkInfoVO.getBehospitalCode();
+        checkInfoVO.setBehospitalCode( s.split("_")[0]);
         IPage<CheckInfoDTO> page = this.baseMapper.getCheckInfo(checkInfoVO, infoSet);
         return page;
     }

src/main/resources/mapper/MedPacsInfoMapper.xml

@@ -30,11 +30,11 @@
         select b.*
         from(
         SELECT
-        t1.rep_name as checkItemName,
+        t2.rept_name as checkItemName,
         t1.rep_type_name as checkItemType,
-        CONCAT( t1.rep_name, '(',DATE_FORMAT( t1.check_date,'%Y-%m-%d'),')')as info,
-        t1.rep_date as rTime,
-        t1.check_date as cTime,
+        CONCAT( t2.rept_name, '(',DATE_FORMAT( t1.check_date,'%Y-%m-%d'),')')as info,
+        date_format (t1.rep_date,'%Y-%m-%d %H:%i:%s') as rTime,
+        date_format (t1.check_date,'%Y-%m-%d %H:%i:%s') as cTime,
         t1.apply_doctor as doctorName,
         t2.hospital_id as hospitalId,
         t2.behospital_code as behospitalCode,
@@ -62,10 +62,10 @@
             and t1.rep_name like CONCAT('%',#{checkInfoVO.checkItemName},'%')
         </if>
         <if test="checkInfoVO.jxDateStart != null">
-            <![CDATA[ AND t1.check_date >= #{checkInfoVO.jxDateStart}]]>
+            <![CDATA[ AND date_format (t1.check_date,'%Y-%m-%d %H:%i:%s')  >= #{checkInfoVO.jxDateStart}]]>
         </if>
         <if test="checkInfoVO.jxDateEnd != null">
-            <![CDATA[ AND t1.check_date <= #{checkInfoVO.jxDateEnd}]]>
+            <![CDATA[ AND date_format (t1.check_date,'%Y-%m-%d %H:%i:%s')  <= #{checkInfoVO.jxDateEnd}]]>
         </if>) b
         where 1=1
         <if test="checkInfoVO.checkType != null and checkInfoVO.checkType == 1">