Browse Source

历史排班

28169 1 year ago
parent
commit
f618e2e138

+ 4 - 4
controllers/base_api_controller.go View File

81
 		userAdmin.ModifyTime = 1530786071
81
 		userAdmin.ModifyTime = 1530786071
82
 		var subscibe models.ServeSubscibe
82
 		var subscibe models.ServeSubscibe
83
 		subscibe.ID = 11
83
 		subscibe.ID = 11
84
-		subscibe.OrgId = 10579 //机构id 10344
84
+		subscibe.OrgId = 10537 //机构id 10344
85
 		subscibe.PeriodStart = 1547447814
85
 		subscibe.PeriodStart = 1547447814
86
 		subscibe.PeriodEnd = 1550039814
86
 		subscibe.PeriodEnd = 1550039814
87
 		subscibe.State = 1
87
 		subscibe.State = 1
91
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
91
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
92
 		subscibes[4] = &subscibe
92
 		subscibes[4] = &subscibe
93
 		var adminUserInfo service.AdminUserInfo
93
 		var adminUserInfo service.AdminUserInfo
94
-		adminUserInfo.CurrentOrgId = 10579 //机构id小英9675或4
94
+		adminUserInfo.CurrentOrgId = 10537 //机构id小英9675或4
95
 		adminUserInfo.CurrentAppId = 3244  //4
95
 		adminUserInfo.CurrentAppId = 3244  //4
96
 		adminUserInfo.AdminUser = &userAdmin
96
 		adminUserInfo.AdminUser = &userAdmin
97
 		adminUserInfo.Subscibes = subscibes
97
 		adminUserInfo.Subscibes = subscibes
326
 		userAdmin.ModifyTime = 1530786071
326
 		userAdmin.ModifyTime = 1530786071
327
 		var subscibe models.ServeSubscibe
327
 		var subscibe models.ServeSubscibe
328
 		subscibe.ID = 11
328
 		subscibe.ID = 11
329
-		subscibe.OrgId = 10579 //机构id小英10344或4
329
+		subscibe.OrgId = 10537 //机构id小英10344或4
330
 		subscibe.PeriodStart = 1538035409
330
 		subscibe.PeriodStart = 1538035409
331
 		subscibe.PeriodEnd = 1569571409
331
 		subscibe.PeriodEnd = 1569571409
332
 		subscibe.State = 1
332
 		subscibe.State = 1
336
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
336
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
337
 		subscibes[4] = &subscibe
337
 		subscibes[4] = &subscibe
338
 		var adminUserInfo service.AdminUserInfo
338
 		var adminUserInfo service.AdminUserInfo
339
-		adminUserInfo.CurrentOrgId = 10579 //机构id小英9675或4
339
+		adminUserInfo.CurrentOrgId = 10537 //机构id小英9675或4
340
 		adminUserInfo.CurrentAppId = 3244  //4
340
 		adminUserInfo.CurrentAppId = 3244  //4
341
 		adminUserInfo.AdminUser = &userAdmin
341
 		adminUserInfo.AdminUser = &userAdmin
342
 		adminUserInfo.Subscibes = subscibes
342
 		adminUserInfo.Subscibes = subscibes

+ 2 - 2
controllers/dialysis_api_controller.go View File

2536
 		if dialysisFinish.ID == 0 {
2536
 		if dialysisFinish.ID == 0 {
2537
 			service.CreateDialysisFinish(finish)
2537
 			service.CreateDialysisFinish(finish)
2538
 		}
2538
 		}
2539
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 {
2539
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 {
2540
 			var dewater_amount float64
2540
 			var dewater_amount float64
2541
 			dewater_amount = 0
2541
 			dewater_amount = 0
2542
 			if dry_weight > 0 {
2542
 			if dry_weight > 0 {
2543
 				dewater_amount = weight_before - dry_weight - additional_weight
2543
 				dewater_amount = weight_before - dry_weight - additional_weight
2544
 
2544
 
2545
-				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 {
2545
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 {
2546
 					dewater_amount = dewater_amount * 1000
2546
 					dewater_amount = dewater_amount * 1000
2547
 				}
2547
 				}
2548
 
2548
 

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

2596
 			lastprescription, _ := service.GetLastDialysisPrescriptionByPatientIdTwo(adminUserInfo.Org.Id, id, recordDate.Unix())
2596
 			lastprescription, _ := service.GetLastDialysisPrescriptionByPatientIdTwo(adminUserInfo.Org.Id, id, recordDate.Unix())
2597
 			tempassessmentAfterDislysis.ActualUltrafiltration = lastprescription.TargetUltrafiltration * 1000
2597
 			tempassessmentAfterDislysis.ActualUltrafiltration = lastprescription.TargetUltrafiltration * 1000
2598
 		}
2598
 		}
2599
+		if adminUserInfo.Org.Id == 10580 {
2600
+			tempassessmentAfterDislysis.ActualUltrafiltration = 0
2601
+		}
2599
 
2602
 
2600
 	}
2603
 	}
2601
 
2604
 

+ 2 - 2
controllers/mobile_api_controllers/patient_api_controller.go View File

2600
 	if evaluation.DryWeight > 0 {
2600
 	if evaluation.DryWeight > 0 {
2601
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
2601
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
2602
 
2602
 
2603
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 {
2603
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 {
2604
 
2604
 
2605
-			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 {
2605
+			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 {
2606
 				dewater_amount = dewater_amount * 1000
2606
 				dewater_amount = dewater_amount * 1000
2607
 			}
2607
 			}
2608
 
2608
 

+ 1 - 0
models/user_models.go View File

198
 	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
198
 	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
199
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
199
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
200
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
200
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
201
+	BloodAccessPartId          string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
201
 }
202
 }
202
 
203
 
203
 func (XtDialysisPrescription) TableName() string {
204
 func (XtDialysisPrescription) TableName() string {