Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/dialysis_record_api_controller.go

@@ -2039,6 +2039,9 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 
 	schedule, err := service.GetDayScheduleByBedid(adminUserInfo.CurrentOrgId, schedulestartTime, bedID, schedual_type)
 
+	//查询该床位是否有人用了
+	order, order_err := service.GetDialysisOrderByBedId(adminUserInfo.CurrentOrgId, schedulestartTime, bedID, schedual_type)
+
 	if err == gorm.ErrRecordNotFound { //空床位
 		// 修改了床位逻辑
 		daySchedule, _ := service.GetDaySchedule(adminUserInfo.CurrentOrgId, schedulestartTime, scheduleendTime, patientID)
@@ -2056,17 +2059,42 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 
 	} else if err == nil {
 		if schedule.ID > 0 && schedule.DialysisOrder.ID == 0 { //有排班没上机记录
-			daySchedule, _ := service.GetDaySchedule(adminUserInfo.CurrentOrgId, schedulestartTime, scheduleendTime, patientID)
-			if daySchedule.ID > 0 {
-				daySchedule.PartitionId = deviceNumber.ZoneID
-				daySchedule.BedId = bedID
-				daySchedule.ScheduleType = schedual_type
-				daySchedule.UpdatedTime = time.Now().Unix()
-				err := service.UpdateSchedule(&daySchedule)
-				if err != nil {
-					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+
+			if order_err == nil {
+				if order.ID > 0 { //该机位被其他人占用了
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
 					return
+
+				} else {
+					daySchedule, _ := service.GetDaySchedule(adminUserInfo.CurrentOrgId, schedulestartTime, scheduleendTime, patientID)
+					if daySchedule.ID > 0 {
+						daySchedule.PartitionId = deviceNumber.ZoneID
+						daySchedule.BedId = bedID
+						daySchedule.ScheduleType = schedual_type
+						daySchedule.UpdatedTime = time.Now().Unix()
+						err := service.UpdateSchedule(&daySchedule)
+						if err != nil {
+							this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+					}
 				}
+			} else if order_err == gorm.ErrRecordNotFound { //该床位没被占用
+				daySchedule, _ := service.GetDaySchedule(adminUserInfo.CurrentOrgId, schedulestartTime, scheduleendTime, patientID)
+				if daySchedule.ID > 0 {
+					daySchedule.PartitionId = deviceNumber.ZoneID
+					daySchedule.BedId = bedID
+					daySchedule.ScheduleType = schedual_type
+					daySchedule.UpdatedTime = time.Now().Unix()
+					err := service.UpdateSchedule(&daySchedule)
+					if err != nil {
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+				}
+			} else if order_err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
 			}
 		} else if schedule.ID > 0 && schedule.DialysisOrder.ID > 0 { //有排班且有上机记录
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2574,6 +2574,9 @@ func (this *DialysisAPIController) StartDialysis() {
 
 	schedule, err := service.GetDayScheduleByBedid(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
 
+	//查询该床位是否有人用了
+	order, order_err := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
+
 	if err == gorm.ErrRecordNotFound { //空床位
 		// 修改了床位逻辑
 		daySchedule, _ := service.GetDaySchedule(adminUserInfo.Org.Id, schedulestartTime, scheduleendTime, patientID)
@@ -2591,16 +2594,38 @@ func (this *DialysisAPIController) StartDialysis() {
 
 	} else if err == nil {
 		if schedule.ID > 0 && schedule.DialysisOrder.ID == 0 { //有排班没上机记录
-			daySchedule, _ := service.GetDaySchedule(adminUserInfo.Org.Id, schedulestartTime, scheduleendTime, patientID)
-			if daySchedule.ID > 0 {
-				daySchedule.PartitionId = deviceNumber.ZoneID
-				daySchedule.BedId = bedID
-				daySchedule.ScheduleType = schedual_type
-				daySchedule.UpdatedTime = time.Now().Unix()
-				err := service.UpdateSchedule(&daySchedule)
-				if err != nil {
-					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+
+			if order_err == nil {
+				if order.ID > 0 { //该机位被其他人占用了
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
 					return
+
+				} else {
+					daySchedule, _ := service.GetDaySchedule(adminUserInfo.Org.Id, schedulestartTime, scheduleendTime, patientID)
+					if daySchedule.ID > 0 {
+						daySchedule.PartitionId = deviceNumber.ZoneID
+						daySchedule.BedId = bedID
+						daySchedule.ScheduleType = schedual_type
+						daySchedule.UpdatedTime = time.Now().Unix()
+						err := service.UpdateSchedule(&daySchedule)
+						if err != nil {
+							this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+					}
+				}
+			} else if order_err == gorm.ErrRecordNotFound { //该床位没被占用
+				daySchedule, _ := service.GetDaySchedule(adminUserInfo.Org.Id, schedulestartTime, scheduleendTime, patientID)
+				if daySchedule.ID > 0 {
+					daySchedule.PartitionId = deviceNumber.ZoneID
+					daySchedule.BedId = bedID
+					daySchedule.ScheduleType = schedual_type
+					daySchedule.UpdatedTime = time.Now().Unix()
+					err := service.UpdateSchedule(&daySchedule)
+					if err != nil {
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
 				}
 			}
 		} else if schedule.ID > 0 && schedule.DialysisOrder.ID > 0 { //有排班且有上机记录

service/schedule_service.go

@@ -393,3 +393,8 @@ func FindSchedualTemplateExportLog(org_id int64, export_time int64) (errLogs []*
 	err = readDb.Model(&models.ExportErrLog{}).Where("user_org_id = ? AND export_time = ? AND log_type = 3", org_id, export_time).Find(&errLogs).Error
 	return
 }
+
+func GetDialysisOrderByBedId(orgID, start, bed_id int64, schedule_type int64) (schedule models.DialysisOrder, err error) {
+	err = readDb.Model(&models.DialysisOrder{}).Where("user_org_id=?  and dialysis_date=? and bed_id=? and status=1 AND schedual_type = ?", orgID, start, bed_id, schedule_type).First(&schedule).Error
+	return
+}