Browse Source

历史排班

28169 1 year ago
parent
commit
b856533159

+ 26 - 5
controllers/mobile_api_controllers/dialysis_api_controller.go View File

3352
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
3352
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
3353
 
3353
 
3354
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
3354
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
3355
-			if (template.TemplateId == 6 || template.TemplateId == 32 || template.TemplateId == 65 || adminUserInfo.Org.Id == 10375 || template.TemplateId == 70) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
3355
+			if (template.TemplateId == 6 || template.TemplateId == 32 || template.TemplateId == 65 || adminUserInfo.Org.Id == 10375 || adminUserInfo.Org.Id == 10599) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
3356
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
3356
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
3357
 			}
3357
 			}
3358
 
3358
 
3359
+			if adminUserInfo.Org.Id == 10597 { //adminUserInfo.Org.Id == 9538
3360
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
3361
+			}
3362
+
3359
 			//针对医师汇
3363
 			//针对医师汇
3360
 			if adminUserInfo.Org.Id == 10121 {
3364
 			if adminUserInfo.Org.Id == 10121 {
3361
 				dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
3365
 				dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
4359
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
4363
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
4360
 
4364
 
4361
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
4365
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
4362
-			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375 || template.TemplateId == 70) && adminInfo.Org.Id != 9538 {
4366
+			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375 || adminInfo.Org.Id == 10599) && adminInfo.Org.Id != 9538 {
4363
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
4367
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
4364
 				record.UltrafiltrationRate = ultrafiltration_rate
4368
 				record.UltrafiltrationRate = ultrafiltration_rate
4365
 
4369
 
4366
 			}
4370
 			}
4367
 
4371
 
4372
+			if adminInfo.Org.Id == 10597 {
4373
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
4374
+				record.UltrafiltrationRate = ultrafiltration_rate
4375
+			}
4376
+
4368
 			if adminInfo.Org.Id == 10510 {
4377
 			if adminInfo.Org.Id == 10510 {
4369
 				record.UltrafiltrationRate = 0
4378
 				record.UltrafiltrationRate = 0
4370
 			}
4379
 			}
4435
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
4444
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
4436
 			}
4445
 			}
4437
 
4446
 
4447
+			if adminInfo.Org.Id == 10597 || adminInfo.Org.Id == 10599 {
4448
+				record.UltrafiltrationRate = 0
4449
+			}
4438
 			//if template.TemplateId == 47 {
4450
 			//if template.TemplateId == 47 {
4439
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
4451
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
4440
 			//	record.UltrafiltrationRate = ultrafiltration_rate
4452
 			//	record.UltrafiltrationRate = ultrafiltration_rate
4452
 		}
4464
 		}
4453
 	}
4465
 	}
4454
 
4466
 
4455
-	if template.TemplateId == 6 || template.TemplateId == 65 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 || template.TemplateId == 70 { //adminInfo.Org.Id == 9538
4467
+	if template.TemplateId == 6 || template.TemplateId == 65 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 || adminInfo.Org.Id == 10599 { //adminInfo.Org.Id == 9538
4456
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
4468
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
4457
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
4469
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
4458
 			record.UltrafiltrationVolume = ultrafiltration_volume
4470
 			record.UltrafiltrationVolume = ultrafiltration_volume
4460
 		}
4472
 		}
4461
 	}
4473
 	}
4462
 
4474
 
4475
+	if adminInfo.Org.Id == 10597 {
4476
+		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
4477
+		record.UltrafiltrationVolume = ultrafiltration_volume
4478
+	}
4479
+
4463
 	//长沙南雅
4480
 	//长沙南雅
4464
 	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 {
4481
 	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 {
4465
 
4482
 
4502
 	if adminInfo.Org.Id == 10510 {
4519
 	if adminInfo.Org.Id == 10510 {
4503
 		record.UltrafiltrationVolume = 0
4520
 		record.UltrafiltrationVolume = 0
4504
 	}
4521
 	}
4522
+	lastMonitorRecordList, _ := service.GetLastMonitorRecordList(patientID, monitorDate, adminInfo.Org.Id)
4505
 
4523
 
4506
 	this.ServeSuccessJSON(map[string]interface{}{
4524
 	this.ServeSuccessJSON(map[string]interface{}{
4507
-		"monitor": record,
4525
+		"monitor":               record,
4526
+		"lastMonitorRecordList": lastMonitorRecordList,
4508
 	})
4527
 	})
4509
 
4528
 
4510
 }
4529
 }
8145
 
8164
 
8146
 	start_time := c.GetString("start_time")
8165
 	start_time := c.GetString("start_time")
8147
 	end_time := c.GetString("end_time")
8166
 	end_time := c.GetString("end_time")
