Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/his_project_api_controller.go

 	beego.Router("/api/his/getallprojectlist", &HisProjectApiController{}, "Get:GetAllProjectList")
 	beego.Router("/api/his/addprojectlist", &HisProjectApiController{}, "Get:AddProjectList")
 	beego.Router("/api/his/deleteproject", &HisProjectApiController{}, "Get:DeleteProject")
+	beego.Router("/api/his/deletedrug", &HisProjectApiController{}, "Get:DeleteDrug")
+
 	beego.Router("/api/his/gethisproject", &HisProjectApiController{}, "Get:GetHisProject")
 	beego.Router("/api/his/getprojectteam", &HisProjectApiController{}, "Get:GetProjectTeam")
 	beego.Router("/api/his/getalldoctorlist", &HisProjectApiController{}, "Get:GetAllDoctorList")
 
 	is_print, _ := this.GetInt64("is_print")
 	is_show, _ := this.GetInt64("is_show")
+
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 func (this *HisProjectApiController) SaveProjectTeam() {
 
 	project_team := this.GetString("project_team")
-
 	price := this.GetString("price")
 	price_float, _ := strconv.ParseFloat(price, 64)
 	pinyin := this.GetString("pinyin")
 					}
 					types := int64(items["type"].(float64))
 
-					if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
-						utils.ErrorLog("number")
+					if items["prescribing_number"] == nil || reflect.TypeOf(items["prescribing_number"]).String() != "string" {
+						utils.ErrorLog("prescribing_number")
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
 					}
 
-					number, _ := strconv.ParseInt(items["number"].(string), 10, 64)
+					number, _ := strconv.ParseInt(items["prescribing_number"].(string), 10, 64)
 
 					list := models.XtHisProjectList{
 						Number:      number,
 				ids_str := strings.Join(ids, ",")
 				projectTeam.ItemId = ids_str
 				service.SaveProjectTeam(&projectTeam)
+			}
+		}
+
+		if dataBody["drug_info"] != nil && reflect.TypeOf(dataBody["drug_info"]).String() == "[]interface {}" {
+			infos, _ := dataBody["drug_info"].([]interface{})
+			if len(infos) > 0 {
+				var ids []string
+
+				for _, item := range infos {
+
+					var advice models.HisDoctorAdviceTeamInfo
+
+					items := item.(map[string]interface{})
+					if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+						utils.ErrorLog("id")
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					id := int64(items["id"].(float64))
+
+					if items["drug_name"] == nil || reflect.TypeOf(items["drug_name"]).String() != "string" {
+						utils.ErrorLog("drug_name")
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					if items["min_unit"] != nil && reflect.TypeOf(items["min_unit"]).String() == "string" {
+						drugSpecUnit, _ := items["min_unit"].(string)
+						advice.DrugSpecUnit = drugSpecUnit
+					}
+					if items["remark"] != nil && reflect.TypeOf(items["remark"]).String() == "string" {
+						remark, _ := items["remark"].(string)
+						advice.Remark = remark
+					}
+					if items["single_dose"] != nil && reflect.TypeOf(items["single_dose"]).String() == "string" {
+						singleDose, _ := strconv.ParseFloat(items["single_dose"].(string), 64)
+						advice.SingleDose = singleDose
+					}
+					if items["single_dose_unit"] != nil && reflect.TypeOf(items["single_dose_unit"]).String() == "string" {
+						singleDoseUnit, _ := items["single_dose_unit"].(string)
+						advice.SingleDoseUnit = singleDoseUnit
+					}
+					if items["prescribing_number"] != nil && reflect.TypeOf(items["prescribing_number"]).String() == "string" {
+						prescribingNumber, _ := strconv.ParseFloat(items["prescribing_number"].(string), 64)
+						advice.PrescribingNumber = prescribingNumber
+					}
+					if items["prescribing_number_unit"] != nil && reflect.TypeOf(items["prescribing_number_unit"]).String() == "string" {
+						prescribingNumberUnit, _ := items["prescribing_number_unit"].(string)
+						advice.PrescribingNumberUnit = prescribingNumberUnit
+					}
+					if items["delivery_way"] != nil && reflect.TypeOf(items["delivery_way"]).String() == "string" {
+						deliveryWay, _ := items["delivery_way"].(string)
+						advice.DeliveryWay = deliveryWay
+					}
+					if items["execution_frequency"] != nil && reflect.TypeOf(items["execution_frequency"]).String() == "string" {
+						executionFrequency, _ := items["execution_frequency"].(string)
+						advice.ExecutionFrequency = executionFrequency
+					}
+					if items["day"] != nil && reflect.TypeOf(items["day"]).String() == "string" {
+						day, _ := items["day"].(string)
+						daycount, _ := strconv.ParseInt(day, 10, 64)
+						advice.DayCount = daycount
+					}
+
+					adviceName, _ := items["drug_name"].(string)
+					adviceDesc, _ := items["advice_desc"].(string)
+					advice.UserOrgId = this.GetAdminUserInfo().CurrentOrgId
+					advice.AdviceName = adviceName
+					advice.AdviceDesc = adviceDesc
+					advice.DrugId = id
+					advice.Status = 1
+					service.CreateDoctorAdviceTeamList(&advice)
+					ids = append(ids, strconv.FormatInt(advice.ID, 10))
+				}
+				ids_str := strings.Join(ids, ",")
+				projectTeam.DrugItemId = ids_str
+				service.SaveProjectTeam(&projectTeam)
 				this.ServeSuccessJSON(map[string]interface{}{
 					"projectTeam": projectTeam,
 				})
 			}
 		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"projectTeam": projectTeam,
+		})
 		return
 	} else if errcodes == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 	ids := strings.Split(projectTeamDetail.ItemId, ",")
 	hisList, err := service.GetProjectHisListByIds(ids)
 
