Merge branch 'xt_statistics_branch'

controllers/schedule_api_controller.go

@@ -10,6 +10,7 @@ import (
 	"github.com/jinzhu/gorm"
 	"reflect"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/astaxie/beego"
@@ -621,11 +622,6 @@ func (this *ScheduleApiController) SearchSchedulePatients() {
 
 }
 
-type aa struct {
-	b int64
-	c int64
-}
-
 func (this *ScheduleApiController) GetWeekDaySchedule() {
 	week_type, _ := this.GetInt64("week_type", -1)
 	fmt.Println(week_type)
@@ -757,7 +753,7 @@ func (this *ScheduleApiController) ExportSchedule() {
 			} else {
 				var patient []*models.Patients
 				for _, item := range patients {
-					if item.Name == name {
+					if strings.Replace(item.Name, " ", "", -1) == name {
 						patient = append(patient, item)
 					}
 				}
@@ -765,7 +761,7 @@ func (this *ScheduleApiController) ExportSchedule() {
 					err_log := models.ExportErrLog{
 						LogType:    2,
 						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列的姓名在系统中不存在,请在系统中添加该病人",
+						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列,患者姓名为\"" + name + "\"在系统中不存在,请在系统中添加该病人",
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),
@@ -780,9 +776,12 @@ func (this *ScheduleApiController) ExportSchedule() {
 				} else if len(patient) > 1 { //出现同名的情况
 
 					err_log := models.ExportErrLog{
-						LogType:    2,
-						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列" + "患者姓名为" + name + "在当前机构中存在重名，无法确定到具体患者",
+						LogType:   2,
+						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
+						//ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列" + "患者姓名为" + name + "在当前机构中存在重名，无法确定到具体患者",
+
+						ErrMsg: "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列,患者姓名为\"" + name + "\"在在当前机构中存在重名，无法确定到具体患者",
+
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),
@@ -1311,15 +1310,17 @@ func (this *ScheduleApiController) ExportScheduleTemplate() {
 			} else {
 				var patient []*models.Patients
 				for _, item := range patients {
-					if item.Name == name {
+					if strings.Replace(item.Name, " ", "", -1) == name {
 						patient = append(patient, item)
 					}
 				}
 				if len(patient) == 0 { //错误日志
 					err_log := models.ExportErrLog{
-						LogType:    3,
-						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列的姓名在系统中不存在,请在系统中添加该病人",
+						LogType:   3,
+						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
+						//ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列的姓名在系统中不存在,请在系统中添加该病人",
+						ErrMsg: "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列患者姓名为\"" + name + "\"在系统中不存在,请在系统中添加该病人",
+
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),
@@ -1334,9 +1335,11 @@ func (this *ScheduleApiController) ExportScheduleTemplate() {
 				} else if len(patient) > 1 { //出现同名的情况
 
 					err_log := models.ExportErrLog{
-						LogType:    3,
-						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列" + "患者姓名为" + name + "在当前机构中存在重名，无法确定到具体患者",
+						LogType:   3,
+						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
+						//ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列" + "患者姓名为" + name + "在当前机构中存在重名，无法确定到具体患者",
+						ErrMsg: "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列患者姓名为\"" + name + "\"在当前机构中存在重名，无法确定到具体患者",
+
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),