zhaops преди 5 години
родител
ревизия
17758752d5

+ 3 - 6
mrman-service/src/main/java/com/diagbot/dto/BABLDTO.java

@@ -1,12 +1,10 @@
 package com.diagbot.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
- * @Description:
+ * @Description:病历详情
  * @Author:zhaops
  * @time: 2020/1/17 17:03
  */
@@ -16,16 +14,15 @@ public class BABLDTO {
     /**
      * 病案首页编号BASYID
      */
-    @TableId("BASYID")
     private Long basyid;
     /**
      * 病人病案姓名BRBAXM
      */
-    @TableField("BRBAXM")
     private String brbaxm;
     /**
      * 病人住院序号BRZYID
      */
-    @TableField("BRZYID")
     private String brzyid;
+
+
 }

+ 23 - 5
mrman-service/src/main/java/com/diagbot/dto/BABLDetailDTO.java

@@ -1,9 +1,10 @@
 package com.diagbot.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -15,16 +16,33 @@ public class BABLDetailDTO {
     /**
      * 病人病案性别BRBAXB
      */
-    @TableField("BRBAXB")
     private String brbaxb;
     /**
      * 病人病案血型BRBAXX
      */
-    @TableField("BRBAXX")
     private String brbaxx;
     /**
      * 病人病案RH型BRBARH
      */
-    @TableField("BRBARH")
     private String brbarh;
-}
+
+    /**
+     * 门急诊诊断名称
+     */
+    private String mjzzdmc;
+
+    /**
+     * 住院主要诊断名称
+     */
+    private String zyzyzdmc;
+
+    /**
+     * 住院其他诊断名称
+     */
+    private String zyqtzdmc;
+
+    /**
+     * 住院病历记录列表
+     */
+    private List<BLJLDetailDTO> zybljlList;
+}

+ 26 - 0
mrman-service/src/main/java/com/diagbot/dto/BLJLDetailDTO.java

@@ -0,0 +1,26 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/1/19 14:23
+ */
+@Getter
+@Setter
+public class BLJLDetailDTO {
+    /**
+     * 病历记录id
+     */
+    private String bljlid;
+    /**
+     * 病历记录名称
+     */
+    private String bljlmc;
+    /**
+     * 病历记录内容
+     */
+    private String bljlnr;
+}

+ 17 - 0
mrman-service/src/main/java/com/diagbot/facade/ArRechomeFacade.java

@@ -1,7 +1,11 @@
 package com.diagbot.facade;
 
 import com.diagbot.dto.BABLDTO;
+import com.diagbot.dto.BABLDetailDTO;
+import com.diagbot.dto.BLJLDetailDTO;
 import com.diagbot.service.impl.ArRechomeServiceImpl;
+import com.diagbot.vo.BABLVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -14,8 +18,21 @@ import java.util.List;
  */
 @Component
 public class ArRechomeFacade extends ArRechomeServiceImpl {
+    @Autowired
+    private MrMedicalrecordsFacade mrMedicalrecordsFacade;
 
     public List<BABLDTO> getAllList() {
         return super.getBAZYList();
     }
+
+    public BABLDetailDTO getBABLContent(BABLVO bablvo) {
+        //获取基础信息
+        BABLDetailDTO bablDetailDTO = super.getBABLDetail(bablvo);
+        //获取病历记录
+        List<BLJLDetailDTO> bljlDetailDTOList = mrMedicalrecordsFacade.getBLJLList(bablvo);
+        if (bablDetailDTO != null) {
+            bablDetailDTO.setZybljlList(bljlDetailDTOList);
+        }
+        return bablDetailDTO;
+    }
 }

+ 13 - 0
mrman-service/src/main/java/com/diagbot/facade/MrMedicalrecordsFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MrMedicalrecordsServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/1/19 15:02
+ */
+@Component
+public class MrMedicalrecordsFacade extends MrMedicalrecordsServiceImpl {
+}

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

@@ -1,8 +1,10 @@
 package com.diagbot.mapper;
 
 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 java.util.List;
 
@@ -21,4 +23,12 @@ public interface ArRechomeMapper extends BaseMapper<ArRechome> {
      * @return
      */
     List<BABLDTO> getBAZYList();
-}
+
+    /**
+     * 获取病历详情
+     *
+     * @param bablvo
+     * @return
+     */
+    BABLDetailDTO getBABLDetail(BABLVO bablvo);
+}

+ 12 - 1
mrman-service/src/main/java/com/diagbot/mapper/MrMedicalrecordsMapper.java

