历史排班

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = dev
+runmode = prod
 #dev/prod
 
 #
@@ -154,7 +154,10 @@ front_end_domain = "http://xt.test.sgjyun.com/#"
 
 sign_appid ="eac17a142dd046"
 serviceKye = "da8b09dce3684e6ebfbb7f70dba707a0"
-serviceCode ="msg0001"
+#serviceCode ="msg0001"
+
+serviceCode ="signSDK0001S"
+
 
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/base_api_controller.go

@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10191 //机构id 10344
+		subscibe.OrgId = 10340 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -91,7 +91,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10191 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10340 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3467  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -327,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10191 //机构id小英10344或4
+		subscibe.OrgId = 10340 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,7 +337,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10191 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10340 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3467  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2587,6 +2587,11 @@ func (c *DialysisAPIController) Finish() {
 		if adminUserInfo.Org.Id == 10485 {
 			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
 		}
+		if adminUserInfo.Org.Id == 10551 {
+			//获取最后一条透析处方数据
+			lastprescription, _ := service.GetLastDialysisPrescriptionByPatientIdTwo(adminUserInfo.Org.Id, id, recordDate.Unix())
+			tempassessmentAfterDislysis.ActualUltrafiltration = lastprescription.TargetUltrafiltration * 1000
+		}
 
 	}
 

controllers/schedule_api_controller.go

@@ -128,10 +128,11 @@ func (c *ScheduleApiController) CoverSch() {
 	err := service.SaveSchTwo(sch, sch_two)
 	//生成新的排班
 	if err == nil {
-		err2 := service.SaveSch(new_sch)
+		err2 := service.SaveSch(&new_sch)
 		if err2 == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "覆盖成功",
+				"msg":     "覆盖成功",
+				"new_sch": new_sch,
 			})
 		} else {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -680,7 +681,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 					}
 
 					schedule.Status = 0
-					service.SaveSch(schedule)
+					service.SaveSch(&schedule)
 				}
 				HandleRedis(adminInfo.CurrentOrgId, schedule.ScheduleDate)
 			}
@@ -833,7 +834,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 					}
 					schedule.DialysisMachineName = DialysisMachineName
 					schedule.IsExport = 3000
-					service.SaveSch(schedule)
+					service.SaveSch(&schedule)
 				} else { //新的排班信息
 
 					if items["schedule_date"] == nil || reflect.TypeOf(items["schedule_date"]).String() != "string" {
@@ -1015,7 +1016,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 							daySchedule.BedId = schedule.BedId
 							daySchedule.DialysisMachineName = schedule.DialysisMachineName
 							existSchedule.IsExport = 3002
-							service.SaveSch(daySchedule)
+							service.SaveSch(&daySchedule)
 						} else {
 							existSchedule.IsExport = 3003
 							service.CreateScheduleTwo(&schedule)

service/app_version.go

@@ -1036,7 +1036,7 @@ func UpdateSch(sch Schedule) (err error) {
 	return
 }
 
-func SaveSch(sch models.Schedule) (err error) {
+func SaveSch(sch *models.Schedule) (err error) {
 	err = writeDb.Save(&sch).Error
 	return
 }