소스 검색

历史排班

28169 1 년 전
부모
커밋
d1ffc45d7f

BIN
XT_New.exe 파일 보기


+ 5 - 2
conf/app.conf 파일 보기

1
 appname = 血透
1
 appname = 血透
2
 httpport = 9531
2
 httpport = 9531
3
-runmode = dev
3
+runmode = prod
4
 #dev/prod
4
 #dev/prod
5
 
5
 
6
 #
6
 #
154
 
154
 
155
 sign_appid ="eac17a142dd046"
155
 sign_appid ="eac17a142dd046"
156
 serviceKye = "da8b09dce3684e6ebfbb7f70dba707a0"
156
 serviceKye = "da8b09dce3684e6ebfbb7f70dba707a0"
157
-serviceCode ="msg0001"
157
+#serviceCode ="msg0001"
158
+
159
+serviceCode ="signSDK0001S"
160
+
158
 
161
 
159
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
162
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
160
 readmysqlport = 3306
163
 readmysqlport = 3306

+ 4 - 4
controllers/base_api_controller.go 파일 보기

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 = 10191 //机构id 10344
84
+		subscibe.OrgId = 10340 //机构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 = 10191 //机构id小英9675或4
94
+		adminUserInfo.CurrentOrgId = 10340 //机构id小英9675或4
95
 		adminUserInfo.CurrentAppId = 3467  //4
95
 		adminUserInfo.CurrentAppId = 3467  //4
96
 		adminUserInfo.AdminUser = &userAdmin
96
 		adminUserInfo.AdminUser = &userAdmin
97
 		adminUserInfo.Subscibes = subscibes
97
 		adminUserInfo.Subscibes = subscibes
327
 		userAdmin.ModifyTime = 1530786071
327
 		userAdmin.ModifyTime = 1530786071
328
 		var subscibe models.ServeSubscibe
328
 		var subscibe models.ServeSubscibe
329
 		subscibe.ID = 11
329
 		subscibe.ID = 11
330
-		subscibe.OrgId = 10191 //机构id小英10344或4
330
+		subscibe.OrgId = 10340 //机构id小英10344或4
331
 		subscibe.PeriodStart = 1538035409
331
 		subscibe.PeriodStart = 1538035409
332
 		subscibe.PeriodEnd = 1569571409
332
 		subscibe.PeriodEnd = 1569571409
333
 		subscibe.State = 1
333
 		subscibe.State = 1
337
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
337
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
338
 		subscibes[4] = &subscibe
338
 		subscibes[4] = &subscibe
339
 		var adminUserInfo service.AdminUserInfo
339
 		var adminUserInfo service.AdminUserInfo
340
-		adminUserInfo.CurrentOrgId = 10191 //机构id小英9675或4
340
+		adminUserInfo.CurrentOrgId = 10340 //机构id小英9675或4
341
 		adminUserInfo.CurrentAppId = 3467  //4
341
 		adminUserInfo.CurrentAppId = 3467  //4
342
 		adminUserInfo.AdminUser = &userAdmin
342
 		adminUserInfo.AdminUser = &userAdmin
343
 		adminUserInfo.Subscibes = subscibes
343
 		adminUserInfo.Subscibes = subscibes

+ 5 - 0
controllers/mobile_api_controllers/dialysis_api_controller.go 파일 보기

2587
 		if adminUserInfo.Org.Id == 10485 {
2587
 		if adminUserInfo.Org.Id == 10485 {
2588
 			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
2588
 			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
2589
 		}
2589
 		}
2590
+		if adminUserInfo.Org.Id == 10551 {
2591
+			//获取最后一条透析处方数据
2592
+			lastprescription, _ := service.GetLastDialysisPrescriptionByPatientIdTwo(adminUserInfo.Org.Id, id, recordDate.Unix())
2593
+			tempassessmentAfterDislysis.ActualUltrafiltration = lastprescription.TargetUltrafiltration * 1000
2594
+		}
2590
 
2595
 
2591
 	}
2596
 	}
2592
 
2597
 

+ 6 - 5
controllers/schedule_api_controller.go 파일 보기

128
 	err := service.SaveSchTwo(sch, sch_two)
128
 	err := service.SaveSchTwo(sch, sch_two)
129
 	//生成新的排班
129
 	//生成新的排班
130
 	if err == nil {
130
 	if err == nil {
131
-		err2 := service.SaveSch(new_sch)
131
+		err2 := service.SaveSch(&new_sch)
132
 		if err2 == nil {
132
 		if err2 == nil {
133
 			c.ServeSuccessJSON(map[string]interface{}{
133
 			c.ServeSuccessJSON(map[string]interface{}{
134
-				"msg": "覆盖成功",
134
+				"msg":     "覆盖成功",
135
+				"new_sch": new_sch,
135
 			})
136
 			})
136
 		} else {
137
 		} else {
137
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
138
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
680
 					}
681
 					}
681
 
682
 
682
 					schedule.Status = 0
683
 					schedule.Status = 0
683
-					service.SaveSch(schedule)
684
+					service.SaveSch(&schedule)
684
 				}
685
 				}
685
 				HandleRedis(adminInfo.CurrentOrgId, schedule.ScheduleDate)
686
 				HandleRedis(adminInfo.CurrentOrgId, schedule.ScheduleDate)
686
 			}
687
 			}
833
 					}
834
 					}
834
 					schedule.DialysisMachineName = DialysisMachineName
835
 					schedule.DialysisMachineName = DialysisMachineName
835
 					schedule.IsExport = 3000
836
 					schedule.IsExport = 3000
836
-					service.SaveSch(schedule)
837
+					service.SaveSch(&schedule)
837
 				} else { //新的排班信息
838
 				} else { //新的排班信息
838
 
839
 
839
 					if items["schedule_date"] == nil || reflect.TypeOf(items["schedule_date"]).String() != "string" {
840
 					if items["schedule_date"] == nil || reflect.TypeOf(items["schedule_date"]).String() != "string" {
1015
 							daySchedule.BedId = schedule.BedId
1016
 							daySchedule.BedId = schedule.BedId
1016
 							daySchedule.DialysisMachineName = schedule.DialysisMachineName
1017
 							daySchedule.DialysisMachineName = schedule.DialysisMachineName
1017
 							existSchedule.IsExport = 3002
1018
 							existSchedule.IsExport = 3002
1018
-							service.SaveSch(daySchedule)
1019
+							service.SaveSch(&daySchedule)
1019
 						} else {
1020
 						} else {
1020
 							existSchedule.IsExport = 3003
1021
 							existSchedule.IsExport = 3003
1021
 							service.CreateScheduleTwo(&schedule)
1022
 							service.CreateScheduleTwo(&schedule)

+ 1 - 1
service/app_version.go 파일 보기

1036
 	return
1036
 	return
1037
 }
1037
 }
1038
 
1038
 
1039
-func SaveSch(sch models.Schedule) (err error) {
1039
+func SaveSch(sch *models.Schedule) (err error) {
1040
 	err = writeDb.Save(&sch).Error
1040
 	err = writeDb.Save(&sch).Error
1041
 	return
1041
 	return
1042
 }
1042
 }