历史排班

controllers/dialysis_api_controller.go

@@ -4173,6 +4173,8 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	//相关操作对应的操作人
 	//operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
 	operators, err := service.GetAdminUserEsOne(adminUserInfo.CurrentOrgId)
+
+	fmt.Println("operators", operators)
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
 	//获取当前日期月份的第一天

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -472,7 +472,12 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.TargetUltrafiltration = dewater_amount
 				newprescribe.PrescriptionWater = dewater_amount
 				newprescribe.Status = 1
-				newprescribe.Remark = lastDialysisPrescribe.Remark
+				if adminUserInfo.Org.Id != 10490 {
+					newprescribe.Remark = lastDialysisPrescribe.Remark
+				} else {
+					newprescribe.Remark = ""
+				}
+
 				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 				newprescribe.PrescribingNumber = 1
 				if adminUserInfo.Org.Id == 10340 {
@@ -694,8 +699,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				evaluation.Exposed = lastPredialysisEvaluation.Exposed                         // 外漏
 				evaluation.DialysisCount = lastPredialysisEvaluation.DialysisCount             //呼吸频次
 				evaluation.Phinholing = lastPredialysisEvaluation.Phinholing                   //针眼
+
 				evaluation.Remark = lastPredialysisEvaluation.Remark
-				if adminUserInfo.Org.Id == 10318 {
+				if adminUserInfo.Org.Id == 10318 || adminUserInfo.Org.Id == 10490 {
 					evaluation.Remark = ""
 				}
 				if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10447 {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3303,7 +3303,7 @@ func (this *DialysisAPIController) StartDialysis() {
 			}
 
 			//针对
-			if adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 3877 {
+			if adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10460 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate / 1000
@@ -4278,6 +4278,13 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			}
 
+			if adminInfo.Org.Id == 10460 {
+
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate / 1000
+
+			}
+
 			//if template.TemplateId == 47 {
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			//	record.UltrafiltrationRate = ultrafiltration_rate
@@ -4308,7 +4315,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
-			fmt.Println("ultrafiltration_volume", ultrafiltration_volume)
+
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}
 
@@ -4317,7 +4324,14 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	if adminInfo.Org.Id == 10471 {
 
 		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
-		fmt.Println("ultrafiltration_volume", ultrafiltration_volume)
+
+		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
+	}
+
+	if adminInfo.Org.Id == 10460 {
+
+		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
 	}
 	//长沙南雅累计血容量自动计算

service/dialysis_service.go

@@ -639,7 +639,7 @@ func FindPunctureNurse(adminid int64, appid int64, orgid int64) (models.App_Role
 	role := models.App_Roles{}
 	//err := UserReadDB().Where("admin_user_id = ? and app_id = ? and org_id = ?", adminid, appid, orgid).Find(&role).Error
 	//return role, err
-	db := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status =1")
+	db := UserReadDB().Table("sgj_user_admin_role as r")
 	err := db.Select("r.id,r.admin_user_id,r.org_id,r.role_id,r.user_name,r.avatar,r.user_type,r.user_title,r.intro,r.status,r.ctime,e.url").Joins("left join sgj_user_admin_electronic_signature as e on e.creator = r.admin_user_id").Where("r.admin_user_id = ? and r.app_id = ? and r.org_id = ?", adminid, appid, orgid).Find(&role).Error
 	return role, err
 }

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -107,7 +107,7 @@ type AdminUserListTwo struct {
 
 func GetAllAdminUsers(orgId int64, appid int64) (list []*AdminUserList, err error) {
 	db := p_service.UserReadDB()
-	err = db.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+	err = db.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =?", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	return
 }
 

service/user_service.go

@@ -90,7 +90,7 @@ func GetAllDoctorAndNurseSeven(orgId int64) (doctors []AdminUserList, nurses []A
 
 func GetAllAdminUsers(orgId, appid int64) (list []*AdminUserList, err error) {
 
-	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
+	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =?", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
 	//err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1  and ua.status=1").Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	return
 }