历史排班

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -90,7 +90,7 @@ func (this *DialysisAPIController) Scheduals() {
 	scheduals_json_str, _ := redis.Get(key).Result()
 
 	patients, _ := service.GetAllPatientListSix(orgID)
-	fmt.Println("scheduals_json_strwoowowow", len(scheduals_json_str))
+
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)
 
@@ -101,7 +101,7 @@ func (this *DialysisAPIController) Scheduals() {
 			solution, _ := service.GetMonitDialysisSolution(item.UserOrgId, item.PatientId, item.ModeId)
 			item.DialysisSolution = solution
 		}
-		fmt.Println("len2223o32o23o23owo", len(scheduals))
+
 		if err != nil {
 			this.ErrorLog("获取排班信息失败:%v", err)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -2827,6 +2827,7 @@ func (c *DialysisAPIController) Finish() {
 					}
 				}
 			}
+
 		}
 
 		dialysisOrder.Stage = 2
@@ -2835,17 +2836,41 @@ func (c *DialysisAPIController) Finish() {
 		dialysisOrder.FinishModifier = adminUserInfo.AdminUser.Id
 		dialysisOrder.EndTime = endDate.Unix()
 
+		fmt.Println("ADMINWOOWOWOWOWO", adminUserInfo.Org.Id)
+
 		// 长沙南雅需求
-		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10340 {
+		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9675 {
 
 			//获取最后1条监测的数据
 			fristrecordone, _ := service.FindFirstMonitorRecordToday(dialysisOrder.PatientId, dialysisOrder.UserOrgId, dialysisOrder.DialysisDate)
 			lastrecord, _ := service.FindLastMonitorRecordToday(dialysisOrder.PatientId, dialysisOrder.UserOrgId, dialysisOrder.DialysisDate)
 			var accumulatedBloodVolume float64
 			accumulatedBloodVolume = (lastrecord.BloodFlowVolume - 25) * (math.Floor(float64(lastrecord.OperateTime-fristrecordone.OperateTime)/3600) * 60) / 1000
-			fmt.Println("累计血容量", accumulatedBloodVolume)
+
 			err := service.UpdateLastMonitorRecordToday(accumulatedBloodVolume, lastrecord.ID)
 			fmt.Println(err)
+
+			// 查询未执行的医嘱
+			doctorAdvice, _ := service.GetDoctorAdviceListNoExecution(dialysisOrder.PatientId, dialysisOrder.DialysisDate, dialysisOrder.UserOrgId)
+			fmt.Println("doctorAdviceWOWOOWOWOWOWOWOW", doctorAdvice)
+			for _, item := range doctorAdvice {
+				service.UpdateDoctorAdviceNoExecution(item.ID, dialysisOrder.FinishNurse, dialysisOrder.EndTime)
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+				redis := service.RedisClient()
+				//清空key 值
+				redis.Set(key, "", time.Second)
+				keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+				redis.Set(keyTwo, "", time.Second)
+				keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+				redis.Set(keyThree, "", time.Second)
+				toTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", recordDateStr)
+				theTime := toTime.Format("2006-01-02")
+				keyFour := "scheduals_" + theTime + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+				redis.Set(keyFour, "", time.Second)
+				keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+				redis.Set(keyFive, "", time.Second)
+				defer redis.Close()
+			}
 		}
 
 		go func() {

controllers/schedule_api_controller.go

@@ -3777,12 +3777,14 @@ func (this *ScheduleApiController) GetAllZones() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	zones, err := service.GetAllZoneOne(orgId)
+	devicenumber, err := service.GetAllBedNumberList(orgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"zones": zones,
+		"zones":        zones,
+		"devicenumber": devicenumber,
 	})
 }
 
@@ -4934,8 +4936,9 @@ func (c *ScheduleApiController) ChangeScheduleTen() {
 		sch, _ := service.GetScheduleByBedId(bed_id, schedule_type, adminINfo.CurrentOrgId, schedule.ScheduleDate)
 		fmt.Println("schwowowoowowowowowo", sch.ID)
 		if sch.ID == 0 {
-			//删除排班
-			service.UpdateScheduleByScheduleId(id)
+			////删除排班
+			//service.UpdateScheduleByScheduleId(id)
+
 			xtSchedule := models.XtSchedule{
 				UserOrgId:           adminINfo.CurrentOrgId,
 				PartitionId:         number.ZoneID,
@@ -4951,7 +4954,8 @@ func (c *ScheduleApiController) ChangeScheduleTen() {
 				IsExport:            999999,
 				DialysisMachineName: "",
 			}
-			service.CreateNewSchedule(xtSchedule)
+			//service.CreateNewSchedule(xtSchedule)
+			service.UpdateScheduleSixTy(id, xtSchedule)
 		}
 
 		//存在排班
@@ -4960,6 +4964,8 @@ func (c *ScheduleApiController) ChangeScheduleTen() {
 			//service.UpdateScheduleByScheduleId(id)
 			//查询该患者的透析模式对应的透析器灌流器
 			//service.GetDialysisSolutionByMode(schedule.PatientId)
+
+			fmt.Println("bed_id2oo2o2o22o", bed_id)
 			xtSchedule := models.XtSchedule{
 				UserOrgId:           adminINfo.CurrentOrgId,
 				PartitionId:         number.ZoneID,
@@ -4975,13 +4981,14 @@ func (c *ScheduleApiController) ChangeScheduleTen() {
 				IsExport:            8888,
 				DialysisMachineName: "",
 			}
-
+			// 旧的id
 			service.UpdateScheduleSixTy(sch.ID, xtSchedule)
 
+			fmt.Println("床位id", sch.BedId)
 			msch := models.XtSchedule{
 				UserOrgId:    adminINfo.CurrentOrgId,
-				PartitionId:  number.ZoneID,
-				BedId:        bed_id,
+				PartitionId:  sch.PartitionId,
+				BedId:        sch.BedId,
 				PatientId:    sch.PatientId,
 				ScheduleDate: sch.ScheduleDate,
 				ScheduleType: sch.ScheduleType,
@@ -4996,9 +5003,10 @@ func (c *ScheduleApiController) ChangeScheduleTen() {
 
 		}
 	}
-
+	scheduletwo, _ := service.GetSchedule(adminINfo.CurrentOrgId, id)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "ok",
+		"msg":      "ok",
+		"schedule": scheduletwo,
 	})
 
 }

models/patient_models.go

@@ -50,6 +50,7 @@ type MDialysisOrderForList struct {
 	DialysisIrrigation string                `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 	DialysisDialyszers string                `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	ScheduleRemark     string                `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
+	Url                string                `gorm:"column:url" json:"url" form:"url"`
 }
 
 func (MDialysisOrderForList) TableName() string {

service/dialysis_service.go

@@ -2348,3 +2348,17 @@ func GetMonitoringRecordList(patient_id int64, record_date int64) (record []*mod
 
 	return record, err
 }
+
+func GetDoctorAdviceListNoExecution(patient_id int64, dialysis_date int64, user_org_id int64) (doctor []*models.XtDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and advice_date = ? and user_org_id = ? and execution_state = 2 and status =1", patient_id, dialysis_date, user_org_id).Find(&doctor).Error
+
+	return doctor, err
+}
+
+func UpdateDoctorAdviceNoExecution(id int64, creator int64, end_time int64) error {
+
+	err := XTWriteDB().Model(&models.XtDoctorAdvice{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"execution_state": 1, "execution_staff": creator, "execution_time": end_time}).Error
+
+	return err
+}

service/mobile_dialysis_service.go

@@ -47,7 +47,7 @@ func MobileGetDialysisScheduals(orgID int64, scheduleDate int64, scheduleType in
 func GetMonitDialysisOrder(user_org_id int64, patient_id int64, scheduleDate int64) (*models.MDialysisOrderForList, error) {
 
 	order := models.MDialysisOrderForList{}
-	err := XTReadDB().Where("user_org_id = ? and status =1 and patient_id = ?", user_org_id, patient_id).Order("id asc").Last(&order).Error
+	err := XTReadDB().Where("user_org_id = ? and status =1 and patient_id = ?", user_org_id, patient_id).Order("id desc").Last(&order).Error
 	return &order, err
 }
 

service/patientmanage_service.go

@@ -1179,6 +1179,12 @@ func GetAllZoneOne(orgid int64) (zone []*models.DeviceZone, err error) {
 	return zone, err
 }
 
+func GetAllBedNumberList(orgid int64) (number []*models.DeviceNumber, err error) {
+
+	err = XTReadDB().Where("org_id =? and status =1", orgid).Find(&number).Error
+	return number, err
+}
+
 func GetAllGroupOne(orgid int64) (group []*models.DeviceGroup, err error) {
 
 	err = XTReadDB().Model(&group).Where("org_id =?", orgid).Find(&group).Error