@@ -1,7 +1,11 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.MrMedicalrecords;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.BLJLDetailDTO;
+import com.diagbot.entity.MrMedicalrecords;
+import com.diagbot.vo.BABLVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MrMedicalrecordsMapper extends BaseMapper<MrMedicalrecords> {
 
+    /**
+     * 获取病历记录列表
+     *
+     * @param bablvo
+     * @return
+     */
+    List<BLJLDetailDTO> getBLJLList(BABLVO bablvo);
 }

+ 10 - 0
mrman-service/src/main/java/com/diagbot/service/ArRechomeService.java

@@ -1,8 +1,10 @@
 package com.diagbot.service;
 
 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 java.util.List;
 
@@ -21,4 +23,12 @@ public interface ArRechomeService extends IService<ArRechome> {
      * @return
      */
     List<BABLDTO> getBAZYList();
+
+    /**
+     * 获取病历详情
+     *
+     * @param bablvo
+     * @return
+     */
+    BABLDetailDTO getBABLDetail(BABLVO bablvo);
 }

+ 12 - 2
mrman-service/src/main/java/com/diagbot/service/MrMedicalrecordsService.java

@@ -1,7 +1,11 @@
 package com.diagbot.service;
 
+import com.diagbot.dto.BLJLDetailDTO;
 import com.diagbot.entity.MrMedicalrecords;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.BABLVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +16,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2020-01-17
  */
 public interface MrMedicalrecordsService extends IService<MrMedicalrecords> {
-
-}
+    /**
+     * 获取病历记录列表
+     *
+     * @param bablvo
+     * @return
+     */
+    List<BLJLDetailDTO> getBLJLList(BABLVO bablvo);
+}

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

@@ -1,10 +1,12 @@
 package com.diagbot.service.impl;
 
 import com.diagbot.dto.BABLDTO;
+import com.diagbot.dto.BABLDetailDTO;
 import com.diagbot.entity.ArRechome;
 import com.diagbot.mapper.ArRechomeMapper;
 import com.diagbot.service.ArRechomeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.BABLVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -27,4 +29,14 @@ public class ArRechomeServiceImpl extends ServiceImpl<ArRechomeMapper, ArRechome
     public List<BABLDTO> getBAZYList() {
         return this.baseMapper.getBAZYList();
     }
+
+    /**
+     * 获取病历详情
+     *
+     * @param bablvo
+     * @return
+     */
+    public BABLDetailDTO getBABLDetail(BABLVO bablvo) {
+        return this.baseMapper.getBABLDetail(bablvo);
+    }
 }

+ 13 - 1
mrman-service/src/main/java/com/diagbot/service/impl/MrMedicalrecordsServiceImpl.java

@@ -1,11 +1,15 @@
 package com.diagbot.service.impl;
 
+import com.diagbot.dto.BLJLDetailDTO;
 import com.diagbot.entity.MrMedicalrecords;
 import com.diagbot.mapper.MrMedicalrecordsMapper;
 import com.diagbot.service.MrMedicalrecordsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.BABLVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +20,13 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class MrMedicalrecordsServiceImpl extends ServiceImpl<MrMedicalrecordsMapper, MrMedicalrecords> implements MrMedicalrecordsService {
-
+    /**
+     * 获取病历记录列表
+     *
+     * @param bablvo
+     * @return
+     */
+    public List<BLJLDetailDTO> getBLJLList(BABLVO bablvo) {
+        return this.baseMapper.getBLJLList(bablvo);
+    }
 }

+ 22 - 0
mrman-service/src/main/java/com/diagbot/vo/BABLVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/1/19 14:38
+ */
+@Getter
+@Setter
+public class BABLVO {
+    /**
+     * 病案首页编号BASYID
+     */
+    private Long basyid;
+    /**
+     * 病人住院序号BRZYID
+     */
+    private String brzyid;
+}

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

@@ -3,15 +3,18 @@ package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.BABLDTO;
+import com.diagbot.dto.BABLDetailDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ArRechome;
 import com.diagbot.entity.MrMrcontent;
 import com.diagbot.facade.ArRechomeFacade;
 import com.diagbot.facade.MrMrcontentFacade;
