Merge remote-tracking branch 'origin/dev/20200619_1.3.6.1' into debug

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

@@ -27,6 +27,10 @@ public class EntryStatisticsDTO {
      * 未在24小时内完成会诊条目id
      */
     private Long consultationEntryId;
+    /**
+     * 未在24小时内完成会诊条目名称
+     */
+    private String consultationEntryName;
     /**
      * 未在24小时内完成会诊率
      */
@@ -43,6 +47,10 @@ public class EntryStatisticsDTO {
      * 手术记录名称不匹配条目id
      */
     private Long operationNameEntryId;
+    /**
+     * 手术记录名称不匹配条目名称
+     */
+    private String operationNameEntryName;
     /**
      * 手术记录名称不匹配数
      */
@@ -59,6 +67,10 @@ public class EntryStatisticsDTO {
      * 术后首程未在15分钟内完成条目id
      */
     private Long operation15MinuteEntryId;
+    /**
+     * 术后首程未在15分钟内完成条目名称
+     */
+    private String operation15MinuteEntryName;
     /**
      * 术后首程未在15分钟内完成数
      */
@@ -75,6 +87,10 @@ public class EntryStatisticsDTO {
      * 病案首页手术时间不匹配条目id
      */
     private Long operationTimeEntryId;
+    /**
+     * 病案首页手术时间不匹配条目名称
+     */
+    private String operationTimeEntryName;
     /**
      * 病案首页手术时间不匹配数
      */
@@ -95,6 +111,10 @@ public class EntryStatisticsDTO {
      * 未在6小时内书写危急值条目id
      */
     private Long crisisEntryId;
+    /**
+     * 未在6小时内书写危急值条目名称
+     */
+    private String crisisEntryName;
     /**
      * 未在6小时内书写危急值记录数
      */
@@ -115,6 +135,10 @@ public class EntryStatisticsDTO {
      * 阶段小节未书写条目id
      */
     private Long stageSummaryEntryId;
+    /**
+     * 阶段小节未书写条目名称
+     */
+    private String stageSummaryEntryName;
     /**
      * 阶段小节未书写数
      */

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2996,28 +2996,34 @@
         deptName,
         consultationNum,
         2511 AS consultationEntryId,
+        '普通会诊未在24小时内完成' AS consultationEntryName,
         ROUND( consultationNum / consultationMRNum, 4 ) AS consultationPercent,
         CONCAT( ROUND( consultationNum / consultationMRNum * 100, 2 ), '%' ) AS consultationPercentStr,
         consultationMRNum,
         2594 AS operationNameEntryId,
+        '首页手术名称与手术记录不一致' AS operationNameEntryName,
         operationNameNum,
         ROUND( operationNameNum / operationMRNum, 4 ) AS operationNamePercent,
         CONCAT( ROUND( operationNameNum / operationMRNum * 100, 2 ), '%' ) AS operationNamePercentStr,
         2973 AS operationTimeEntryId,
+        '手术日期与手术记录中手术日期不一致' AS operationTimeEntryName,
         operationTimeNum,
         ROUND( operationTimeNum / operationMRNum, 4 ) AS operationTimePercent,
         CONCAT( ROUND( operationTimeNum / operationMRNum * 100, 2 ), '%' ) AS operationTimePercentStr,
         2166 AS operation15MinuteEntryId,
+        '术后首程未在手术结束1小时内完成' AS operation15MinuteEntryName,
         operation15MinuteNum,
         ROUND( operation15MinuteNum / operationMRNum, 4 ) AS operation15MinutePercent,
         CONCAT( ROUND( operation15MinuteNum / operationMRNum * 100, 2 ), '%' ) AS operation15MinutePercentStr,
         operationMRNum,
         2419 AS crisisEntryId,
+        '' AS crisisEntryName,
         crisisNum,
         ROUND( crisisNum / crisisMRNum, 4 ) AS crisisPercent,
         CONCAT( ROUND( crisisNum / crisisMRNum * 100, 2 ), '%' ) AS crisisPercentStr,
         crisisMRNum,
         2495 AS stageSummaryEntryId,
+        '危急值记录未在接到危急值报告后6小时内完成' AS stageSummaryEntryName,
         stageSummaryNum,
         ROUND( stageSummaryNum / stageSummaryMRNum, 4 ) AS stageSummaryPercent,
         CONCAT( ROUND( stageSummaryNum / stageSummaryMRNum * 100, 2 ), '%' ) AS stageSummaryPercentStr,
@@ -3236,6 +3242,9 @@
                 <when test='asc=="operationTimeNum"'>operationTimeNum asc</when>
                 <when test='asc=="operationTimePercent"'>operationTimePercent asc</when>
                 <when test='asc=="operationTimePercentStr"'>operationTimePercent asc</when>
+                <when test='asc=="operation15MinuteNum"'>operation15MinuteNum asc</when>
+                <when test='asc=="operation15MinutePercent"'>operation15MinutePercent asc</when>
+                <when test='asc=="operation15MinutePercentStr"'>operation15MinutePercent asc</when>
                 <when test='asc=="operationMRNum"'>operationMRNum asc</when>
                 <when test='asc=="crisisNum"'>crisisNum asc</when>
                 <when test='asc=="crisisPercent"'>crisisPercent asc</when>
@@ -3263,6 +3272,9 @@
                 <when test='desc=="operationTimeNum"'>operationTimeNum desc</when>
                 <when test='desc=="operationTimePercent"'>operationTimePercent desc</when>
                 <when test='desc=="operationTimePercentStr"'>operationTimePercent desc</when>
+                <when test='desc=="operation15MinuteNum"'>operation15MinuteNum desc</when>
+                <when test='desc=="operation15MinutePercent"'>operation15MinutePercent desc</when>
+                <when test='desc=="operation15MinutePercentStr"'>operation15MinutePercent desc</when>
                 <when test='desc=="operationMRNum"'>operationMRNum desc</when>
                 <when test='desc=="crisisNum"'>crisisNum desc</when>
                 <when test='desc=="crisisPercent"'>crisisPercent desc</when>