+	ids_drug := strings.Split(projectTeamDetail.DrugItemId, ",")
+	hisList_drug, err := service.GetDrugHisListByIds(ids_drug)
+
 	//list, err := service.GetAllProjectList(orgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"projectTeamDetail": projectTeamDetail,
 		//"list":              list,
-		"hisList": hisList,
+		"hisList":      hisList,
+		"hisList_drug": hisList_drug,
 	})
 	return
 }
 					Type:        types,
 				}
 
-				service.CreateProjectList(&list)
-
+				if items["m_id"] == nil || reflect.TypeOf(items["m_id"]).String() != "float64" {
+					utils.ErrorLog("m_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				m_id := int64(items["m_id"].(float64))
+				list.ID = m_id
+				service.SaveProjectList(&list)
 				ids = append(ids, strconv.FormatInt(list.ID, 10))
-
 			}
 			ids_str := strings.Join(ids, ",")
 			projectTeam.ItemId = projectTeam.ItemId + "," + ids_str
 			service.SaveProjectTeam(&projectTeam)
-			this.ServeSuccessJSON(map[string]interface{}{
-				"projectTeam": projectTeam,
-			})
+
+		}
+	}
+
+	if dataBody["drug_info"] != nil && reflect.TypeOf(dataBody["drug_info"]).String() == "[]interface {}" {
+		infos, _ := dataBody["drug_info"].([]interface{})
+		if len(infos) > 0 {
+			var ids []string
+
+			for _, item := range infos {
+
+				var advice models.HisDoctorAdviceTeamInfo
+
+				items := item.(map[string]interface{})
+
+				if items["m_id"] == nil || reflect.TypeOf(items["m_id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				m_id := int64(items["m_id"].(float64))
+				advice, _ = service.GetHisDrugByID(m_id)
+
+				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				id := int64(items["id"].(float64))
+
+				if items["drug_name"] == nil || reflect.TypeOf(items["drug_name"]).String() != "string" {
+					utils.ErrorLog("drug_name")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				if items["min_unit"] != nil && reflect.TypeOf(items["min_unit"]).String() == "string" {
+					drugSpecUnit, _ := items["min_unit"].(string)
+					advice.DrugSpecUnit = drugSpecUnit
+				}
+				if items["remark"] != nil && reflect.TypeOf(items["remark"]).String() == "string" {
+					remark, _ := items["remark"].(string)
+					advice.Remark = remark
+				}
+				if items["single_dose"] != nil && reflect.TypeOf(items["single_dose"]).String() == "string" {
+					singleDose, _ := strconv.ParseFloat(items["single_dose"].(string), 64)
+					fmt.Println("singleDose")
+					fmt.Println(singleDose)
+
+					advice.SingleDose = singleDose
+				}
+				if items["single_dose_unit"] != nil && reflect.TypeOf(items["single_dose_unit"]).String() == "string" {
+					singleDoseUnit, _ := items["single_dose_unit"].(string)
+
+					fmt.Println("singleDoseUnit")
+					fmt.Println(singleDoseUnit)
+					advice.SingleDoseUnit = singleDoseUnit
+				}
+				if items["prescribing_number"] != nil && reflect.TypeOf(items["prescribing_number"]).String() == "string" {
+					prescribingNumber, _ := strconv.ParseFloat(items["prescribing_number"].(string), 64)
+					advice.PrescribingNumber = prescribingNumber
+
+					fmt.Println("prescribingNumber")
+					fmt.Println(prescribingNumber)
+				}
+				if items["prescribing_number_unit"] != nil && reflect.TypeOf(items["prescribing_number_unit"]).String() == "string" {
+					prescribingNumberUnit, _ := items["prescribing_number_unit"].(string)
+					advice.PrescribingNumberUnit = prescribingNumberUnit
+
+					fmt.Println("prescribing_number_unit")
+					fmt.Println(prescribingNumberUnit)
+				}
+				if items["delivery_way"] != nil && reflect.TypeOf(items["delivery_way"]).String() == "string" {
+					deliveryWay, _ := items["delivery_way"].(string)
+					advice.DeliveryWay = deliveryWay
+
+					fmt.Println("delivery_way")
+					fmt.Println(deliveryWay)
+				}
+				if items["execution_frequency"] != nil && reflect.TypeOf(items["execution_frequency"]).String() == "string" {
+					executionFrequency, _ := items["execution_frequency"].(string)
+					advice.ExecutionFrequency = executionFrequency
+
+					fmt.Println("execution_frequency")
+					fmt.Println(executionFrequency)
+				}
+				if items["day"] != nil && reflect.TypeOf(items["day"]).String() == "string" {
+					day, _ := items["day"].(string)
+					daycount, _ := strconv.ParseInt(day, 10, 64)
+					advice.DayCount = daycount
+
+					fmt.Println("day")
+					fmt.Println(day)
+				}
+
+				adviceName, _ := items["drug_name"].(string)
+				//adviceDesc, _ := items["advice_desc"].(string)
+				advice.UserOrgId = this.GetAdminUserInfo().CurrentOrgId
+				advice.AdviceName = adviceName
+				//advice.AdviceDesc = adviceDesc
+				advice.Status = 1
+
+				advice.DrugId = id
+				advice.ID = m_id
+				if m_id > 0 {
+					service.CreateDoctorAdviceTeamList(&advice)
+					ids = append(ids, strconv.FormatInt(advice.ID, 10))
+
+				} else {
+					service.CreateDoctorAdviceTeamList(&advice)
+					ids = append(ids, strconv.FormatInt(advice.ID, 10))
+				}
+			}
+			ids_str := strings.Join(ids, ",")
+			projectTeam.DrugItemId = ids_str
+			service.SaveProjectTeam(&projectTeam)
 		}
 	}
 
 	orgId := adminUserInfo.CurrentOrgId
 	projectList, err := service.GetAllProjectList(orgId, keyword)
 	goodInfos, err := service.GetGoodInfomationList(orgId, keyword)
-
+	drug, _ := service.GetDrugInfomationList(orgId, keyword)
+	//goodInfos, err := service.GetAllDrugList(orgId)
 	//获取列表数据
 	hisprojectlist, err := service.GetHisProjectListByOrgId(orgId)
 
 		"projectList":    projectList,
 		"hisprojectlist": hisprojectlist,
 		"good_info":      goodInfos,
+		"drug":           drug,
 	})
 	return
 }
 	return
 }
 
