厦门五院个性化需求

src/main/java/com/diagbot/aggregate/LeaveHosStatisticsAggregate.java

@@ -29,7 +29,14 @@ public class LeaveHosStatisticsAggregate {
             @DataConsumer("getNewBornCount") Integer newBornNum,
             @DataConsumer("getOperationCount") Integer operationNum,
             @DataConsumer("getNonAdviceCount") Integer nonAdviceNum,
-            @DataConsumer("get31DaysBehospitalCount") Integer reBehospitalNum) {
+            @DataConsumer("get31DaysBehospitalCount") Integer reBehospitalNum,
+            @DataConsumer("getBloodCount") Integer bloodNum,
+            @DataConsumer("getCancerCount") Integer cancerNum,
+            @DataConsumer("getOperationLevelOneCount") Integer operationLevelOneNum,
+            @DataConsumer("getOperationLevelTwoCount") Integer operationLevelTwoNum,
+            @DataConsumer("getOperationLevelThreeCount") Integer operationLevelThreeNum,
+            @DataConsumer("getOperationLevelFourCount") Integer operationLevelFourNum) {
+
 
         Map<String, Object> retMap = new LinkedHashMap<>();
         retMap.put("总人数", totleNum);
@@ -38,6 +45,12 @@ public class LeaveHosStatisticsAggregate {
         retMap.put("手术病人数", operationNum);
         retMap.put("非医嘱离院病人数", nonAdviceNum);
         retMap.put("31日再入院病人数", reBehospitalNum);
+        retMap.put("输血患者人数", bloodNum);
+        retMap.put("癌痛患者人数", cancerNum);
+        retMap.put("一级手术等级人数", operationLevelOneNum );
+        retMap.put("二级手术等级人数", operationLevelTwoNum );
+        retMap.put("三级手术等级人数", operationLevelThreeNum );
+        retMap.put("四级手术等级人数", operationLevelFourNum );
         return retMap;
 
     }
@@ -86,6 +99,50 @@ public class LeaveHosStatisticsAggregate {
         return behospitalInfoFacade.operationCount(filterVO);
     }
 
+    /**
+     * 一级手术级别人数
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getOperationLevelOneCount")
+    public Integer getOperationLevelOneCount(@InvokeParameter("filterVO") FilterVO filterVO) {
+        return behospitalInfoFacade.operationLevelOneCount(filterVO);
+    }
+
+    /**
+     * 二级手术级别人数
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getOperationLevelTwoCount")
+    public Integer getOperationLevelTwoCount(@InvokeParameter("filterVO") FilterVO filterVO) {
+        return behospitalInfoFacade.operationLevelTwoCount(filterVO);
+    }
+
+    /**
+     * 三级手术级别人数
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getOperationLevelThreeCount")
+    public Integer getOperationLevelThreeCount(@InvokeParameter("filterVO") FilterVO filterVO) {
+        return behospitalInfoFacade.operationLevelThreeCount(filterVO);
+    }
+
+    /**
+     * 四级手术级别人数
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getOperationLevelFourCount")
+    public Integer getOperationLevelFourCount(@InvokeParameter("filterVO") FilterVO filterVO) {
+        return behospitalInfoFacade.operationLevelFourCount(filterVO);
+    }
+
     /**
      * 非医嘱离院
      *
@@ -107,4 +164,26 @@ public class LeaveHosStatisticsAggregate {
     public Integer get31DaysBehospitalCount(@InvokeParameter("filterVO") FilterVO filterVO) {
         return behospitalInfoFacade.get31DaysBehospitalCount(filterVO);
     }
+
+    /**
+     * 输血患者人数
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getBloodCount")
+    public Integer getBloodCount(@InvokeParameter("filterVO") FilterVO filterVO) {
+        return behospitalInfoFacade.bloodCount(filterVO);
+    }
+
+    /**
+     * 癌痛患者人数
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getCancerCount")
+    public Integer getCancerCount(@InvokeParameter("filterVO") FilterVO filterVO) {
+        return behospitalInfoFacade.cancerCount(filterVO);
+    }
 }

src/main/java/com/diagbot/dto/QcResultShortDTO.java

@@ -2,6 +2,7 @@ package com.diagbot.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -58,6 +59,8 @@ public class QcResultShortDTO {
     private String behDoctorId;
     @Excel(name = "住院医生", width = 30, orderNum = "14")
     private String behDoctorName;
+    @Excel(name = "手术级别", width = 30, orderNum = "18")
+    private String operationLevel;
     /**
      * 主治医生id
      */
@@ -70,6 +73,8 @@ public class QcResultShortDTO {
     private String directorDoctorId;
     @Excel(name = "主任医生", width = 30, orderNum = "16")
     private String directorDoctorName;
+    @Excel(name = "主刀医生", width = 30, orderNum = "17")
+    private String operationDoctorName;
     /**
      * 科室编码
      */
@@ -77,9 +82,9 @@ public class QcResultShortDTO {
     /**
      * 科室名称
      */
-    @Excel(name = "科室", width = 70, orderNum = "17")
+    @Excel(name = "科室", width = 70, orderNum = "19")
     private String behDeptName;
-    @Excel(name = "评分时间", format = "yyyy-MM-dd", width = 30, orderNum = "18")
+    @Excel(name = "评分时间", format = "yyyy-MM-dd", width = 30, orderNum = "20")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date gradeTime;
 
@@ -121,4 +126,7 @@ public class QcResultShortDTO {
      */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date mrTime;
+
+    @ApiModelProperty("是否日间病例,1:是，0:否")
+    private String isDaytime;
 }

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

@@ -83,6 +83,38 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public int operationCount(FilterVO filterVO);
 
+    /**
+     * 一级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelOneCount(FilterVO filterVO);
+
+    /**
+     * 二级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelTwoCount(FilterVO filterVO);
+
+    /**
+     * 三级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelThreeCount(FilterVO filterVO);
+
+    /**
+     * 四级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelFourCount(FilterVO filterVO);
+
     /**
      * 出院总人数统计-科室-首页
      *
@@ -252,6 +284,22 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public int get31DaysBehospitalCount(FilterVO filterVO);
 
+    /**
+     * 输血患者人数-科室-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int bloodCount(FilterVO filterVO);
+
+    /**
+     * 癌痛患者人数-科室-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int cancerCount(FilterVO filterVO);
+
     /**
      * 病案首页质控病历数统计-全院（首页）
      *

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

@@ -124,6 +124,46 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.operationCount(filterVO);
     }
 
+    /**
+     * 一级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelOneCount(FilterVO filterVO) {
+        return baseMapper.operationLevelOneCount(filterVO);
+    }
+
+    /**
+     * 二级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelTwoCount(FilterVO filterVO) {
+        return baseMapper.operationLevelTwoCount(filterVO);
+    }
+
+    /**
+     * 三级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelThreeCount(FilterVO filterVO) {
+        return baseMapper.operationLevelThreeCount(filterVO);
+    }
+
+    /**
+     * 四级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelFourCount(FilterVO filterVO) {
+        return baseMapper.operationLevelFourCount(filterVO);
+    }
+
     /**
      * 出院总人数统计-科室-首页
      *
@@ -344,6 +384,26 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.get31DaysBehospitalCount(filterVO);
     }
 
+    /**
+     * 输血患者人数
+     *
+     * @param filterVO
+     * @return
+     */
+    public int bloodCount(FilterVO filterVO){
+        return baseMapper.bloodCount(filterVO);
+    }
+
+    /**
+     * 癌痛患者人数
+     *
+     * @param filterVO
+     * @return
+     */
+    public int cancerCount(FilterVO filterVO){
+        return baseMapper.cancerCount(filterVO);
+    }
+
     /**
      * 病案首页质控病历数统计-全院（首页）
      *

src/main/java/com/diagbot/vo/QcResultShortPageVO.java

@@ -35,6 +35,7 @@ public class QcResultShortPageVO extends Page {
     /**
      * (1-导出7天[含缺陷明细项]  2-导出90天[不含缺陷明细项] )
      */
+    @NotNull(message = "导出天数选择不能为空")
     private String radioCheck = "1";
 
     /**
@@ -42,6 +43,16 @@ public class QcResultShortPageVO extends Page {
      */
     private String diagnose;
 
+    /**
+     * 主刀医生
+     */
+    private String operationDoctor;
+
+    /**
+     * 手术等级
+     */
+    private String operationLevel;
+
     /**
      * title名称
      */
@@ -63,6 +74,11 @@ public class QcResultShortPageVO extends Page {
      * 科室名称
      */
     private String deptName;
+
+    /**
+     * 科室id
+     */
+    private String deptId;
     /**
      * 医生姓名
      */
@@ -91,7 +107,7 @@ public class QcResultShortPageVO extends Page {
     private Integer ruleType;
 
     /**
-     * 离院人员类型（0/null：总人数，1：死亡人数，2：新生儿，3：手术病人数，4：非医嘱离院病人，5:31日再入院病人）
+     * 离院人员类型（0/null：总人数，1：死亡人数，2：新生儿，3：手术病人数，4：非医嘱离院病人，5：31日再入院病人，6：输血患者病人，7：癌痛患者病人）
      */
     private Integer leaveHosType;
 
@@ -141,4 +157,8 @@ public class QcResultShortPageVO extends Page {
      * 改善标志（1：病案首页改善病历，2：病案首页改善至合格病历，3：病案首页改善至满分病历）
      */
     private Integer improveType;
+
+
+    @ApiModelProperty("是否日间病例,1:是，0:否")
+    private String isDaytime;
 }

src/main/java/com/diagbot/web/ConsoleController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -587,10 +589,12 @@ public class ConsoleController {
                     "chTimeEnd： 病历核查截止时间 <br>" +
                     "mrTimeStart： 首页核查起始时间 <br>" +
                     "mrTimeEnd： 首页核查截止时间 <br>" +
-                    "leaveHosType： 离院人员类型（0/null：总人数，1：死亡人数，2：新生儿，3：手术病人数，4：非医嘱离院病人，5:31日再入院病人） <br>" +
+                    "leaveHosType： 离院人员类型（0/null：总人数，1：死亡人数，2：新生儿，3：手术病人数，4：非医嘱离院病人，5:31日再入院病人，6：输血患者病人，7：癌痛患者病人） <br>" +
                     "startDate： 起始时间 <br>" +
                     "endDate： 截止时间 <br>" +
-                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
+                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>" +
+                    "operationDocterName： 主刀医生 <br>" +
+                    "operationLevel： 手术级别 <br>")
     @PostMapping("/leaveHosMRPage")
     @SysLogger("leaveHosMRPage")
     public RespDTO<IPage<QcResultShortDTO>> leaveHosMRPage(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {