新功能

controllers/base_api_controller.go

@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9841
+		subscibe.OrgId = 3907
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -91,7 +91,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9841
+		adminUserInfo.CurrentOrgId = 3907
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9841
+		subscibe.OrgId = 3907
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -336,7 +336,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9841
+		adminUserInfo.CurrentOrgId = 3907
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -4372,6 +4372,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	receiverTreatmentAccess, _ := service.FindReceiverTreatmentAccessRecordById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
 	check, _ := service.FindDoubleCheckById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
 	dialysis_count, _ := service.GetDialysisOrderCount(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	patientInfo.TotalDialysis = dialysis_count
 

controllers/dialysis_record_api_controller.go

@@ -369,33 +369,33 @@ type EditMonitorParamObject struct {
 	MonitoringDate int64 `json:"monitoring_date"`
 	OperateTime    int64 `json:"operate_time"`
 	// MonitoringTime        string  `json:"monitoring_time"`
-	SystolicBP               float64 `json:"systolic_bp"`
-	DiastolicBP              float64 `json:"diastolic_bp"`
-	PulseFrequency           float64 `json:"pulse_frequency"`
-	BreathingRated           float64 `json:"breathing_rated"`
-	BloodFlowVolume          float64 `json:"blood_flow_volume"`
-	VenousPressure           float64 `json:"venous_pressure"`
-	VenousPressureType       int64 `json:"venous_pressure_type"`
-	TransmembranePressure    float64 `json:"transmembrane_pressure"`
-	TransmembranePressureType int64 `json:"transmembrane_pressure_type"`
-	UltrafiltrationVolume    float64 `json:"ultrafiltration_volume"`
-	UltrafiltrationRate      float64 `json:"ultrafiltration_rate"`
-	ArterialPressure         float64 `json:"arterial_pressure"`
-	ArterialPressureType     int64 `json:"arterial_pressure_type"`
-	SodiumConcentration      float64 `json:"sodium_concentration"`
-	DialysateTemperature     float64 `json:"dialysate_temperature"`
-	Temperature              float64 `json:"temperature"`
-	ReplacementRate          float64 `json:"replacement_rate"`
-	DisplacementQuantity     float64 `json:"displacement_quantity"`
-	KTV                      float64 `json:"ktv"`
-	Symptom                  string  `json:"symptom"`
-	Dispose                  string  `json:"dispose"`
-	Result                   string  `json:"result"`
-	Conductivity             float64 `json:"conductivity"`
-	DisplacementFlowQuantity float64 `json:"displacement_flow_quantity"`
-	BloodOxygenSaturation    string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
-	Heparin                  float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
-	DialysateFlow            float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	SystolicBP                float64 `json:"systolic_bp"`
+	DiastolicBP               float64 `json:"diastolic_bp"`
+	PulseFrequency            float64 `json:"pulse_frequency"`
+	BreathingRated            float64 `json:"breathing_rated"`
+	BloodFlowVolume           float64 `json:"blood_flow_volume"`
+	VenousPressure            float64 `json:"venous_pressure"`
+	VenousPressureType        int64   `json:"venous_pressure_type"`
+	TransmembranePressure     float64 `json:"transmembrane_pressure"`
+	TransmembranePressureType int64   `json:"transmembrane_pressure_type"`
+	UltrafiltrationVolume     float64 `json:"ultrafiltration_volume"`
+	UltrafiltrationRate       float64 `json:"ultrafiltration_rate"`
+	ArterialPressure          float64 `json:"arterial_pressure"`
+	ArterialPressureType      int64   `json:"arterial_pressure_type"`
+	SodiumConcentration       float64 `json:"sodium_concentration"`
+	DialysateTemperature      float64 `json:"dialysate_temperature"`
+	Temperature               float64 `json:"temperature"`
+	ReplacementRate           float64 `json:"replacement_rate"`
+	DisplacementQuantity      float64 `json:"displacement_quantity"`
+	KTV                       float64 `json:"ktv"`
+	Symptom                   string  `json:"symptom"`
+	Dispose                   string  `json:"dispose"`
+	Result                    string  `json:"result"`
+	Conductivity              float64 `json:"conductivity"`
+	DisplacementFlowQuantity  float64 `json:"displacement_flow_quantity"`
+	BloodOxygenSaturation     string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
+	DialysateFlow             float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
 }
 
 // /api/dislysis/monitor/edit [post]
@@ -472,31 +472,31 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			MonitoringDate:  monitorParam.MonitoringDate,
 			OperateTime:     monitorParam.OperateTime,
 			// MonitoringTime:         monitorParam.MonitoringTime,
-			PulseFrequency:           monitorParam.PulseFrequency,
-			BreathingRate:            monitorParam.BreathingRated,
-			SystolicBloodPressure:    monitorParam.SystolicBP,
-			DiastolicBloodPressure:   monitorParam.DiastolicBP,
-			BloodFlowVolume:          monitorParam.BloodFlowVolume,
-			VenousPressure:           monitorParam.VenousPressure,
-			VenousPressureType:       monitorParam.VenousPressureType,
-			ArterialPressure:         monitorParam.ArterialPressure,
-			ArterialPressureType:     monitorParam.ArterialPressureType,
-			TransmembranePressure:    monitorParam.TransmembranePressure,
+			PulseFrequency:            monitorParam.PulseFrequency,
+			BreathingRate:             monitorParam.BreathingRated,
+			SystolicBloodPressure:     monitorParam.SystolicBP,
+			DiastolicBloodPressure:    monitorParam.DiastolicBP,
+			BloodFlowVolume:           monitorParam.BloodFlowVolume,
+			VenousPressure:            monitorParam.VenousPressure,
+			VenousPressureType:        monitorParam.VenousPressureType,
+			ArterialPressure:          monitorParam.ArterialPressure,
+			ArterialPressureType:      monitorParam.ArterialPressureType,
+			TransmembranePressure:     monitorParam.TransmembranePressure,
 			TransmembranePressureType: monitorParam.TransmembranePressureType,
-			UltrafiltrationRate:      monitorParam.UltrafiltrationRate,
-			UltrafiltrationVolume:    monitorParam.UltrafiltrationVolume,
-			SodiumConcentration:      monitorParam.SodiumConcentration,
-			DialysateTemperature:     monitorParam.DialysateTemperature,
-			Temperature:              monitorParam.Temperature,
-			ReplacementRate:          monitorParam.ReplacementRate,
-			DisplacementQuantity:     monitorParam.DisplacementQuantity,
-			Ktv:                      monitorParam.KTV,
-			Symptom:                  monitorParam.Symptom,
-			Dispose:                  monitorParam.Dispose,
-			Result:                   monitorParam.Result,
-			MonitoringNurse:          adminUserInfo.AdminUser.Id,
-			Conductivity:             monitorParam.Conductivity,
-			DisplacementFlowQuantity: monitorParam.DisplacementFlowQuantity,
+			UltrafiltrationRate:       monitorParam.UltrafiltrationRate,
+			UltrafiltrationVolume:     monitorParam.UltrafiltrationVolume,
+			SodiumConcentration:       monitorParam.SodiumConcentration,
+			DialysateTemperature:      monitorParam.DialysateTemperature,
+			Temperature:               monitorParam.Temperature,
+			ReplacementRate:           monitorParam.ReplacementRate,
+			DisplacementQuantity:      monitorParam.DisplacementQuantity,
+			Ktv:                       monitorParam.KTV,
+			Symptom:                   monitorParam.Symptom,
+			Dispose:                   monitorParam.Dispose,
+			Result:                    monitorParam.Result,
+			MonitoringNurse:           adminUserInfo.AdminUser.Id,
+			Conductivity:              monitorParam.Conductivity,
+			DisplacementFlowQuantity:  monitorParam.DisplacementFlowQuantity,
 			Status:                1,
 			CreatedTime:           time.Now().Unix(),
 			UpdatedTime:           time.Now().Unix(),

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2752,7 +2752,7 @@ func (this *DialysisAPIController) StartDialysis() {
 			}
 
 			if template.TemplateId == 20 { //adminUserInfo.Org.Id == 9538
-				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 )
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
 			}
 
 			// 只针对方济医院

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -5,9 +5,11 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
+	"encoding/json"
 	"fmt"
 	"strconv"
 	"strings"
