修改bug

controllers/gobal_config_api_controller.go

@@ -1174,6 +1174,7 @@ func RemoveRepeatedOrgElement(orgs []*models.Org) (newOrgs []*models.Org) {
 }
 
 func (this *GobalConfigApiController) GenerateLog() {
+
 	log_type, _ := this.GetInt64("log_type", 0)
 	logs, err := service.GetExportLogByType(this.GetAdminUserInfo().CurrentOrgId, log_type)
 	if err != nil {

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -116,7 +116,6 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 			} else {
 				roles = strings.Split(role.RoleIds, ",")
 			}
-			fmt.Println(roles)
 
 			//获取该用户下所有角色的权限总集
 			var userRolePurviews string
@@ -132,7 +131,6 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 			}
 			//该用户所拥有角色的权限的总集
 			userRolePurviewsArr = RemoveRepeatedPurviewElement(strings.Split(userRolePurviews, ","))
-			fmt.Println(userRolePurviewsArr)
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
 
@@ -146,8 +144,6 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 					//获取该角色的所有权限
 					for _, items := range userRolePurviewsArr {
 						id, _ := strconv.ParseInt(items, 10, 64)
-						fmt.Println(id)
-						fmt.Println(item.ID)
 
 						if id == item.ID {
 							isPermission = true

controllers/mobile_api_controllers/patient_api_controller.go

@@ -715,31 +715,23 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 	var ids []string
 	if groupno == 0 {
 		advice_ids := c.GetString("advice_id")
-		ids = strings.Split(advice_ids, ",")
-		if len(ids) <= 0 {
+		if advice_ids == "" {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
+		} else {
+			ids = strings.Split(advice_ids, ",")
+			if len(ids) <= 0 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
 		}
 	}
-
 	if groupno < 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
 
 	adminUserInfo := c.GetMobileAdminUserInfo()
-	//
-	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-	//if appRole.UserType != 3 {
-	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-	//	if getPermissionErr != nil {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//		return
-	//	} else if headNursePermission == nil {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-	//		return
-	//	}
-	//}
 
 	var advice models.DoctorAdvice
 
@@ -775,7 +767,6 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
 			return
 		}
-
 	}
 
 	checker := adminUserInfo.AdminUser.Id
@@ -786,13 +777,22 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		Checker:     checker,
 		UpdatedTime: time.Now().Unix(),
 	}
