Merge remote-tracking branch 'origin/dev/20200812_1.4.2' into debug

doc/021.20200812v1.4.2/qc_initv1.4.2.sql

@@ -0,0 +1,4 @@
+use `qc`;
+
+ALTER TABLE `qc_cases_entry_hospital` ADD   `score_run` decimal(5,1) DEFAULT NULL COMMENT '扣分值（运行质控）' AFTER `score`;
+ALTER TABLE `qc_cases_entry_hospital` ADD   `is_used_run` int(3) DEFAULT NULL COMMENT '0-未启用 1-启用（运行质控）' AFTER `is_used`;

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

@@ -15,7 +15,7 @@ import java.util.List;
 @Getter
 @Setter
 public class ExportExcelDTO {
-    @Excel(name = "出院科室", needMerge = true)
+    @Excel(name = "科室", needMerge = true)
     private String behDeptName;
     @Excel(name = "平均分数", needMerge = true)
     private String avgScore;

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

@@ -15,7 +15,7 @@ public class LevelStatisticsDTO {
     /**
      * 科室id（科室编码）
      */
-    @Excel(name = "科室编码", orderNum = "0")
+//    @Excel(name = "科室编码", orderNum = "0")
     private String deptId;
     /**
      * 科室名称

src/main/java/com/diagbot/facade/ConsoleExportFacade.java

@@ -223,6 +223,10 @@ public class ConsoleExportFacade {
     public void qcResultShortPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
+                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
+            qcResultShortPageVO.setBehDeptName("");
+        }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔90天
@@ -251,6 +255,10 @@ public class ConsoleExportFacade {
     public void leaveHosMrPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
+                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
+            qcResultShortPageVO.setBehDeptName("");
+        }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天
@@ -291,6 +299,10 @@ public class ConsoleExportFacade {
     public void unModifyMRPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
+                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
+            qcResultShortPageVO.setBehDeptName("");
+        }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天
@@ -379,6 +391,10 @@ public class ConsoleExportFacade {
     public void hmImproveMRPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
+                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
+            qcResultShortPageVO.setBehDeptName("");
+        }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天
@@ -407,6 +423,10 @@ public class ConsoleExportFacade {
     public void qcCheckMRPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
+                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
+            qcResultShortPageVO.setBehDeptName("");
+        }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2792,10 +2792,7 @@
         FROM
         (
         SELECT
-        CONCAT(
-        ( CASE WHEN a.director_doctor_name IS NOT NULL AND a.director_doctor_name != '' THEN concat( a.director_doctor_name, '\n' ) ELSE '' END ),
-        a.doctor_name
-        ) AS behDoctorName,
+        a.doctor_name AS behDoctorName,
         a.`name` AS patName,
         a.behospital_code AS behospitalCode,
         a.behospital_date AS behospitalDate,
@@ -2992,10 +2989,7 @@
         FROM
         (
         SELECT
-        CONCAT(
-        ( CASE WHEN a.director_doctor_name IS NOT NULL AND a.director_doctor_name != '' THEN concat( a.director_doctor_name, '\n' ) ELSE '' END ),
-        a.doctor_name
-        ) AS behDoctorName,
+        a.doctor_name AS behDoctorName,
         a.`name` AS patName,
         a.behospital_code AS behospitalCode,
         a.behospital_date AS behospitalDate,
@@ -3206,10 +3200,7 @@
         FROM
         (
         SELECT
-        CONCAT(
-        ( CASE WHEN a.director_doctor_name IS NOT NULL AND a.director_doctor_name != '' THEN concat( a.director_doctor_name, '\n' ) ELSE '' END ),
-        a.doctor_name
-        ) AS behDoctorName,
+        a.doctor_name AS behDoctorName,
         a.`name` AS patName,
         a.behospital_code AS behospitalCode,
         a.behospital_date AS behospitalDate,
@@ -5393,11 +5384,7 @@
         f1.mrTime
         FROM
         (SELECT
-        CONCAT(
-        ( CASE WHEN t.directorDoctorName IS NOT NULL AND t.directorDoctorName != '' THEN concat( t.directorDoctorName,
-        '\n' ) ELSE '' END ),
-        t.doctorName
-        ) AS behDoctorName,
+        t.doctorName AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,
@@ -5884,7 +5871,7 @@
         f1.mrTime
         FROM
         (SELECT
-        CONCAT( ifnull( t.directorDoctorName, '' ), '\n', t.doctorName ) AS behDoctorName,
+        t.doctorName AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,
@@ -6678,7 +6665,7 @@
         f1.mrTime
         FROM
         (SELECT
-        CONCAT( ifnull( t.directorDoctorName, '' ), '\n', t.doctorName ) AS behDoctorName,
+        t.doctorName AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,
@@ -7888,7 +7875,7 @@
         f1.mrTime
         FROM
         (SELECT
-        CONCAT( ifnull( t.directorDoctorName, '' ), '\n', t.doctorName ) AS behDoctorName,
+        t.doctorName AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,
@@ -8423,7 +8410,7 @@
         f1.mrTime
         FROM
         (SELECT
-        CONCAT( ifnull( t.directorDoctorName, '' ), '\n', t.doctorName ) AS behDoctorName,
+        t.doctorName AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -452,7 +452,12 @@
         tt2.NAME,
         tt2.cases_id AS casesId,
         tt2.cases_name AS casesName,
-        tt3.score,
+        <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
+            tt3.score_run as score,
+        </if>
+        <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 1">
+            tt3.score,
+        </if>
         tt1.num,
         tt1.is_reject AS isReject
         FROM
@@ -581,7 +586,12 @@
         tt2.cases_id AS casesId,
         tt2.cases_name AS casesName,
         tt1.num,
-        tt3.score,
+        <if test="isPlacefile != null and isPlacefile == 0">
+            tt3.score_run as score,
+        </if>
+        <if test="isPlacefile != null and isPlacefile == 1">
+            tt3.score,
+        </if>
         tt1.is_reject AS isReject
         FROM
         (
@@ -1067,7 +1077,12 @@
         tt2.cases_id AS casesId,
         tt2.cases_name AS casesName,
         tt1.num,
-        tt3.score,
+        <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile == 0">
+            tt3.score_run as score,
+        </if>
+        <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile == 1">
+            tt3.score,
+        </if>
         tt1.is_reject AS isReject
         FROM
         (