Kaynağa Gözat

11月9日库存管理

XMLWAN 2 yıl önce
ebeveyn
işleme
5f30b37b08

+ 2 - 2
conf/app.conf Dosyayı Görüntüle

1
 appname = 血透
1
 appname = 血透
2
-httpport = 9531
3
-runmode =prod
2
+httpport = 9529
3
+runmode = dev
4
 #dev/prod
4
 #dev/prod
5
 
5
 
6
 #
6
 #

+ 6 - 2
controllers/dialysis_api_controller.go Dosyayı Görüntüle

298
 	epo := c.GetString("epo")
298
 	epo := c.GetString("epo")
299
 	epo_count, _ := c.GetFloat("epo_count", 0)
299
 	epo_count, _ := c.GetFloat("epo_count", 0)
300
 	max_ultrafiltration_rate, _ := c.GetFloat("max_ultrafiltration_rate")
300
 	max_ultrafiltration_rate, _ := c.GetFloat("max_ultrafiltration_rate")
301
+	admin_user_id, _ := c.GetInt64("admin_user_id")
301
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
302
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
302
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
303
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
303
 
304
 
398
 		Epo:                        epo,
399
 		Epo:                        epo,
399
 		EpoCount:                   epo_count,
400
 		EpoCount:                   epo_count,
400
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
401
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
402
+		AdminUserId:                admin_user_id,
401
 	}
403
 	}
402
 
404
 
403
 	if appRole.UserType == 2 || appRole.UserType == 1 {
405
 	if appRole.UserType == 2 || appRole.UserType == 1 {
621
 	max_ultrafiltration_rate, _ := c.GetFloat("max_ultrafiltration_rate")
623
 	max_ultrafiltration_rate, _ := c.GetFloat("max_ultrafiltration_rate")
622
 	impulse := c.GetString("impulse")
624
 	impulse := c.GetString("impulse")
623
 	preImpules, parseDateErr := strconv.ParseFloat(impulse, 64)
625
 	preImpules, parseDateErr := strconv.ParseFloat(impulse, 64)
626
+	admin_user_id, _ := c.GetInt64("admin_user_id")
624
 	fmt.Println("", preImpules)
627
 	fmt.Println("", preImpules)
625
 	var prescription_doctor int64
628
 	var prescription_doctor int64
626
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
629
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
734
 		EpoCount:                   epo_count,
737
 		EpoCount:                   epo_count,
735
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
738
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
736
 		PreImpulse:                 preImpules,
739
 		PreImpulse:                 preImpules,
740
+		AdminUserId:                admin_user_id,
737
 	}
741
 	}
738
 
742
 
739
 	//查询最近透析准备表里是否存在 透析器 灌流器
743
 	//查询最近透析准备表里是否存在 透析器 灌流器
3766
 				record.UltrafiltrationRate = ultrafiltration_rate
3770
 				record.UltrafiltrationRate = ultrafiltration_rate
3767
 			}
3771
 			}
3768
 
3772
 
3769
-			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 {
3773
+			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 {
3770
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
3774
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
3771
 
3775
 
3772
 				record.UltrafiltrationRate = ultrafiltration_rate
3776
 				record.UltrafiltrationRate = ultrafiltration_rate
3794
 
3798
 
3795
 	}
3799
 	}
3796
 
3800
 
