BUG修复

performance/Performance.Api/Controllers/AccountController.cs

@@ -74,7 +74,7 @@ public ApiResponse<JwtToken> Login([FromBody] LoginRequest request)
                 new Claim(JwtClaimTypes.Id, user.UserID.ToString()),
                 new Claim(JwtClaimTypes.Login, user.Login),
                 new Claim(JwtClaimTypes.RealName,  user.RealName),
-                new Claim(JwtClaimTypes.Mail, user.Mail),
+                new Claim(JwtClaimTypes.Mail, user.Mail??""),
                 new Claim(JwtClaimTypes.AppName, request.AppName ?? ""),
                 new Claim(JwtClaimTypes.Device, request.Device ?? ""),
                 new Claim(JwtClaimTypes.Department, user.Department ?? ""),

performance/Performance.Repository/PerforPerAllotRepository.cs

@@ -165,11 +165,10 @@ public IEnumerable<report_original_workload> QueryWorkloadData(int allotid, stri
                 if (connection.State != ConnectionState.Open) connection.Open();
                 try
                 {
-                    string clear = @"SELECT DISTINCT t3.AccountingUnit as Department,ifnull(t1.DoctorName, '未知') DoctorName,if(ifnull(t2.PersonnelNumber,'')='', t2.JobNumber, t2.PersonnelNumber) PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1
-	LEFT JOIN per_employee t2 on t1.personnelnumber = t2.jobnumber
+                    string clear = @"SELECT DISTINCT t3.AccountingUnit as Department,ifnull(t1.DoctorName, '未知') DoctorName,if(ifnull(t2.PersonnelNumber,'')='', ifnull(t2.JobNumber,ifnull(t1.DoctorName, '未知')), t2.PersonnelNumber) PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1
+	LEFT JOIN per_employee t2 on t1.personnelnumber = t2.jobnumber AND t2.allotid = @allotid
 	JOIN (select distinct AccountingUnit,HISDeptName,unittype from per_dept_dic where HospitalId = @hospitalid) t3 ON t1.Department = t3.HISDeptName
 WHERE t1.allotid = @allotid
-	AND t2.allotid = @allotid
 	AND t3.unittype = @unittype
 	AND t3.accountingunit = @accountingunit
 	AND t1.Source LIKE CONCAT('%',@unittype,'工作量%')
@@ -195,11 +194,10 @@ public IEnumerable<ex_result> QueryIncomeData(int allotid, string accountingunit
                 if (connection.State != ConnectionState.Open) connection.Open();
                 try
                 {
-                    string clear = @"SELECT DISTINCT t3.AccountingUnit as Department,ifnull(t1.DoctorName, '未知') DoctorName,if(ifnull(t2.PersonnelNumber,'')='', t2.JobNumber, t2.PersonnelNumber) PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1
-	LEFT JOIN per_employee t2 on t1.personnelnumber = t2.jobnumber
+                    string clear = @"SELECT DISTINCT t3.AccountingUnit as Department,ifnull(t1.DoctorName, '未知') DoctorName,if(ifnull(t2.PersonnelNumber,'')='',ifnull(t2.JobNumber,ifnull(t1.DoctorName, '未知')), t2.PersonnelNumber) PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1
+	LEFT JOIN per_employee t2 on t1.personnelnumber = t2.jobnumber AND t2.allotid = @allotid
 	JOIN (select distinct AccountingUnit,HISDeptName,unittype from per_dept_dic where HospitalId = @hospitalid) t3 ON t1.Department = t3.HISDeptName
 WHERE t1.allotid = @allotid
-	AND t2.allotid = @allotid
 	AND t3.unittype = @unittype
 	AND t3.accountingunit = @accountingunit
 	AND t1.Source like '%门诊开单%'