+func (this *HisProjectApiController) DeleteDrug() {
+	id, _ := this.GetInt64("id")
+	err := service.DeleteDrugList(id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "失败")
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
 func (this *HisProjectApiController) GetHisProject() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	project_id := this.GetString("project_id")
+	drug_id := this.GetString("drug_id")
+
 	idStrs := strings.Split(project_id, ",")
+	drug_idStrs := strings.Split(drug_id, ",")
+
 	project, err := service.GetProjectListById(orgId, idStrs)
+	advice, _ := service.GetAdviceTeamListById(orgId, drug_idStrs)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"project": project,
+		"advice":  advice,
 	})
 }
 

models/his_models.go

 	ItemId      string              `gorm:"column:item_id" json:"item_id" form:"item_id"`
 	List        []*XtHisProjectList `gorm:"-" json:"list" form:"list"`
 	Sort        int64               `gorm:"column:sort" json:"sort" form:"sort"`
+	DrugItemId  string              `gorm:"column:drug_item_id" json:"drug_item_id" form:"drug_item_id"`
 }
 
 func (XtHisProjectTeam) TableName() string {
 func (NBXtBaseDrug) TableName() string {
 	return "xt_base_drug"
 }
+
+type HisDoctorAdviceTeamInfo struct {
+	ID                    int64       `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64       `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceName            string      `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string      `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	SingleDose            float64     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string      `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64     `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string      `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string      `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string      `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64       `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64       `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64       `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime           int64       `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Remark                string      `gorm:"column:remark" json:"remark" form:"remark"`
+	DrugSpec              float64     `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string      `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64       `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64       `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	FrequencyType         int64       `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64       `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string      `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	TemplateId            string      `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64       `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	DrugId                int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Price                 float64     `gorm:"column:price" json:"price" form:"price"`
+	BaseDrugLib           BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+}
+
+func (HisDoctorAdviceTeamInfo) TableName() string {
+	return "his_doctor_advice_team_info"
+}
+
+type NewHisOrderInfo struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate       int64   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId         int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt float64 `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt              float64 `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric             float64 `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PricUplmtAmt     float64 `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
+	SelfpayProp      float64 `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
+	FulamtOwnpayAmt  float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt       float64 `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
+	PreselfpayAmt    float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	BasMednFlag      string  `gorm:"column:bas_medn_flag" json:"bas_medn_flag" form:"bas_medn_flag"`
+	MedChrgitmType   string  `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	HiNegoDrugFlag   string  `gorm:"column:hi_nego_drug_flag" json:"hi_nego_drug_flag" form:"hi_nego_drug_flag"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	Memo             string  `gorm:"column:memo" json:"memo" form:"memo"`
+	FeedetlSn        string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	InscpScpAmt      float64 `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	DrtReimFlag      string  `gorm:"column:drt_reim_flag" json:"drt_reim_flag" form:"drt_reim_flag"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	ListSpItemFlag   string  `gorm:"column:list_sp_item_flag" json:"list_sp_item_flag" form:"list_sp_item_flag"`
+	ChldMedcFlag     string  `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	LmtUsedFlag      string  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	ChrgitmLv        string  `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId     int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	OrderId          int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ProjectId        int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	ItemId           int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	SettleType       int64   `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+}
+
+func (NewHisOrderInfo) TableName() string {
+	return "his_order_info"
+}

models/patient_models.go

 func (XtDialysisOrderSetting) TableName() string {
 	return "xt_dialysis_order_setting"
 }
+
+type PharmacyPatients struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	UserId      int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Avatar      string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	PatientType int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	DialysisNo  string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	Source      int64  `gorm:"column:source" json:"source" form:"source"`
+	Lapseto     int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Name        string `gorm:"column:name" json:"name" form:"name"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (PharmacyPatients) TableName() string {
+	return "xt_patients"
+}

service/his_project_service.go

 	return err
 }
 
