Przeglądaj źródła

Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

陈少旭 1 rok temu
rodzic
commit
82b1fe0b63

+ 2 - 3
controllers/mobile_api_controllers/dialysis_api_controller.go Wyświetl plik

4461
 
4461
 
4462
 			}
4462
 			}
4463
 
4463
 
4464
-			if adminInfo.Org.Id == 10551 || adminInfo.Org.Id == 10617 {
4464
+			if adminInfo.Org.Id == 10551 || adminInfo.Org.Id == 10617 || adminInfo.Org.Id == 10580 {
4465
 
4465
 
4466
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
4466
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
4467
-				fmt.Println("金阿迪发到付阿道夫", ultrafiltration_rate)
4468
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
4467
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
4469
 			}
4468
 			}
4470
 
4469
 
4526
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
4525
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
4527
 	}
4526
 	}
4528
 
4527
 
4529
-	if adminInfo.Org.Id == 10551 || adminInfo.Org.Id == 10617 {
4528
+	if adminInfo.Org.Id == 10551 || adminInfo.Org.Id == 10617 || adminInfo.Org.Id == 10580 {
4530
 		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
4529
 		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
4531
 
4530
 
4532
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
4531
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000

+ 0 - 1
controllers/new_mobile_api_controllers/staff_schedule_api_controller.go Wyświetl plik

1285
 
1285
 
1286
 func (c *StaffScheduleApiController) UpdateMobileSchedule() {
1286
 func (c *StaffScheduleApiController) UpdateMobileSchedule() {
1287
 
1287
 
1288
-	fmt.Println("hhahdhhfahdfhahdfhahfh")
1289
 	id_one, _ := c.GetInt64("id_one")
1288
 	id_one, _ := c.GetInt64("id_one")
1290
 	id_two, _ := c.GetInt64("id_two")
1289
 	id_two, _ := c.GetInt64("id_two")
1291
 	schedule_date, _ := c.GetInt64("schedule_date")
1290
 	schedule_date, _ := c.GetInt64("schedule_date")

+ 1 - 1
service/secondary_service.go Wyświetl plik

1152
 
1152
 
1153
 func GetStockFlowOrderList(good_id int64, user_org_id int64) (list []*models.VmStockFlow, err error) {
1153
 func GetStockFlowOrderList(good_id int64, user_org_id int64) (list []*models.VmStockFlow, err error) {
1154
 
1154
 
1155
-	err = XTReadDB().Where("good_id = ? and user_org_id =? and ctime>=1704038400 and ctime<=1706716799 and status=1", good_id, user_org_id).Order("ctime asc").Find(&list).Error
1155
+	err = XTReadDB().Where("good_id = ? and user_org_id =? and ctime>=1706630400 and ctime<=1709222399 and status=1", good_id, user_org_id).Order("ctime asc").Find(&list).Error
1156
 	return list, err
1156
 	return list, err
1157
 }
1157
 }
1158
 
1158