修改redis清除数据时间

controllers/drug_stock_api_contorller.go

@@ -1868,7 +1868,7 @@ func (c *StockDrugApiController) GetDrugQueryInfo() {
 	keyword := c.GetString("keyword")
 
 	adminUserInfo := c.GetAdminUserInfo()
-	list, total, err := service.FindAllStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword)
+	list, total, err := service.FindAllDrugStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":  list,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2612,6 +2612,16 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 			advice.WeekDay = week_day
 		}
 
+		if adviceNameM["way"] != nil || reflect.TypeOf(adviceNameM["way"]).String() == "float64" {
+			way := int64(adviceNameM["way"].(float64))
+			advice.Way = way
+		}
+
+		if adviceNameM["drug_id"] != nil || reflect.TypeOf(adviceNameM["drug_id"]).String() == "float64" {
+			drug_id := int64(adviceNameM["drug_id"].(float64))
+			advice.DrugId = drug_id
+		}
+
 		if adviceNameM["template_id"] != nil && reflect.TypeOf(adviceNameM["template_id"]).String() == "string" {
 			template_id, _ := adviceNameM["template_id"].(string)
 			advice.TemplateId = template_id

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2335,13 +2335,13 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 		advice.AdviceDesc = adviceDsc
 	}
 
-	if dataBody["src_type"] == nil {
+	if dataBody["way"] == nil {
 		advice.Way = 0
 
 	} else {
-		if dataBody["src_type"] != nil || reflect.TypeOf(dataBody["src_type"]).String() == "float64" {
-			src_type := int64(dataBody["src_type"].(float64))
-			advice.Way = src_type
+		if dataBody["way"] != nil || reflect.TypeOf(dataBody["way"]).String() == "float64" {
+			way := int64(dataBody["way"].(float64))
+			advice.Way = way
 		}
 
 	}
@@ -3060,13 +3060,13 @@ func (c *PatientApiController) setAdviceWithJSON(advice *models.GroupAdvice, jso
 	//	src_type, _ := strconv.ParseInt(json["src_type"].(string),10)
 	//	advice.Way = src_type
 	//}
-	if json["src_type"] == nil {
+	if json["way"] == nil {
 		advice.Way = 0
 
 	} else {
-		if json["src_type"] != nil || reflect.TypeOf(json["src_type"]).String() == "float64" {
-			src_type := int64(json["src_type"].(float64))
-			advice.Way = src_type
+		if json["way"] != nil || reflect.TypeOf(json["way"]).String() == "float64" {
+			way := int64(json["way"].(float64))
+			advice.Way = way
 		}
 
 	}

models/doctor_advice_models.go

@@ -73,6 +73,8 @@ type DoctorAdviceTemplate struct {
 	WeekDays                string                  `gorm:"column:week_days" json:"week_days"`
 	FrequencyType           int64                   `gorm:"column:frequency_type" json:"frequency_type"`
 	SubDoctorAdviceTemplate []*DoctorAdviceTemplate `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
+	Way                     int64                   `gorm:"column:way" json:"way"`
+	DrugId                  int64                   `gorm:"column:drug_id" json:"drug_id"`
 }
 
 func (DoctorAdviceTemplate) TableName() string {

service/doctor_advice_service.go

@@ -202,7 +202,7 @@ func FindDoctorAdviceTemplateById(id int64, org_id int64) (temps models.DoctorAd
 
 func FindAllAdviceTemplate(org_id int64, advice_type int64) (temps []*models.DoctorAdviceParentTemplate, err error) {
 	err = readDb.Model(&models.DoctorAdviceParentTemplate{}).Preload("DoctorAdviceTemplate", func(db *gorm.DB) *gorm.DB {
-		return db.Select("id,advice_name,advice_desc,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,status,created_time,updated_time,parent_id,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type, IF(parent_id>0, parent_id, id) as advice_order").Where("status = 1").Order("advice_order desc, id")
+		return db.Select("id,advice_name,advice_desc,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,status,created_time,updated_time,parent_id,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type,way,drug_id, IF(parent_id>0, parent_id, id) as advice_order").Where("status = 1").Order("advice_order desc, id")
 	}).Where("org_id = ? AND status=1 AND advice_type = ?", org_id, advice_type).Find(&temps).Error
 	return
 }