Browse Source

历史排班

28169 1 year ago
parent
commit
5f3fa5dcf8

BIN
XT_New.exe View File


+ 4 - 3
controllers/mobile_api_controllers/dialysis_api_controller.go View File

3217
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
3217
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
3218
 
3218
 
3219
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
3219
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
3220
-			if (template.TemplateId == 6 || template.TemplateId == 32 || template.TemplateId == 65) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
3220
+			if (template.TemplateId == 6 || template.TemplateId == 32 || template.TemplateId == 65 || adminUserInfo.Org.Id == 10375) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
3221
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
3221
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
3222
 			}
3222
 			}
3223
 
3223
 
4173
 
4173
 
4174
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
4174
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
4175
 			fmt.Println("hahhdahahah", template.TemplateId)
4175
 			fmt.Println("hahhdahahah", template.TemplateId)
4176
-			if (template.TemplateId == 6 || template.TemplateId == 65) && adminInfo.Org.Id != 9538 {
4176
+			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375) && adminInfo.Org.Id != 9538 {
4177
 				fmt.Println("hahhdahahah")
4177
 				fmt.Println("hahhdahahah")
4178
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
4178
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
4179
 				record.UltrafiltrationRate = ultrafiltration_rate
4179
 				record.UltrafiltrationRate = ultrafiltration_rate
4233
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
4233
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
4234
 
4234
 
4235
 			}
4235
 			}
4236
+
4236
 			//if template.TemplateId == 47 {
4237
 			//if template.TemplateId == 47 {
4237
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
4238
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
4238
 			//	record.UltrafiltrationRate = ultrafiltration_rate
4239
 			//	record.UltrafiltrationRate = ultrafiltration_rate
4259
 	}
4260
 	}
4260
 
4261
 
4261
 	//长沙南雅
4262
 	//长沙南雅
4262
-	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 {
4263
+	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 {
4263
 
4264
 
4264
 		if ultrafiltration_rate > 0 {
4265
 		if ultrafiltration_rate > 0 {
4265
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
4266
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)

+ 8 - 8
service/mobile_dialysis_service.go View File

2486
 func MobileGetLastDialysisPrescribeByModeIdSix(orgID int64, patientID int64, mode_id int64) (*models.DialysisPrescription, error) {
2486
 func MobileGetLastDialysisPrescribeByModeIdSix(orgID int64, patientID int64, mode_id int64) (*models.DialysisPrescription, error) {
2487
 	var record models.DialysisPrescription
2487
 	var record models.DialysisPrescription
2488
 	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1  AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
2488
 	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1  AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
2489
-	if err != nil {
2490
-		if err == gorm.ErrRecordNotFound {
2491
-			return nil, nil
2492
-		} else {
2493
-			return nil, err
2494
-		}
2495
-	}
2496
-	return &record, nil
2489
+	//if err != nil {
2490
+	//	if err == gorm.ErrRecordNotFound {
2491
+	//		return nil, nil
2492
+	//	} else {
2493
+	//		return nil, err
2494
+	//	}
2495
+	//}
2496
+	return &record, err
2497
 }
2497
 }
2498
 
2498
 
2499
 func MobileGetLastDialysisPrescribeByModeId(orgID int64, patientID int64, mode_id int64) (*models.DialysisPrescription, error) {
2499
 func MobileGetLastDialysisPrescribeByModeId(orgID int64, patientID int64, mode_id int64) (*models.DialysisPrescription, error) {