修改redis清除数据时间

controllers/manager_center_api_controller.go

@@ -94,7 +94,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	code := c.GetString("code")
 	is_special_diseases, _ := c.GetInt64("is_special_diseases")
 	is_record, _ := c.GetInt64("is_record")
-	agent, _ := c.GetInt64("agent")
+	agent := c.GetString("agent")
 	drug_status := c.GetString("drug_status")
 	limit_remark := c.GetString("limit_remark")
 	delivery_way := c.GetString("delivery_way")
@@ -220,7 +220,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	code := c.GetString("code")
 	is_special_diseases, _ := c.GetInt64("is_special_diseases")
 	is_record, _ := c.GetInt64("is_record")
-	agent, _ := c.GetInt64("agent")
+	agent := c.GetString("agent")
 	drug_status := c.GetString("drug_status")
 	limit_remark := c.GetString("limit_remark")
 	delivery_way := c.GetString("delivery_way")
@@ -237,6 +237,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	drug_code := c.GetString("drug_code")
 
 	adminInfo := c.GetAdminUserInfo()
+	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 
 	drugLib := &models.BaseDrugLib{
 		ID:                     id,
@@ -286,7 +287,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		IsChargeUse:            is_charge_use,
 		OrgId:                  adminInfo.CurrentOrgId,
 		Status:                 1,
-		Ctime:                  time.Now().Unix(),
+		Ctime:                  drug.Ctime,
 		Mtime:                  time.Now().Unix(),
 		DrugCode:               drug_code,
 	}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -754,28 +754,23 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									service.UpdateDrugStockOutInfoCount2(adminUserInfo.Org.Id, outInfo.ID, count)
 								}
 
-								count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.Org.Id, record_time, item.DrugId, item.PatientId)
-								if count == 0 {
-									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-									details := &models.DrugAutomaticReduceDetail{
-										WarehouseOutId:          outInfo.ID,
-										WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-										PatientId:               item.PatientId,
-										Ctime:                   time.Now().Unix(),
-										Mtime:                   time.Now().Unix(),
-										Status:                  1,
-										RecordTime:              record_time,
-										OrgId:                   adminUserInfo.Org.Id,
-										DrugId:                  item.DrugId,
-										Count:                   count,
-									}
-									service.AddSigleDrugAutoReduceRecordInfo(details)
-								} else if count == 1 {
-									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-									service.UpdateDrugUserInfoDetails(item.DrugId, record_time, adminUserInfo.Org.Id, item.PatientId, count, &outInfo)
+								//count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.Org.Id, record_time, item.DrugId, item.PatientId)
+								//if count == 0 {
+								prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+								details := &models.DrugAutomaticReduceDetail{
+									WarehouseOutId:          outInfo.ID,
+									WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+									PatientId:               item.PatientId,
+									Ctime:                   time.Now().Unix(),
+									Mtime:                   time.Now().Unix(),
+									Status:                  1,
+									RecordTime:              record_time,
+									OrgId:                   adminUserInfo.Org.Id,
+									DrugId:                  item.DrugId,
+									Count:                   count,
 								}
+								service.AddSigleDrugAutoReduceRecordInfo(details)
 
 							}
 						}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -55,6 +55,9 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/functionpermission/post", &NewRoleApiController{}, "post:EditFunctionPermission")
 
 	beego.Router("/m/api/permission", &NewRoleApiController{}, "get:GetAllPermission")
+
+	beego.Router("/m/api/newpermission", &NewRoleApiController{}, "get:GetAllNewPermission")
+
 	beego.Router("/m/api/rolepurview", &NewRoleApiController{}, "get:GetRolePurviews")
 	beego.Router("/m/api/role/funtionpurview", &NewRoleApiController{}, "get:GetFuntionPurviews")
 

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -726,3 +726,11 @@ func (this *NewRoleApiController) GetFuncRolePurviews() {
 		"role_purview": purview,
 	})
 }