+	"time"
 )
 
 type MobileBaseAPIController struct {
@@ -117,27 +119,53 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 				roles = strings.Split(role.RoleIds, ",")
 			}
 
+			//redis相关处理逻辑
+			redis := service.RedisClient()
+			defer redis.Close()
+
+			//redis key值
+			key := "purviews_" + strconv.FormatInt(adminUserInfo.Org.Id, 10) + strconv.FormatInt(adminUserInfo.AdminUser.Id, 10)
+			purviews_json_str, _ := redis.Get(key).Result()
 			//获取该用户下所有角色的权限总集
 			var userRolePurviews string
 			var userRolePurviewsArr []string
-			for _, item := range roles {
-				role_id, _ := strconv.ParseInt(item, 10, 64)
-				purviews, _ := service.GetRoleFuncPurviewIds(role_id)
-				if len(userRolePurviews) == 0 {
-					userRolePurviews = purviews
+
+			fmt.Println("----redis 开始----")
+			fmt.Println(purviews_json_str)
+			fmt.Println("----redis 结束----")
+
+			if len(purviews_json_str) == 0 {
+				for _, item := range roles {
+					role_id, _ := strconv.ParseInt(item, 10, 64)
+					purviews, _ := service.GetRoleFuncPurviewIds(role_id)
+					if len(userRolePurviews) == 0 {
+						userRolePurviews = purviews
+					} else {
+						userRolePurviews = userRolePurviews + "," + purviews
+					}
+				}
+				//该用户所拥有角色的权限的总集
+				userRolePurviewsArr = RemoveRepeatedPurviewElement(strings.Split(userRolePurviews, ","))
+				//缓存数据
+				purview_json, err := json.Marshal(userRolePurviewsArr)
+				if err == nil {
+					redis.Set(key, purview_json, time.Minute*60*60*24)
+				}
+			} else {
+				var dat []string
+				if err := json.Unmarshal([]byte(purviews_json_str), &dat); err == nil {
+
 				} else {
-					userRolePurviews = userRolePurviews + "," + purviews
+
 				}
+				userRolePurviewsArr = dat
 			}
-			//该用户所拥有角色的权限的总集
-			userRolePurviewsArr = RemoveRepeatedPurviewElement(strings.Split(userRolePurviews, ","))
+
+			fmt.Println(userRolePurviewsArr)
+
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
-
 			for _, item := range allPermission {
-				// fmt.Println(strings.Split(item.Urlfor, ",")[0])
-				// fmt.Println(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
-
 				//判断当前路由是否在权限路由列表里面
 				if strings.Split(item.Urlfor, ",")[0] == strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode") {