历史排班

controllers/schedule_api_controller.go

@@ -103,7 +103,7 @@ func (c *ScheduleApiController) CoverSch() {
 	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderOne)
 	//	return
 	//}
-	order, _ := service.GetDialysisOrder(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
+	order, _ := service.GetOneDialysisOrderOne(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
 	if order.ID > 0 {
 
 		service.UpdateDialysiOrderByPatientId(id_two, sch_two.ScheduleType, sch_two.PartitionId, sch_two.BedId)
@@ -188,7 +188,7 @@ func (c *ScheduleApiController) ExchangeSch() {
 
 	err := service.UpdateScheduleThree(sch, sch_two)
 
-	order, _ := service.GetDialysisOrder(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
+	order, _ := service.GetOneDialysisOrderOne(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
 	if order.ID > 0 {
 		//查询该患者的排班机位
 		pSchedule, _ := service.GetPscheduleDate(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
@@ -1679,15 +1679,16 @@ func (c *ScheduleApiController) CreateScheduleTwo() {
 	tm := time.Unix(int64(schedule_two.ScheduleDate), 0)
 	timeStr := tm.Format(timeTemplate)
 	if timeNow > timeStr {
+		fmt.Println("寄哪里地方")
 		utils.ErrorLog(timeNow)
 		utils.ErrorLog(timeStr)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCantSetScheduleBeforeNow)
 		return
 	}
-	if schedule_two == nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeScheduleNotExist)
-		return
-	}
+	//if schedule_two == nil {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeScheduleNotExist)
+	//	return
+	//}
 
 	//order, err := service.GetOneDialysisOrder(adminINfo.CurrentOrgId, schedule_two.ScheduleDate, schedule_two.PatientId)
 	//if err != nil {
@@ -1896,57 +1897,52 @@ func (c *ScheduleApiController) CreateScheduleTwo() {
 	lastSchedule, _ := service.GetLastSchedule(patientID, adminUserInfo.CurrentOrgId)
 
 	//查询上机床位号 更改床位号
-	order, err := service.GetOneDialysisOrder(adminINfo.CurrentOrgId, schedule_two.ScheduleDate, schedule_two.PatientId)
-
+	order, err := service.GetOneDialysisOrderOne(adminINfo.CurrentOrgId, schedule_two.ScheduleDate, schedule_two.PatientId)
+	fmt.Println("errw222222222222222222", order.ID)
 	if order.ID > 0 {
 		service.UpdateDialysiOrderByPatientId(order.ID, schedule.ScheduleType, schedule.PartitionId, order.BedID)
 		redis := service.RedisClient()
-		key := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_order"
+		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_order"
 		redis.Set(key, "", time.Second)
-		keyOne := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
 
 		//清空key 值
 		redis.Set(keyOne, "", time.Second)
 
 	}
 
-	if err == nil {
-		redis := service.RedisClient()
-		key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
-		redis.Set(key, "", time.Second)
-		//处方
-		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
-		redis.Set(keyOne, "", time.Second)
-		//医嘱
-		keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":advice_list_all"
-		redis.Set(keyTwo, "", time.Second)
-		keySix := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_befores_list_all"
-		redis.Set(keySix, "", time.Second)
-		keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_after_dislysis_list_all"
-		redis.Set(keyThree, "", time.Second)
-		keyFour := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":monitor_record_list_all"
-		redis.Set(keyFour, "", time.Second)
-		keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":treatment_summarys_list_all"
-		redis.Set(keyFive, "", time.Second)
-		keySeven := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
-		redis.Set(keySeven, "", time.Second)
-		defer redis.Close()
-		schedule.Patient = patientInfo.Name
+	redis := service.RedisClient()
+	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+	redis.Set(key, "", time.Second)
+	//处方
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
+	redis.Set(keyOne, "", time.Second)
+	//医嘱
+	keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":advice_list_all"
+	redis.Set(keyTwo, "", time.Second)
+	keySix := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_befores_list_all"
+	redis.Set(keySix, "", time.Second)
+	keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_after_dislysis_list_all"
+	redis.Set(keyThree, "", time.Second)
+	keyFour := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":monitor_record_list_all"
+	redis.Set(keyFour, "", time.Second)
+	keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":treatment_summarys_list_all"
+	redis.Set(keyFive, "", time.Second)
+	keySeven := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
+	redis.Set(keySeven, "", time.Second)
+	defer redis.Close()
+	schedule.Patient = patientInfo.Name
 
-		//去除当天患者排班中重复数据，保留最后一条数据
-		service.UpdateRepeatSchStatus(schedule.UserOrgId, schedule.ScheduleDate)
+	//去除当天患者排班中重复数据，保留最后一条数据
+	service.UpdateRepeatSchStatus(schedule.UserOrgId, schedule.ScheduleDate)
 
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg":          "ok",
-			"schedule":     schedule,
-			"schedule_two": schedule_two,
-			"lastSchedule": lastSchedule,
-		})
-		return
-	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateScheduleFail)
-		return
-	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg":          "ok",
+		"schedule":     schedule,
+		"schedule_two": schedule_two,
+		"lastSchedule": lastSchedule,
+	})
+	return
 
 }
 

service/dialysis_service.go

@@ -1066,6 +1066,15 @@ func GetOneDialysisOrder(orgID, orderData int64, patient_id int64) (*models.Dial
 	return &order, nil
 }
 
+func GetOneDialysisOrderOne(orgID, orderData int64, patient_id int64) (models.DialysisOrder, error) {
+
+	order := models.DialysisOrder{}
+
+	err := readDb.Where("user_org_id=? and dialysis_date=? and status=1 and patient_id = ?", orgID, orderData, patient_id).Find(&order).Error
+
+	return order, err
+}
+
 func GetPscheduleDate(schedule_date int64, patient_id int64, user_org_id int64) (models.XtSchedule, error) {
 
 	schedule := models.XtSchedule{}