doctorName统一

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

@@ -1878,7 +1878,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     private void exportQcresultVOSet(ExportQcresultVO exportQcresultVO) {
         //入参验证
         long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90 * 24 * 60 * 60 * 1000;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000l;
         //入院时间
         if (null != exportQcresultVO && null != exportQcresultVO.getBehosDateStart() && null != exportQcresultVO.getBehosDateEnd()) {
             Date startDate = exportQcresultVO.getBehosDateStart();

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

@@ -263,7 +263,7 @@ public class ConsoleExportFacade {
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天
         long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90 * 24 * 60 * 60 * 1000;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000l;
 
         if("1".equals(qcResultShortPageVO.getRadioCheck())){
             //时间间隔7天
@@ -387,7 +387,7 @@ public class ConsoleExportFacade {
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天
         long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90 * 24 * 60 * 60 * 1000;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000l;
 
         if("1".equals(qcResultShortPageVO.getRadioCheck())){
             //时间间隔7天
@@ -506,7 +506,7 @@ public class ConsoleExportFacade {
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天
         long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90 * 24 * 60 * 60 * 1000;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000l;
 
         if("1".equals(qcResultShortPageVO.getRadioCheck())){
             //时间间隔7天
@@ -561,7 +561,7 @@ public class ConsoleExportFacade {
 
         //时间间隔7天
         long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90 * 24 * 60 * 60 * 1000;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000l;
 
         if("1".equals(qcResultShortPageVO.getRadioCheck())){
             //时间间隔7天

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -3460,7 +3460,7 @@
         <result column="avgScore" property="avgScore"/>
         <collection property="excelBehospitalDTOS"
                     ofType="com.diagbot.dto.ExportExcelBehospitalDTO">
-            <result column="behDoctorName" property="behDoctorName"/>
+            <result column="doctorName" property="doctorName"/>
             <result column="patName" property="patName"/>
             <result column="behospitalCode" property="behospitalCode"/>
             <result column="behospitalDate" property="behospitalDate"/>
@@ -3481,7 +3481,7 @@
     <select id="exportExcel" resultMap="ExportExcelMap">
         SELECT DISTINCT
         t1.beh_dept_name AS behDeptName,
-        t1.beh_doctor_name AS behDoctorName,
+        t1.beh_doctor_name AS doctorName,
         t1.`name` AS patName,
         t1.behospital_code AS behospitalCode,
         t1.behospital_date AS behospitalDate,
@@ -3530,7 +3530,7 @@
         SELECT
         t1.behDeptId,
         t1.behDeptName,
-        t1.behDoctorName,
+        t1.doctorName,
         t1.patName,
         t1.behospitalCode,
         t1.hospitalId,
@@ -3756,7 +3756,7 @@
         SELECT
         t1.behDeptId,
         t1.behDeptName,
-        t1.behDoctorName,
+        t1.doctorName,
         t1.patName,
         t1.behospitalCode,
         t1.hospitalId,
@@ -3986,7 +3986,7 @@
         SELECT
         t1.behDeptId,
         t1.behDeptName,
-        t1.behDoctorName,
+        t1.doctorName,
         t1.patName,
         t1.behospitalCode,
         t1.hospitalId,
@@ -4219,7 +4219,7 @@
         SELECT
         t1.behDeptId,
         t1.behDeptName,
-        t1.behDoctorName,
+        t1.doctorName,
         t1.patName,
         t1.behospitalCode,
         t1.hospitalId,
@@ -4712,7 +4712,8 @@
         t1.gmt_create AS gradeTime,
         t1.diagnose,
         t1.ward_name AS wardName,
-        t2.age,
+        CONCAT( ifnull(t2.age,''),ifnull(t2.age_unit,'') )as age,
+        t3.score_res as scoreBn,
         t1.file_code AS fileCode
         FROM
         (
@@ -4831,6 +4832,10 @@
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code
         AND t2.is_deleted = 'N'
+        LEFT JOIN med_qcresult_cases t3 on  t1.behospital_code = t3.behospital_code
+        and t1.hospital_id = t3.hospital_id
+        AND t3.is_deleted = 'N'
+        and t3.cases_id = 243
     </select>
 
     <update id="updateBatchByKey">
@@ -7572,7 +7577,7 @@
         SELECT
         f1.behDeptId,
         f1.behDeptName,
-        f1.behDoctorName,
+        f1.doctorName,
         f1.patName,
         f1.behospitalCode,
         f1.hospitalId,