Merge remote-tracking branch 'origin/dev/20200426_2nd' into debug

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

@@ -675,14 +675,18 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
         BehosDTO behosDTO = new BehosDTO();
         if (behospitalInfo == null) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该病历已删除!");
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "该病历不存在!【hospitalId=" + hospitalId + "】【behospitalCode="
+                            + getDetailVO.getBehospitalCode() + "】");
         }
         BeanUtil.copyProperties(behospitalInfo, behosDTO);
 
         // 获取结果主表信息
         QcResultDTO qcResultDTO = qcresultInfoFacade.getByBehospitalCode(getDetailVO);
         if (qcResultDTO == null) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该病历未评分!");
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "该病历未评分!【hospitalId=" + hospitalId + "】【behospitalCode="
+                    + getDetailVO.getBehospitalCode() + "】");
         }
         QcResultApiDTO qcResultApiDTO = new QcResultApiDTO();
         BeanUtil.copyProperties(qcResultDTO, qcResultApiDTO);

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -129,7 +129,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
@@ -158,7 +158,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
@@ -199,7 +199,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
@@ -229,7 +229,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
@@ -259,7 +259,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
@@ -295,7 +295,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
@@ -327,7 +327,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
@@ -498,7 +498,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
@@ -532,7 +532,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>

src/main/resources/mapper/HomePageMapper.xml

@@ -158,7 +158,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
@@ -190,7 +190,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -34,7 +34,10 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= #{startDate}]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
+        </if>
+        <if test="endDate != null and endDate != ''">
+            <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
         </if>
         <if test="gradeType != null and gradeType != ''">
             AND b.grade_type = #{gradeType}
@@ -64,7 +67,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
@@ -105,7 +108,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
@@ -148,7 +151,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
@@ -184,7 +187,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
@@ -218,7 +221,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.behospital_date >= DATE(#{startDate})]]>
+            <![CDATA[ and a.leave_hospital_date >= DATE(#{startDate})]]>
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>