-	fmt.Println()
-
 	var err error
 	if groupno > 0 {
 		err = service.CheckDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
 	} else {
-		err = service.BatchCheckOldDoctorAdvice(&advices, ids)
+
+		if len(ids[0]) <= 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
+			return
+		} else {
+			t := time.Now().Format("2006-01-02")
+			timeLayout2 := "2006-01-02"
+			loc, _ := time.LoadLocation("Local")
+			theTime, _ := time.ParseInLocation(timeLayout2, t, loc)
+			err = service.BatchCheckOldDoctorAdvice(&advices, ids, adminUserInfo.Org.Id, theTime.Unix())
+
+		}
 	}
 
 	if err != nil {

controllers/schedule_api_controller.go

@@ -715,12 +715,18 @@ func (this *ScheduleApiController) ExportSchedule() {
 	utils.ErrorLog("%v", dataBody)
 	export_time := time.Now().Unix()
 	var schedules []*models.Schedule
+	var failed_total int
 	var total_schedule []interface{}
-
 	var patients []*models.Patients
 
 	patients, _, _ = service.GetAllPatientList(this.GetAdminUserInfo().CurrentOrgId)
 
+	if dataBody["failed_schedule"] != nil || reflect.TypeOf(dataBody["failed_schedule"]).String() == "[]interface {}" {
+		tempSchedule := dataBody["failed_schedule"].([]interface{})
+		failed_total = len(tempSchedule)
+
+	}
+
 	if dataBody["schedule"] != nil || reflect.TypeOf(dataBody["schedule"]).String() == "[]interface {}" {
 		tempSchedule := dataBody["schedule"].([]interface{})
 		total_schedule = tempSchedule
@@ -798,8 +804,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -835,8 +841,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -868,8 +874,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 					log := models.ExportLog{
 						LogType:    2,
 						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						TotalNum:   int64(len(total_schedule)),
-						FailNum:    1,
+						TotalNum:   int64(len(total_schedule) + failed_total),
+						FailNum:    1 + int64(failed_total),
 						SuccessNum: int64(len(schedules)),
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),
@@ -907,8 +913,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -940,8 +946,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 						log := models.ExportLog{
 							LogType:    2,
 							UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-							TotalNum:   int64(len(total_schedule)),
-							FailNum:    1,
+							TotalNum:   int64(len(total_schedule) + failed_total),
+							FailNum:    1 + int64(failed_total),
 							SuccessNum: int64(len(schedules)),
 							CreateTime: time.Now().Unix(),
 							UpdateTime: time.Now().Unix(),
@@ -971,8 +977,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 						log := models.ExportLog{
 							LogType:    2,
 							UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-							TotalNum:   int64(len(total_schedule)),
-							FailNum:    1,
+							TotalNum:   int64(len(total_schedule) + failed_total),
+							FailNum:    1 + int64(failed_total),
 							SuccessNum: int64(len(schedules)),
 							CreateTime: time.Now().Unix(),
 							UpdateTime: time.Now().Unix(),
@@ -1008,8 +1014,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -1038,8 +1044,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -1078,8 +1084,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -1106,8 +1112,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -1157,8 +1163,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    int64(len(errLogs)),
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    int64(len(errLogs) + failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -1167,9 +1173,23 @@ func (this *ScheduleApiController) ExportSchedule() {
 				}
 				service.CreateExportLog(&log)
 
+				if failed_total > 0 {
+					err_log := models.ExportErrLog{
+						LogType:   2,
+						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
+						ErrMsg: "当前日期(" + this.GetString("date") + " " + GetWeekString(time.Now().Weekday().String()) +
+							")及以前的排班数据" + strconv.FormatInt(int64(failed_total), 10) + "条，不执行导入",
+						Status:     1,
+						CreateTime: time.Now().Unix(),
+						UpdateTime: time.Now().Unix(),
+						ExportTime: export_time,
+					}
+					service.CreateExportErrLog(&err_log)
+				}
+
 				this.ServeSuccessJSON(map[string]interface{}{
 					"msg":         "导入成功",
-					"total_num":   len(total_schedule),
+					"total_num":   len(total_schedule) + failed_total,
 					"success_num": len(schedules),
 					"fail_num":    int64(len(errLogs)),
 				})
@@ -1177,8 +1197,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    int64(len(errLogs)),
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    int64(len(errLogs) + failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -1187,6 +1207,20 @@ func (this *ScheduleApiController) ExportSchedule() {
 				}
 				service.CreateExportLog(&log)
 
+				if failed_total > 0 {
+					err_log := models.ExportErrLog{
+						LogType:   2,
+						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
+						ErrMsg: "当前日期(" + this.GetString("date") + " " + GetWeekString(time.Now().Weekday().String()) +
+							")及以前的排班数据" + strconv.FormatInt(int64(failed_total), 10) + "条，不执行导入",
+						Status:     1,
+						CreateTime: time.Now().Unix(),
+						UpdateTime: time.Now().Unix(),
+						ExportTime: export_time,
+					}
+					service.CreateExportErrLog(&err_log)
+				}
+
 				this.ServeSuccessJSON(map[string]interface{}{
 					"msg":         "导入成功",
 					"total_num":   len(total_schedule),
@@ -1198,8 +1232,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 			log := models.ExportLog{
 				LogType:    2,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				TotalNum:   int64(len(total_schedule)),
-				FailNum:    int64(len(errLogs)),
+				TotalNum:   int64(len(total_schedule) + failed_total),
+				FailNum:    int64(len(errLogs) + failed_total),
 				SuccessNum: int64(len(schedules)),
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -1208,6 +1242,20 @@ func (this *ScheduleApiController) ExportSchedule() {
 			}
 			service.CreateExportLog(&log)
 
+			if failed_total > 0 {
+				err_log := models.ExportErrLog{
+					LogType:   2,
+					UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
+					ErrMsg: "当前日期(" + this.GetString("date") + " " + GetWeekString(time.Now().Weekday().String()) +
+						")及以前的排班数据" + strconv.FormatInt(int64(failed_total), 10) + "条，不执行导入",
+					Status:     1,
+					CreateTime: time.Now().Unix(),
+					UpdateTime: time.Now().Unix(),
+					ExportTime: export_time,
+				}
+				service.CreateExportErrLog(&err_log)
+			}
+
 			this.ServeSuccessJSON(map[string]interface{}{
 				"msg":         "导入成功",
 				"total_num":   len(total_schedule),
@@ -1645,3 +1693,37 @@ func (c *ScheduleApiController) GetInitExcelInitDate() {
 	})
 	return
 }
+
+func GetWeekString(week string) string {
+	var weekStr string
+	switch week {
+	case "Sunday":
+		weekStr = "周日"
+		break
+	case "Monday":
+		weekStr = "周一"
+		break
+	case "Tuesday":
+		weekStr = "周二"
+		break
+	case "Wednesday":
+		weekStr = "周三"
+		break
+	case "Thursday":
+		weekStr = "周四"
+
+		break
+	case "Friday":
+		weekStr = "周五"
+
+		break
+	case "Saturday":
+		weekStr = "周六"
+		break
+	default:
+		weekStr = ""
+		break
+
+	}
+	return weekStr
+}

service/dialysis_service.go

@@ -884,15 +884,16 @@ func BatchExceOldDoctorAdvice(m *models.DoctorAdvice, ids []string) (err error)
 	return err
 }
 
-func BatchCheckOldDoctorAdvice(m *models.DoctorAdvice, ids []string) (err error) {
+func BatchCheckOldDoctorAdvice(m *models.DoctorAdvice, ids []string, org_id int64, date int64) (err error) {
 
 	ut := writeDb.Begin()
-	err = writeDb.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?)", ids).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
+	err = writeDb.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?) AND user_org_id = ? AND advice_date = ?", ids, org_id, date).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
 	if err != nil {
 		ut.Rollback()
 		return
 	}
-	err = writeDb.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?)", ids).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
+
+	err = writeDb.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?) AND user_org_id = ? AND advice_date = ?", ids, org_id, date).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
 	if err != nil {
 		ut.Rollback()
 		return

service/schedule_service.go

@@ -356,7 +356,7 @@ func FindSchPatientNameByName(name string, user_org_id int64) (patient []*models
 }
 
 func UpdateScheduleStatus(date int64, org_id int64) (err error) {
-	err = readDb.Model(&models.Schedule{}).Where("user_org_id = ? AND schedule_date >= ? AND status = 1", org_id, date).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err = readDb.Model(&models.Schedule{}).Where("user_org_id = ? AND schedule_date > ? AND status = 1", org_id, date).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return
 }