+
+func (this *NewRoleApiController) GetAllNewPermission() {
+	url := this.GetString("url")
+	purviews, _ := service.GetNewAllPurview(url)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"purviews": purviews,
+	})
+}

controllers/role_controller.go

@@ -213,26 +213,98 @@ func (this *RoleAPIController) EditPurviewInitData() {
 
 	role, _ := service.GetRoleByRoleID(roleId)
 
-	purviews_xt, getPurviewsErr := service.GetAllGeneralPurviewVMsProcessed(3)
+	//purviews_xt, getPurviewsErr := service.GetAllGeneralPurviewVMsProcessed(3)
 	purviews_scrm, getPurviewsErr := service.GetAllGeneralPurviewVMsProcessed(6)
 	purviews_cdm, getPurviewsErr := service.GetAllGeneralPurviewVMsProcessed(4)
 	purviews_mall, getPurviewsErr := service.GetAllGeneralPurviewVMsProcessed(7)
+	purviews_ky_mall, getPurviewsErr := service.GetAllGeneralPurviewVMsProcessed(8)
+
+	//purviews_func/**/, getPurviewsErr := service.GetAllFuncPurview()
+
+	//门诊
+	outpatientRegistration, _ := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientRegistration/manage")
+	//电子病历
+	ele, _ := service.GetOtherAllGeneralPurviewVMsProcessed("/patinets/ele")
+	//透析管理
+	dialysis, _ := service.GetOtherAllGeneralPurviewVMsProcessed("/dialysis/manage")
+	//库房管理
+	stock, _ := service.GetOtherAllGeneralPurviewVMsProcessed("/stock/manage")
+	//配置管理
+	config, _ := service.GetOtherAllGeneralPurviewVMsProcessed("/config/manage")
+
+	//sub_outpatientRegistration,_ := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientRegistration/index")
+
+	//GetNewAllPurview("/outpatientRegistration/index")
+
+	//ele,_ := service.GetOtherNewAllPurview("/patinets/ele")
+	//dialysis,_ := service.GetOtherNewAllPurview("/dialysis/manage")
+	//stock,_ := service.GetOtherNewAllPurview("/stock/manage")
+	//config,_ :=  service.GetOtherNewAllPurview("/config/manage")
+	//outpatientRegistration,_ := service.GetOtherNewAllPurview("/outpatientRegistration/manage")
+
+	//
+	//for _, item := range dialysis {
+	//		if item.Name == "透析记录" {
+	//			item.Childs = purviews_func
+	//	}
+	//}
+	//
+	//for _, item := range outpatientRegistration {
+	//	if item.Name == "门诊挂号" {
+	//		fmt.Println("111111")
+	//		item.Childs = purviews_func
+	//
+	//	}
+	//}
 
-	purviews_func, getPurviewsErr := service.GetAllGeneralFuncPurviewVMsProcessed()
-	for _, item := range purviews_xt {
-		for _, childItem := range item.Childs {
-			if childItem.Name == "透析记录" {
-				childItem.Childs = purviews_func
-			}
-		}
+	purviews := []*service.PurviewTreeViewModel{}
+
+	menzhen := &service.PurviewTreeViewModel{
+		ID:     0,
+		PID:    0,
+		Name:   "门诊管理",
+		Number: 3,
+		Childs: outpatientRegistration,
 	}
-	scrm := &service.PurviewTreeViewModel{
+	purviews = append(purviews, menzhen)
+
+	//purviews =
+
+	dianzi := &service.PurviewTreeViewModel{
 		ID:     0,
 		PID:    0,
-		Name:   "SCRM",
+		Name:   "电子病历",
 		Number: 3,
-		Childs: purviews_scrm,
+		Childs: ele,
 	}
+	purviews = append(purviews, dianzi)
+
+	touxi := &service.PurviewTreeViewModel{
+		ID:     0,
+		PID:    0,
+		Name:   "透析管理",
+		Number: 3,
+		Childs: dialysis,
+	}
+	purviews = append(purviews, touxi)
+
+	kufang := &service.PurviewTreeViewModel{
+		ID:     0,
+		PID:    0,
+		Name:   "库房管理",
+		Number: 3,
+		Childs: stock,
+	}
+	purviews = append(purviews, kufang)
+
+	ky_mall := &service.PurviewTreeViewModel{
+		ID:     0,
+		PID:    0,
+		Name:   "酷医商城",
+		Number: 3,
+		Childs: purviews_ky_mall,
+	}
+	purviews = append(purviews, ky_mall)
 
 	cdm := &service.PurviewTreeViewModel{
 		ID:     0,
@@ -242,11 +314,36 @@ func (this *RoleAPIController) EditPurviewInitData() {
 		Childs: purviews_cdm,
 	}
 
-	purviews_xt = append(purviews_xt, scrm)
-	purviews_xt = append(purviews_xt, cdm)
-	purviews_xt = append(purviews_xt, purviews_mall...)
+	purviews = append(purviews, cdm)
+
+	scrm := &service.PurviewTreeViewModel{
+		ID:     0,
+		PID:    0,
+		Name:   "营销管理",
+		Number: 3,
+		Childs: purviews_scrm,
+	}
+
+	purviews = append(purviews, scrm)
+
+	mall := &service.PurviewTreeViewModel{
+		ID:     0,
+		PID:    0,
+		Name:   "分销商城",
+		Number: 3,
+		Childs: purviews_mall,
+	}
 
-	//purviews_xt = append(purviews_xt,purviews_cdm...)
+	purviews = append(purviews, mall)
+
+	peizhi := &service.PurviewTreeViewModel{
+		ID:     0,
+		PID:    0,
+		Name:   "配置管理",
+		Number: 3,
+		Childs: config,
+	}
+	purviews = append(purviews, peizhi)
 
 	if getPurviewsErr != nil {
 		//beego.Error("获取所有权限时出错:", getPurviewsErr)
@@ -282,7 +379,7 @@ func (this *RoleAPIController) EditPurviewInitData() {
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"purviews":         purviews_xt,
+		"purviews":         purviews,
 		"role":             role,
 		"role_purview_ids": rolePurviewIdStr + "," + roleFuncPurview.PurviewIds,
 	})

controllers/stock_api_controller.go

@@ -40,6 +40,8 @@ func (c *StockApiController) CreateDealer() {
 	email := c.GetString("email")
 	contact_address := c.GetString("contact_address")
 	remark := c.GetString("remark")
+	wubi := c.GetString("wubi")
+	pinyin := c.GetString("pinyin")
 
 	if len(dealer_name) <= 0 {
 		utils.ErrorLog("len(dealer_name) == 0")
@@ -67,6 +69,8 @@ func (c *StockApiController) CreateDealer() {
 		PlatformNumber: platform_number,
 		OrgId:          adminUserInfo.CurrentOrgId,
 		Status:         1,
+		WuBi:           wubi,
+		PinYin:         pinyin,
 	}
 
 	err, dealers := service.AddSigleDealer(&dealer)
@@ -91,6 +95,9 @@ func (c *StockApiController) ModifyDealer() {
 	email := c.GetString("email")
 	contact_address := c.GetString("contact_address")
 	remark := c.GetString("remark")
+	wubi := c.GetString("wubi")
+	pinyin := c.GetString("pinyin")
+
 	if id <= 0 {
 		utils.ErrorLog("id == 0")
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -120,6 +127,8 @@ func (c *StockApiController) ModifyDealer() {
 		Modifier:       adminUserInfo.AdminUser.Id,
 		OrgId:          adminUserInfo.CurrentOrgId,
 		Status:         1,
+		WuBi:           wubi,
+		PinYin:         pinyin,
 	}
 
 	err := service.ModifyDealer(&dealer)
@@ -183,6 +192,8 @@ func (c *StockApiController) CreateManufacturer() {
 	email := c.GetString("email")
 	contact_address := c.GetString("contact_address")
 	remark := c.GetString("remark")
+	wubi := c.GetString("wubi")
+	pinyin := c.GetString("pinyin")
 
 	if len(manufacturer_name) <= 0 {
 		utils.ErrorLog("len(manufacturer_name) == 0")
@@ -209,6 +220,8 @@ func (c *StockApiController) CreateManufacturer() {
 		OrgId:            adminUserInfo.CurrentOrgId,
 		Status:           1,
 		ManufacturerCode: code,
+		WuBi:             wubi,
+		PinYin:           pinyin,
 	}
 
 	err, manufacturers := service.AddSigleManufacturer(&manufacturer)
@@ -233,6 +246,8 @@ func (c *StockApiController) ModifyManufacturer() {
 	contact_address := c.GetString("contact_address")
 	remark := c.GetString("remark")
 	manufacturer_code := c.GetString("manufacturer_code")
+	wubi := c.GetString("wubi")
+	pinyin := c.GetString("pinyin")
 
 	if id <= 0 {
 		utils.ErrorLog("id == 0")
@@ -263,6 +278,8 @@ func (c *StockApiController) ModifyManufacturer() {
 		OrgId:            adminUserInfo.CurrentOrgId,
 		ManufacturerCode: manufacturer_code,
 		Status:           1,
+		WuBi:             wubi,
+		PinYin:           pinyin,
 	}
 
 	err := service.ModifyManufacturer(&manufacturer)

models/drug.go

@@ -32,7 +32,7 @@ type BaseDrugLib struct {
 	Code                        string                         `gorm:"column:code" json:"code" form:"code"`
 	IsSpecialDiseases           int64                          `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
 	IsRecord                    int64                          `gorm:"column:is_record" json:"is_record" form:"is_record"`
-	Agent                       int64                          `gorm:"column:agent" json:"agent" form:"agent"`
+	Agent                       string                         `gorm:"column:agent" json:"agent" form:"agent"`
 	DrugStatus                  string                         `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
 	LimitRemark                 string                         `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
 	DeliveryWay                 string                         `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`

models/self_drug_models.go

@@ -45,7 +45,7 @@ type XtBaseDrug struct {
 	Code                   string  `gorm:"column:code" json:"code" form:"code"`
 	IsSpecialDiseases      int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
 	IsRecord               int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
-	Agent                  int64   `gorm:"column:agent" json:"agent" form:"agent"`
+	Agent                  string  `gorm:"column:agent" json:"agent" form:"agent"`
 	DrugStatus             string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
 	LimitRemark            string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
 	DeliveryWay            string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`

service/role_service.go

@@ -366,7 +366,7 @@ type PurviewTreeViewModel struct {
 
 func GetAllGeneralPurviewVMsProcessed(module int) ([]*PurviewTreeViewModel, error) {
 	var originPurviews []*models.Purview
-	getPurviewErr := readUserDb.Model(models.Purview{}).Where("module = ? AND status = 1 AND super_admin_exclusive = 0", module).Order("listorder asc").Order("id asc").Find(&originPurviews).Error
+	getPurviewErr := readUserDb.Model(models.Purview{}).Where("module = ? AND status = 1", module).Order("listorder asc").Order("id asc").Find(&originPurviews).Error
 	if getPurviewErr != nil {
 		return nil, getPurviewErr
 	}
@@ -766,3 +766,85 @@ func GetAllSystemPurview() (purview []*models.Purview, err error) {
 	err = readUserDb.Model(&models.Purview{}).Where("status = 1 AND module = 3 ").Find(&purview).Error
 	return
 }
+
+type Purview struct {
+	Id                  int64      `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
+	Parentid            int64      `json:"pid"`                                                // 父级ID
+	Module              int8       `json:"module"`                                             // 所属应用类型 1.病友经营；2.科普号；3.血透经营；4.慢病管理；
+	Name                string     `json:"name"`                                               // 规则名称（也是菜单名）
+	Urlfor              string     `json:"urlfor"`                                             // 规则唯一英文标识，(Controller.Method)
+	MenuIconClass       string     `gorm:"menu_icon_class" json:"menu_icon_class"`             // 菜单图标的 css 样式
+	SuperAdminExclusive int8       `gorm:"super_admin_exclusive" json:"super_admin_exclusive"` // 是否为超级管理员专属 0否1是
+	Listorder           int        `json:"-"`                                                  // 排序ID
+	Status              int8       `json:"status"`                                             // 状态 0.无效 1.有效 2.禁用
+	CreateTime          int64      `gorm:"column:ctime" json:"-"`                              // 创建时间
+	ModifyTime          int64      `gorm:"column:mtime" json:"-"`                              // 修改时间
+	Purview             []*Purview `gorm:"ForeignKey:Parentid;AssociationForeignKey:ID" json:"sub_purview"`
+	IconUrl             string     `gorm:"column:icon_url" json:"icon_url" form:"icon_url"`
+	Desc                string     `gorm:"column:desc" json:"desc" form:"desc"`
+	ParentUrl           string     `gorm:"column:parent_url" json:"parent_url" form:"parent_url"`
+	Link                string     `gorm:"-" json:"link"`   // urlfor 解析后的链接
+	Childs              []*Purview `gorm:"-" json:"childs"` // 子节点
+
+}
+
+func (Purview) TableName() string {
+	return "sgj_user_purview"
+}
+
+func GetNewAllPurview(url string) ([]*Purview, error) {
+	var originPurviews []*Purview
+	getPurviewErr := readUserDb.Model(Purview{}).Preload("Purview", "status = 1").Where("parent_url = ? AND status = 1", url).Order("listorder asc").Order("id asc").Find(&originPurviews).Error
+	return originPurviews, getPurviewErr
+}
+
+func GetOtherNewAllPurview(url string) ([]*Purview, error) {
+	var originPurviews []*Purview
+	getPurviewErr := readUserDb.Model(Purview{}).Preload("Purview", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("Purview", "status = 1").Where("status = 1")
+	}).Where("parent_url = ? AND status = 1", url).Order("listorder asc").Order("id asc").Find(&originPurviews).Error
+	return originPurviews, getPurviewErr
+}
+
+func GetAllFuncPurview() ([]*models.SgjUserOperatePurview, error) {
+	var originPurviews []*models.SgjUserOperatePurview
+	getPurviewErr := readUserDb.Model(&models.SgjUserOperatePurview{}).Where(" status = 1").Error
+	return originPurviews, getPurviewErr
+}
+
+func GetOtherAllGeneralPurviewVMsProcessed(url string) ([]*PurviewTreeViewModel, error) {
+	var originPurviews []*models.Purview
+	getPurviewErr := readUserDb.Model(Purview{}).Where("status = 1 AND parent_url = ?", url).Order("listorder asc").Order("id asc").Find(&originPurviews).Error
+	if getPurviewErr != nil {
+		return nil, getPurviewErr
+	}
+	// 加工这些规则：树形化
+	purviewVMs := make([]*PurviewTreeViewModel, 0)
+	pid_childs := make(map[int64][]*PurviewTreeViewModel)
+	for _, purview := range originPurviews {
+		// warning：下面这个算法只适用最多两层树形结构的菜单，对于两层以上的会丢失掉第三层及其以下的节点
+		// 因为取出 originPurviews 的时候已经排过序了，所以顶级节点肯定最先处理，不需要担心子节点比父节点先处理
+		pvm := &PurviewTreeViewModel{
+			ID:     purview.Id,
+			PID:    purview.Parentid,
+			Name:   purview.Name,
+			Number: 2,
+		}
+		if purview.Parentid == 0 {
+			purviewVMs = append(purviewVMs, pvm)
+		} else {
+			childs := pid_childs[purview.Parentid]
+			if childs == nil {
+				childs = make([]*PurviewTreeViewModel, 0)
+			}
+			childs = append(childs, pvm)
+			pid_childs[purview.Parentid] = childs
+		}
+	}
+
+	for _, vm := range purviewVMs {
+		vm.Childs = pid_childs[vm.ID]
+	}
+
+	return purviewVMs, nil
+}