8167
+	schedule_type, _ := c.GetInt64("schedule_type")
8168
+	partion_id, _ := c.GetInt64("partion_id")
8148
 	orgId := c.GetMobileAdminUserInfo().Org.Id
8169
 	orgId := c.GetMobileAdminUserInfo().Org.Id
8149
 	timeLayout := "2006-01-02"
8170
 	timeLayout := "2006-01-02"
8150
 	loc, _ := time.LoadLocation("Local")
8171
 	loc, _ := time.LoadLocation("Local")
8167
 		}
8188
 		}
8168
 		endTime = theTime.Unix()
8189
 		endTime = theTime.Unix()
8169
 	}
8190
 	}
8170
-	schedulelist, _ := service.GetMobileScheduleListOne(startTime, endTime, orgId)
8191
+	schedulelist, _ := service.GetMobileScheduleListOne(startTime, endTime, orgId, schedule_type, partion_id)
8171
 
8192
 
8172
 	fmt.Println("schedulelist22222222", schedulelist)
8193
 	fmt.Println("schedulelist22222222", schedulelist)
8173
 	c.ServeSuccessJSON(map[string]interface{}{
8194
 	c.ServeSuccessJSON(map[string]interface{}{

+ 1 - 0
models/patient_models.go View File

487
 	MaxUltrafiltrationRate     string  `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
487
 	MaxUltrafiltrationRate     string  `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
488
 	WaterMachine               string  `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
488
 	WaterMachine               string  `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
489
 	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
489
 	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
490
+	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
490
 }
491
 }
491
 
492
 
492
 func (DialysisPrescriptionList) TableName() string {
493
 func (DialysisPrescriptionList) TableName() string {

+ 7 - 1
service/gobal_config_service.go View File

510
 	return
510
 	return
511
 }
511
 }
512
 
512
 
513
-func GetMobileScheduleListOne(start_time int64, end_time int64, org_id int64) (schedulelist []*models.XtScheduleList, err error) {
513
+func GetMobileScheduleListOne(start_time int64, end_time int64, org_id int64, schedule_type int64, partion_id int64) (schedulelist []*models.XtScheduleList, err error) {
514
 
514
 
515
 	db := XTReadDB().Model(&schedulelist).Where("status =1 and user_org_id =?", org_id)
515
 	db := XTReadDB().Model(&schedulelist).Where("status =1 and user_org_id =?", org_id)
516
 	if start_time > 0 {
516
 	if start_time > 0 {
519
 	if end_time > 0 {
519
 	if end_time > 0 {
520
 		db = db.Where("schedule_date<=?", end_time)
520
 		db = db.Where("schedule_date<=?", end_time)
521
 	}
521
 	}
522
+	if schedule_type > 0 {
523
+		db = db.Where("schedule_type =?", schedule_type)
524
+	}
525
+	if partion_id > 0 {
526
+		db = db.Where("partition_id = ?", partion_id)
527
+	}
522
 	err = db.Preload("DialysisSolution", "status=1 and user_org_id =? and solution_status =1", org_id).Preload("DialysisPrescription", "status=1 and user_org_id =?", org_id).Find(&schedulelist).Error
528
 	err = db.Preload("DialysisSolution", "status=1 and user_org_id =? and solution_status =1", org_id).Preload("DialysisPrescription", "status=1 and user_org_id =?", org_id).Find(&schedulelist).Error
523
 
529
 
524
 	return schedulelist, err
530
 	return schedulelist, err

+ 1 - 0
service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go View File

308
 	WhetherUnobstructed            int64   `gorm:"column:whether_unobstructed" json:"whether_unobstructed" form:"whether_unobstructed"`
308
 	WhetherUnobstructed            int64   `gorm:"column:whether_unobstructed" json:"whether_unobstructed" form:"whether_unobstructed"`
309
 	LienNecessary                  int64   `gorm:"column:lien_necessary" json:"lien_necessary" form:"lien_necessary"`
309
 	LienNecessary                  int64   `gorm:"column:lien_necessary" json:"lien_necessary" form:"lien_necessary"`
310
 	PathwayFormationTime           int64   `gorm:"column:pathway_formation_time" json:"pathway_formation_time" form:"pathway_formation_time"`
310
 	PathwayFormationTime           int64   `gorm:"column:pathway_formation_time" json:"pathway_formation_time" form:"pathway_formation_time"`
311
+	PunctureNeedleDirection        string  `gorm:"column:puncture_needle_direction" json:"puncture_needle_direction" form:"puncture_needle_direction"`
311
 }
312
 }
312
 
313
 
313
 func (AssessmentBeforeDislysisVM) TableName() string {
314
 func (AssessmentBeforeDislysisVM) TableName() string {