11月9日库存管理

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
-httpport = 9531
-runmode =prod
+httpport = 9529
+runmode = dev
 #dev/prod
 
 #

controllers/dialysis_api_controller.go

@@ -298,6 +298,7 @@ func (c *DialysisApiController) PostPrescription() {
 	epo := c.GetString("epo")
 	epo_count, _ := c.GetFloat("epo_count", 0)
 	max_ultrafiltration_rate, _ := c.GetFloat("max_ultrafiltration_rate")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -398,6 +399,7 @@ func (c *DialysisApiController) PostPrescription() {
 		Epo:                        epo,
 		EpoCount:                   epo_count,
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
+		AdminUserId:                admin_user_id,
 	}
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -621,6 +623,7 @@ func (c *DialysisApiController) PostSoulution() {
 	max_ultrafiltration_rate, _ := c.GetFloat("max_ultrafiltration_rate")
 	impulse := c.GetString("impulse")
 	preImpules, parseDateErr := strconv.ParseFloat(impulse, 64)
+	admin_user_id, _ := c.GetInt64("admin_user_id")
 	fmt.Println("", preImpules)
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -734,6 +737,7 @@ func (c *DialysisApiController) PostSoulution() {
 		EpoCount:                   epo_count,
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
 		PreImpulse:                 preImpules,
+		AdminUserId:                admin_user_id,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -3766,7 +3770,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 {
+			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -3794,7 +3798,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 	}
 
-	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 {
+	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)

controllers/dialysis_record_api_controller.go

@@ -1095,6 +1095,14 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 
 		// 如果当天有插入数据，则不再往透析纪录里插入数据
 		if newdialysisRecord.ID > 0 {
+
+			//针对长沙南雅医院
+			if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10340 {
+
+				record.Temperature = 36.5
+
+			}
+
 			err := service.CreateMonitor(&record)
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2271,6 +2271,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	//查询该床位是否有人用了
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
 	if errorscode == gorm.ErrRecordNotFound {
+
 		createErr := service.MobileCreateDialysisOrder(adminUserInfo.Org.Id, patientID, dialysisRecord)
 
 		redis := service.RedisClient()
@@ -2384,6 +2385,9 @@ func (this *DialysisAPIController) StartDialysis() {
 
 	// 如果当天有插入数据，则不再往透析纪录里插入数据
 	if newdialysisRecord.ID > 0 {
+		if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 {
+			record.Temperature = 36.5
+		}
 		err := service.CreateMonitor(&record)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
 
@@ -2961,7 +2965,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 				fmt.Println("ultrafiltration_rate2332323223322332q", ultrafiltration_rate)
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -2991,7 +2995,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 {
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)

models/patient_models.go

@@ -321,6 +321,7 @@ type DialysisPrescription struct {
 	Epo                        string        `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64       `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 	MaxUltrafiltrationRate     float64       `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
+	AdminUserId                int64         `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 }
 
 func (DialysisPrescription) TableName() string {

service/gobal_config_service.go

@@ -364,10 +364,10 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 	dbTwo := XTReadDB().Table("xt_drug_warehouse_out as t").Where("t.status = 1")
 	fmt.Print(dbOne, dbTwo)
 	if startime > 0 {
-		db = db.Where("x.ctime >=?", startime)
+		db = db.Where("x.sys_record_time >=?", startime)
 	}
 	if endtime > 0 {
-		db = db.Where("x.ctime <=?", endtime)
+		db = db.Where("x.sys_record_time <=?", endtime)
 	}
 
 	if orgid > 0 {