+import com.diagbot.vo.BABLVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -58,4 +61,12 @@ public class ArRechomeController {
     public RespDTO<List<BABLDTO>> getAllList() {
         return RespDTO.onSuc(arRechomeFacade.getAllList());
     }
+
+    @ApiOperation(value = "获取病案详情[by:zhaops]",
+            notes = "获取病案详情")
+    @PostMapping("/getBABLContent")
+    @SysLogger("getBABLContent")
+    public RespDTO<BABLDetailDTO> getBABLContent(@RequestBody BABLVO bablvo) {
+        return RespDTO.onSuc(arRechomeFacade.getBABLContent(bablvo));
+    }
 }

+ 1 - 1
mrman-service/src/main/java/com/diagbot/web/MrMedicalrecordsController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
@@ -16,5 +17,4 @@ import org.springframework.stereotype.Controller;
 @Controller
 @RequestMapping("/mrMedicalrecords")
 public class MrMedicalrecordsController {
-
 }

+ 69 - 0
mrman-service/src/main/resources/mapper/ArRechomeMapper.xml

@@ -48,4 +48,73 @@
             from AR_RECHOME t1,BR_RECINHOS t2
         where t1.BASYID=t2.BASYID
     </select>
+
+    <!-- 病案首页基础信息 -->
+    <select id="getBABLDetail" parameterType="com.diagbot.vo.BABLVO" resultType="com.diagbot.dto.BABLDetailDTO">
+    SELECT
+	  t1.BRBAXB,
+	  t1.BRBAXX,
+	  t1.BRBARH,
+	  t2.MJZZDMC,
+	  t2.ZYZYZDMC,
+	  t2.ZYQTZDMC
+    FROM
+	AR_RECHOME t1,
+	(
+	SELECT
+		tt.BASYID,
+		listAgg ( tt.MJZZDMC, ',' ) within GROUP ( ORDER BY tt.MJZZDMC ) AS MJZZDMC,
+		listAgg ( tt.ZYZYZDMC, ',' ) within GROUP ( ORDER BY tt.ZYZYZDMC ) AS ZYZYZDMC,
+		listAgg ( tt.ZYQTZDMC, ',' ) within GROUP ( ORDER BY tt.ZYQTZDMC ) AS ZYQTZDMC
+	FROM
+		(
+		SELECT
+			BASYID,
+			ZDLBDM,
+			ZCZDPB,
+		CASE
+
+				WHEN ZDLBDM = '1' THEN
+				t.ZDJBMC
+			END AS MJZZDMC,
+		CASE
+
+				WHEN ZDLBDM = '2'
+				AND ZCZDPB = '1' THEN
+					t.ZDJBMC
+					END AS ZYZYZDMC,
+			CASE
+
+					WHEN ZDLBDM = '2'
+					AND ZCZDPB = '2' THEN
+						t.ZDJBMC
+						END AS ZYQTZDMC
+				FROM
+					(
+					SELECT
+						BASYID,
+						ZDLBDM,
+						ZCZDPB,
+						LISTAGG ( ZDJBMC, ',' ) within GROUP ( ORDER BY ZDJBMC ) ZDJBMC
+					FROM
+						BR_RECDIAGNOSE
+                    where 1=1
+                    <if test="basyid != null and basyid != ''">
+                        and BASYID=#{basyid}
+                    </if>
+					GROUP BY
+						BASYID,
+						ZDLBDM,
+						ZCZDPB
+					) t
+				) tt
+			GROUP BY
+				BASYID
+			) t2
+	WHERE
+	    t1.BASYID = t2.BASYID
+        <if test="basyid != null and basyid != ''">
+            and t1.BASYID=#{basyid}
+        </if>
+    </select>
 </mapper>

+ 20 - 0
mrman-service/src/main/resources/mapper/MrMedicalrecordsMapper.xml

@@ -21,4 +21,24 @@
         <result column="BLZCBZ" property="blzcbz" />
     </resultMap>
 
+    <select id="getBLJLList" parameterType="com.diagbot.vo.BABLVO" resultType="com.diagbot.dto.BLJLDetailDTO">
+    SELECT
+	    t3.BLJLID,
+	    t2.BLJLMC,
+	    t3.BLJLNR
+    FROM
+	    BR_RECINHOS t1,
+	    MR_MEDICALRECORDS t2,
+	    MR_MRCONTENT t3
+    WHERE
+	    t1.BRZYID = t2.BRZYID
+	    AND t2.BLJLID = t3.BLJLID
+	    <if test="basyid != null and basyid != ''">
+	        AND t1.BASYID = #{basyid}
+        </if>
+        <if test="brzyid != null and brzyid != ''">
+	        AND t1.BRZYID = #{brzyid}
+        </if>
+    </select>
+
 </mapper>