检验分页bug处理

src/main/java/com/diagbot/mapper/MedLisInfoMapper.java

@@ -24,7 +24,7 @@ import java.util.Set;
  * @since 2020-07-28
  */
 public interface MedLisInfoMapper extends BaseMapper<MedLisInfo> {
-    Map<String, Object> getTime(@Param("examineInfoVO") ExamineInfoVO examineInfoVO);
+    Map<String, Object> getTime(@Param("behospitalCode") String behospitalCode);
 
     IPage<ExamineInfoDTO> getExamineInfo(@Param("examineInfoVO") ExamineInfoVO examineInfoVO, @Param("infos") Set<String> infos);
 

src/main/java/com/diagbot/mapper/MedPacsInfoMapper.java

@@ -24,7 +24,7 @@ import java.util.Set;
  */
 public interface MedPacsInfoMapper extends BaseMapper<MedPacsInfo> {
 
-    Map<String,Object> getTime(@Param("checkInfoVO") CheckInfoVO checkInfoVO);
+    Map<String,Object> getTime(@Param("behospitalCode") String behospitalCode);
 
     IPage<CheckInfoDTO> getCheckInfo(@Param("checkInfoVO") CheckInfoVO checkInfoVO, @Param("infos") Set<String> infos);
 

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

@@ -39,10 +39,10 @@ public class DoctorAdviceServiceImpl extends ServiceImpl<DoctorAdviceMapper, Doc
         List<String> infos = this.baseMapper.getInfo(doctorAdviceVO.getHospitalId(), doctorAdviceVO.getBehospitalCode());
         Set<String> infoSet = new HashSet<>();
         for (String s : infos) {
-            if (s.contains("医嘱:")) {
-                String[] split = s.split(".");
+            if (s.contains("医嘱：")) {
+                String[] split = s.split("_");
                 for (String info : split) {
-                    String[] targetInfos = info.split(":");
+                    String[] targetInfos = info.split("：");
                     for (String target : targetInfos) {
                         if (!"医嘱".equals(target)) {
                             infoSet.add(target);

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

@@ -38,10 +38,10 @@ public class MedLisInfoServiceImpl extends ServiceImpl<MedLisInfoMapper, MedLisI
 
         Set<String> infoSet = new HashSet<>();
         for (String s : infos) {
-            if (s.contains("化验:")) {
-                String[] split = s.split(".");
+            if (s.contains("化验：")) {
+                String[] split = s.split("_");
                 for (String info : split) {
-                    String[] targetInfos = info.split(":");
+                    String[] targetInfos = info.split("：");
                     for (String targetInfo : targetInfos) {
                         if (!"化验".equals(targetInfo)) {
                             infoSet.add(targetInfo);
@@ -52,7 +52,7 @@ public class MedLisInfoServiceImpl extends ServiceImpl<MedLisInfoMapper, MedLisI
         }
 
         //获取病人进出院时间
-        Map<String, Object> timeMap = this.baseMapper.getTime(examineInfoVO);
+        Map<String, Object> timeMap = this.baseMapper.getTime(examineInfoVO.getBehospitalCode());
         if (null != timeMap) {
             Date behospital_date = (Date) timeMap.get("behospital_date");
             examineInfoVO.setBehospitalDate(behospital_date);

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

@@ -30,10 +30,10 @@ public class MedPacsInfoServiceImpl extends ServiceImpl<MedPacsInfoMapper, MedPa
 
         Set<String> infoSet = new HashSet<>();
         for (String s : infos) {
-            if (s.contains("检查:")) {
-                String[] split = s.split(".");
+            if (s.contains("检查：")) {
+                String[] split = s.split("_");
                 for (String info : split) {
-                    String[] targetInfos = info.split(":");
+                    String[] targetInfos = info.split("：");
                     for (String targetInfo : targetInfos) {
                         if (!"检查".equals(targetInfo)) {
                             infoSet.add(targetInfo);
@@ -46,7 +46,7 @@ public class MedPacsInfoServiceImpl extends ServiceImpl<MedPacsInfoMapper, MedPa
         }
 
         //获取病人进出院时间
-        Map<String, Object> timeMap = this.baseMapper.getTime(checkInfoVO);
+        Map<String, Object> timeMap = this.baseMapper.getTime(checkInfoVO.getBehospitalCode());
         if (null != timeMap) {
             Date behospital_date = (Date) timeMap.get("behospital_date");
             checkInfoVO.setBehospitalDate(behospital_date);

src/main/resources/mapper/MedLisInfoMapper.xml

@@ -32,8 +32,8 @@
         from med_behospital_info t
         where
         t.is_deleted = 'N'
-        <if test="examineInfoVO.behospitalCode != null">
-            and t.behospital_code = #{examineInfoVO.behospitalCode}
+        <if test="behospitalCode != null">
+            and t.behospital_code = #{behospitalCode}
         </if>
     </select>
 

src/main/resources/mapper/MedPacsInfoMapper.xml

@@ -34,8 +34,8 @@
         from med_behospital_info t
         where
         t.is_deleted = 'N'
-        <if test="checkInfoVO.behospitalCode != null">
-            and t.behospital_code = #{checkInfoVO.behospitalCode}
+        <if test="behospitalCode != null">
+            and t.behospital_code = #{behospitalCode}
         </if>
     </select>