修改redis清除数据时间

conf/app.conf

@@ -1,8 +1,8 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
-# 1
+#
 copyrequestbody = true
 sessionon = true
 sessiongcmaxlifetime = 64800

controllers/base_api_controller.go

@@ -4,8 +4,11 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 
+	//"XT_New/models"
+
 	//"XT_New/models"
 	"XT_New/service"
+	"fmt"
 	"strconv"
 	"strings"
 )
@@ -68,7 +71,7 @@ func (this *BaseAuthAPIController) Prepare() {
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
 		userAdmin.Id = 558
-		userAdmin.Mobile = "13318464649"
+		userAdmin.Mobile = "13535547901"
 
 		//userAdmin.Id = 597
 		//userAdmin.Mobile = "19874122664"
@@ -78,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 4
+		subscibe.OrgId = 3877
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -88,12 +91,12 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 4
+		adminUserInfo.CurrentOrgId = 3877
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
-
+		//
 		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 		//this.StopRun()
 
@@ -115,6 +118,7 @@ func (this *BaseAuthAPIController) Prepare() {
 			} else {
 				roles = strings.Split(role.RoleIds, ",")
 			}
+			fmt.Println(roles)
 
 			//获取该用户下所有角色的权限总集
 			var userRolePurviews string
@@ -130,6 +134,7 @@ func (this *BaseAuthAPIController) Prepare() {
 			}
 			//该用户所拥有角色的权限的总集
 			userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
+			fmt.Println(userRolePurviewsArr)
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
 
@@ -178,6 +183,7 @@ func (this *BaseAuthAPIController) Prepare() {
 			} else {
 				roles = strings.Split(role.RoleIds, ",")
 			}
+			fmt.Println(roles)
 
 			//获取该用户下所有角色的权限总集
 			var userRolePurviews string
@@ -193,6 +199,7 @@ func (this *BaseAuthAPIController) Prepare() {
 			}
 			//该用户所拥有角色的权限的总集
 			userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
+			fmt.Println(userRolePurviewsArr)
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
 
@@ -319,17 +326,18 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 4
+		subscibe.OrgId = 3877
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibe.Status = 1
 		subscibe.CreatedTime = 1538035409
 		subscibe.UpdatedTime = 1538035409
+
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 4
+		adminUserInfo.CurrentOrgId = 3877
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -284,7 +284,9 @@ func (c *DialysisApiController) PostPrescription() {
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			prescription_doctor := adminUserInfo.AdminUser.Id
 			prescription.PrescriptionDoctor = prescription_doctor
+
 		}
+
 		if dialysisPrescription.Creater == 0 { //体重称
 			prescription.Creater = adminUserInfo.AdminUser.Id
 
@@ -402,8 +404,6 @@ func (c *DialysisApiController) PostSoulution() {
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
 		prescription_doctor = appRole.AdminUserId
-	} else {
-		prescription_doctor = 0
 	}
 
 	if mode_id > 0 {
@@ -492,7 +492,12 @@ func (c *DialysisApiController) PostSoulution() {
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
 	if dialysisPrescription.ID == 0 { //新增
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			prescription.PrescriptionDoctor = adminUserInfo.AdminUser.Id
+		}
+
 		prescription.Creater = adminUserInfo.AdminUser.Id
+		//prescription.Creater = adminUserInfo.AdminUser.Id
 	} else { //修改
 
 		//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
@@ -508,6 +513,13 @@ func (c *DialysisApiController) PostSoulution() {
 		//		}
 		//	}
 		//}
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			prescription_doctor := adminUserInfo.AdminUser.Id
+			prescription.PrescriptionDoctor = prescription_doctor
+		} else {
+			prescription.PrescriptionDoctor = dialysisPrescription.PrescriptionDoctor
+		}
+
 		if dialysisPrescription.Creater == 0 {
 			prescription.Creater = adminUserInfo.AdminUser.Id
 		} else {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -552,9 +552,11 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	//}
 
 	var advice models.DoctorAdvice
+	var tempAdvices []models.DoctorAdvice
 
 	if groupno > 0 {
-		advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+		advices, _ := service.FindAllDoctorAdviceByGoroupNoTwo(adminUserInfo.Org.Id, groupno)
+		tempAdvices = advices
 		for _, item := range advices {
 			if item.ExecutionState == 2 {
 				advice = item
@@ -562,7 +564,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 		}
 	} else {
-		advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+		advices, _ := service.FindDoctorAdviceByIdsTwo(adminUserInfo.Org.Id, ids)
+		tempAdvices = advices
+
 		for _, item := range advices {
 			if item.ExecutionState == 2 {
 				advice = item
@@ -622,10 +626,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	if drugStockConfig.IsOpen == 1 {
 		if groupno > 0 {
-			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			//advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 			isHasWay := false //用来判断是否包含来自药品库的医嘱
 			record_time := int64(0)
-			for _, item := range advices {
+			for _, item := range tempAdvices {
 				if item.Way == 1 {
 					isHasWay = true
 					record_time = item.RecordDate
@@ -662,7 +666,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if err != nil {
 						utils.TraceLog("创建出库单失败 err = %v", err)
 					} else {
-						for _, item := range advices {
+						for _, item := range tempAdvices {
 							if item.Way == 1 {
 								if item.PrescribingNumber > 0 {
 									warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -707,7 +711,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 				} else if err == nil {
-					for _, item := range advices {
+					for _, item := range tempAdvices {
 						if item.Way == 1 {
 							outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
 							if err == gorm.ErrRecordNotFound {
@@ -781,10 +785,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			}
 		} else {
-			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+			//advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 			isHasWay := false //用来判断是否包含来自药品库的医嘱
 			record_time := int64(0)
-			for _, item := range advices {
+			for _, item := range tempAdvices {
 				if item.Way == 1 {
 					isHasWay = true
 					record_time = item.RecordDate
@@ -821,7 +825,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if err != nil {
 						utils.TraceLog("创建出库单失败 err = %v", err)
 					} else {
-						for _, item := range advices {
+						for _, item := range tempAdvices {
 							if item.Way == 1 {
 								if item.PrescribingNumber > 0 {
 									warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -866,7 +870,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 				} else if err == nil {
-					for _, item := range advices {
+					for _, item := range tempAdvices {
 						if item.Way == 1 {
 							outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
 							if err == gorm.ErrRecordNotFound {
@@ -950,8 +954,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
 		if groupno > 0 {
-			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
-			for _, item := range advices {
+			//advices, _ := service.FindAllDoct/**/orAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			for _, item := range tempAdvices {
 				fmt.Println("------------进来没有22222222", item.ExecutionState)
 				if item.ExecutionState == 1 {
 					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
@@ -987,8 +991,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 		} else {
 
-			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
-			for _, item := range advices {
+			//advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+			for _, item := range tempAdvices {
 				if item.ExecutionState == 1 {
 
 					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
@@ -2072,14 +2076,9 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		internal_fistula_skin := dataBody["internal_fistula_skin"].(string)
 		evaluation.InternalFistulaSkin = internal_fistula_skin
 	}
-	if dataBody["is_hemorrhage"] != nil && reflect.TypeOf(dataBody["is_hemorrhage"]).String() == "string" {
-		ishemorrhage, _ := dataBody["is_hemorrhage"].(string)
-		is_hemorrhage, _ := strconv.ParseInt(ishemorrhage, 10, 64)
-		evaluation.IsHemorrhage = is_hemorrhage
 
-		//if dataBody["is_hemorrhage"] != nil && reflect.TypeOf(dataBody["is_hemorrhage"]).String() == "float64" {
-		//	is_hemorrhage := int64(dataBody["is_hemorrhage"].(float64))
-		//	fmt.Println("is_hemorrhage2222222222222222",is_hemorrhage)
+	if dataBody["is_hemorrhage"] != nil && reflect.TypeOf(dataBody["is_hemorrhage"]).String() == "float64" {
+		is_hemorrhage := int64(dataBody["is_hemorrhage"].(float64))
 		if is_hemorrhage != 1 && is_hemorrhage != 2 {
 			is_hemorrhage = 0
 		}

controllers/verify_login_controller.go

@@ -277,7 +277,7 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 					}
 				}
 			}
-
+			curAppUrlfors = append(curAppUrlfors, "/home")
 			for _, item := range pruviews {
 				if item.Module == 6 {
 					didRegistedForSCRM = true

service/patient_service.go

@@ -1359,3 +1359,13 @@ func GetPatientsByKey(orgID int64, keywords string) (patient []*models.Patients,
 	}
 	return
 }
+
+func FindAllDoctorAdviceByGoroupNoTwo(orgID int64, groupno int64) (advice []models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id=?  AND groupno = ? AND status = 1 AND execution_state = 2", orgID, groupno).Find(&advice).Error
+	return
+}
+
+func FindDoctorAdviceByIdsTwo(orgID int64, ids []string) (advice []models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id = ? AND status = 1 AND execution_state = 2 OR (id IN (?) AND patient_id IN (?))", orgID, ids, ids).Find(&advice).Error
+	return
+}