Merge branch 'xt_statistics_branch'

controllers/schedule_api_controller.go

@@ -782,7 +782,7 @@ func (this *ScheduleApiController) ExportSchedule() {
 					err_log := models.ExportErrLog{
 						LogType:    2,
 						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg:     "存在同名同姓的两个病人",
+						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列" + "患者姓名为" + name + "在当前机构中存在重名，无法确定到具体患者",
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),
@@ -1336,7 +1336,7 @@ func (this *ScheduleApiController) ExportScheduleTemplate() {
 					err_log := models.ExportErrLog{
 						LogType:    3,
 						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg:     "存在同名同姓的两个病人",
+						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列" + "患者姓名为" + name + "在当前机构中存在重名，无法确定到具体患者",
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),