+func SaveProjectList(list *models.XtHisProjectList) error {
+
+	err := XTWriteDB().Model(&list).Save(&list).Error
+	return err
+}
 func GetHisProjectListByOrgId(orgid int64) (projectlist []*models.HisProjectListVm, err error) {
 
 	db := XTReadDB().Table("xt_his_project_list as x").Where("x.status = 1")
 	return err
 }
 
+func DeleteDrugList(id int64) error {
+	list := models.HisDoctorAdviceTeamInfo{}
+	err := XTWriteDB().Model(&list).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
 func GetHisProject(orgid int64) (project []*models.XtHisProject, err error) {
 
 	err = XTReadDB().Model(&project).Where("user_org_id = ? and status =1 and medical_status!=1", orgid).Order("sort asc").Find(&project).Error
 	return project, err
 }
 
+func GetAdviceTeamListById(orgid int64, ids []string) (advice []*models.HisDoctorAdviceTeamInfo, err error) {
+	err = XTReadDB().Model(&advice).Preload("BaseDrugLib", "status = 1").Where("user_org_id = ? and id in (?) and status = 1", orgid, ids).Find(&advice).Error
+	return advice, err
+}
 func GetHisPatientHistory(keyword string, startime int64, endtime int64, registtype int64, limit int64, page int64, orgid int64) (hisPatient []*models.XtHisPatient, total int64, err error) {
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
 	err := XTWriteDB().Model(&project).Create(&project).Error
 	return err
 }
+
+func GetHisDrugByID(id int64) (project models.HisDoctorAdviceTeamInfo, err error) {
+	err = XTReadDB().Model(&project).Where("id = ? and status =1 ", id).First(&project).Error
+	return project, err
+}