3797
-	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 {
3801
+	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 {
3798
 
3802
 
3799
 		if ultrafiltration_rate > 0 {
3803
 		if ultrafiltration_rate > 0 {
3800
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
3804
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)

+ 8 - 0
controllers/dialysis_record_api_controller.go Dosyayı Görüntüle

1095
 
1095
 
1096
 		// 如果当天有插入数据,则不再往透析纪录里插入数据
1096
 		// 如果当天有插入数据,则不再往透析纪录里插入数据
1097
 		if newdialysisRecord.ID > 0 {
1097
 		if newdialysisRecord.ID > 0 {
1098
+
1099
+			//针对长沙南雅医院
1100
+			if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10340 {
1101
+
1102
+				record.Temperature = 36.5
1103
+
1104
+			}
1105
+
1098
 			err := service.CreateMonitor(&record)
1106
 			err := service.CreateMonitor(&record)
1099
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
1107
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
1100
 
1108
 

+ 6 - 2
controllers/mobile_api_controllers/dialysis_api_controller.go Dosyayı Görüntüle

2271
 	//查询该床位是否有人用了
2271
 	//查询该床位是否有人用了
2272
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
2272
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
2273
 	if errorscode == gorm.ErrRecordNotFound {
2273
 	if errorscode == gorm.ErrRecordNotFound {
2274
+
2274
 		createErr := service.MobileCreateDialysisOrder(adminUserInfo.Org.Id, patientID, dialysisRecord)
2275
 		createErr := service.MobileCreateDialysisOrder(adminUserInfo.Org.Id, patientID, dialysisRecord)
2275
 
2276
 
2276
 		redis := service.RedisClient()
2277
 		redis := service.RedisClient()
2384
 
2385
 
2385
 	// 如果当天有插入数据,则不再往透析纪录里插入数据
2386
 	// 如果当天有插入数据,则不再往透析纪录里插入数据
2386
 	if newdialysisRecord.ID > 0 {
2387
 	if newdialysisRecord.ID > 0 {
2388
+		if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 {
2389
+			record.Temperature = 36.5
2390
+		}
2387
 		err := service.CreateMonitor(&record)
2391
 		err := service.CreateMonitor(&record)
2388
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
2392
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
2389
 
2393
 
2961
 				record.UltrafiltrationRate = ultrafiltration_rate
2965
 				record.UltrafiltrationRate = ultrafiltration_rate
2962
 			}
2966
 			}
2963
 
2967
 
2964
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 {
2968
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 {
2965
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
2969
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
2966
 				fmt.Println("ultrafiltration_rate2332323223322332q", ultrafiltration_rate)
2970
 				fmt.Println("ultrafiltration_rate2332323223322332q", ultrafiltration_rate)
2967
 				record.UltrafiltrationRate = ultrafiltration_rate
2971
 				record.UltrafiltrationRate = ultrafiltration_rate
2991
 		}
2995
 		}
2992
 	}
2996
 	}
2993
 
2997
 
2994
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 {
2998
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 {
2995
 
2999
 
2996
 		if ultrafiltration_rate > 0 {
3000
 		if ultrafiltration_rate > 0 {
2997
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
3001
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)

Dosya farkı çok büyük olduğundan ihmal edildi
+ 2026 - 0
controllers/service/new_warehouse_service.go


Dosya farkı çok büyük olduğundan ihmal edildi
+ 6052 - 0
controllers/service/warhouse_service.go


+ 1 - 0
models/patient_models.go Dosyayı Görüntüle

321
 	Epo                        string        `gorm:"column:epo" json:"epo" form:"epo"`
321
 	Epo                        string        `gorm:"column:epo" json:"epo" form:"epo"`
322
 	EpoCount                   float64       `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
322
 	EpoCount                   float64       `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
323
 	MaxUltrafiltrationRate     float64       `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
323
 	MaxUltrafiltrationRate     float64       `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
324
+	AdminUserId                int64         `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
324
 }
325
 }
325
 
326
 
326
 func (DialysisPrescription) TableName() string {
327
 func (DialysisPrescription) TableName() string {

+ 2 - 2
service/gobal_config_service.go Dosyayı Görüntüle

364
 	dbTwo := XTReadDB().Table("xt_drug_warehouse_out as t").Where("t.status = 1")
364
 	dbTwo := XTReadDB().Table("xt_drug_warehouse_out as t").Where("t.status = 1")
365
 	fmt.Print(dbOne, dbTwo)
365
 	fmt.Print(dbOne, dbTwo)
366
 	if startime > 0 {
366
 	if startime > 0 {
367
-		db = db.Where("x.ctime >=?", startime)
367
+		db = db.Where("x.sys_record_time >=?", startime)
368
 	}
368
 	}
369
 	if endtime > 0 {
369
 	if endtime > 0 {
370
-		db = db.Where("x.ctime <=?", endtime)
370
+		db = db.Where("x.sys_record_time <=?", endtime)
371
 	}
371
 	}
372
 
372
 
373
 	if orgid > 0 {
373
 	if orgid > 0 {