Merge branch 'dev/mrman20200117_init' into dev/qctest20200310

# Conflicts:
#	mrman-service/src/main/java/com/diagbot/service/ArRechomeService.java

mrman-service/src/main/java/com/diagbot/mapper/ArRechomeMapper.java

@@ -1,10 +1,13 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.BABLDTO;
 import com.diagbot.dto.BABLDetailDTO;
 import com.diagbot.entity.ArRechome;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.vo.BABLVO;
+import com.diagbot.vo.BAZYPageVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -31,4 +34,12 @@ public interface ArRechomeMapper extends BaseMapper<ArRechome> {
      * @return
      */
     BABLDetailDTO getBABLDetail(BABLVO bablvo);
+
+    /**
+     * 病案病历记录分页查询
+     *
+     * @param bazyPageVO
+     * @return
+     */
+    IPage<BABLDTO> getBAZYPage(@Param("bazyPageVO") BAZYPageVO bazyPageVO);
 }

mrman-service/src/main/java/com/diagbot/service/ArRechomeService.java

@@ -1,11 +1,14 @@
 package com.diagbot.service;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.BABLDTO;
 import com.diagbot.dto.BABLDetailDTO;
 import com.diagbot.entity.ArRechome;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.vo.BABLVO;
+import com.diagbot.vo.BAZYPageVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -33,4 +36,12 @@ public interface ArRechomeService extends IService<ArRechome> {
      * @return
      */
     BABLDetailDTO getBABLDetail(BABLVO bablvo);
+
+    /**
+     * 病案病历记录分页查询
+     *
+     * @param bazyPageVO
+     * @return
+     */
+    IPage<BABLDTO> getBAZYPage(@Param("bazyPageVO") BAZYPageVO bazyPageVO);
 }

mrman-service/src/main/java/com/diagbot/service/impl/ArRechomeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.BABLDTO;
 import com.diagbot.dto.BABLDetailDTO;
 import com.diagbot.entity.ArRechome;
@@ -7,6 +8,8 @@ import com.diagbot.mapper.ArRechomeMapper;
 import com.diagbot.service.ArRechomeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.BABLVO;
+import com.diagbot.vo.BAZYPageVO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -39,4 +42,14 @@ public class ArRechomeServiceImpl extends ServiceImpl<ArRechomeMapper, ArRechome
     public BABLDetailDTO getBABLDetail(BABLVO bablvo) {
         return this.baseMapper.getBABLDetail(bablvo);
     }
+
+    /**
+     * 病案病历记录分页查询
+     *
+     * @param bazyPageVO
+     * @return
+     */
+    public IPage<BABLDTO> getBAZYPage(@Param("bazyPageVO") BAZYPageVO bazyPageVO) {
+        return this.baseMapper.getBAZYPage(bazyPageVO);
+    }
 }

mrman-service/src/main/java/com/diagbot/vo/BAZYPageVO.java

@@ -0,0 +1,11 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BAZYPageVO extends Page {
+    private String brbaxm;
+}

mrman-service/src/main/java/com/diagbot/web/ArRechomeController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.BABLDTO;
 import com.diagbot.dto.BABLDetailDTO;
@@ -11,6 +12,7 @@ import com.diagbot.facade.ArRechomeFacade;
 import com.diagbot.facade.MrMrcontentFacade;
 import com.diagbot.vo.BABLDetailVO;
 import com.diagbot.vo.BABLVO;
+import com.diagbot.vo.BAZYPageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,6 +65,14 @@ public class ArRechomeController {
         return RespDTO.onSuc(arRechomeFacade.getAllList());
     }
 
+    @ApiOperation(value = "病案病历记录分页查询[by:zhaops]",
+            notes = "病案病历记录分页查询")
+    @PostMapping("/getBAZYPage")
+    @SysLogger("getBAZYPage")
+    public RespDTO<IPage<BABLDTO>> getBAZYPage(@RequestBody BAZYPageVO bazyPageVO) {
+        return RespDTO.onSuc(arRechomeFacade.getBAZYPage(bazyPageVO));
+    }
+
     @ApiOperation(value = "获取病案详情[by:zhaops]",
             notes = "获取病案详情")
     @PostMapping("/getBABLContent")

mrman-service/src/main/resources/mapper/ArRechomeMapper.xml

@@ -49,6 +49,17 @@
         where t1.BASYID=t2.BASYID
     </select>
 
+    <!--住院记录分页查询-->
+    <select id="getBAZYPage" resultType="com.diagbot.dto.BABLDTO">
+        select
+            t1.BRBAXM,t1.BASYID,t2.BRZYID
+            from AR_RECHOME t1,BR_RECINHOS t2
+        where t1.BASYID=t2.BASYID
+        <if test="bazyPageVO.brbaxm != null and bazyPageVO.brbaxm !=''">
+            AND t1.BRBAXM like concat(concat('%',#{bazyPageVO.brbaxm}),'%')
+        </if>
+    </select>
+
     <!-- 病案首页基础信息 -->
     <select id="getBABLDetail" parameterType="com.diagbot.vo.BABLVO" resultType="com.diagbot.dto.BABLDetailDTO">
     SELECT