Merge branch 'master' of http://git.shengws.com/csx/gdyb

conf/app.conf

@@ -148,7 +148,7 @@ sso_domain = https://testsso.sgjyun.com
 call_domain = http://hf.szjkhd.com
 front_end_domain = "http://xt.test.sgjyun.com/#"
 
-org_id = 4
+org_id = 9538
 
 
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com

models/dialysis.go

@@ -918,11 +918,12 @@ type SgjUserAdminRole struct {
 	OutpatientIllnessCategory               string `gorm:"column:outpatient_illness_category" json:"outpatient_illness_category" form:"outpatient_illness_category"`
 	IsActive                                int64  `gorm:"column:is_active" json:"is_active" form:"is_active"`
 	ActiveStatus                            int64  `gorm:"column:active_status" json:"active_status" form:"active_status"`
+	Mobile                                  string
 }
 
-func (SgjUserAdminRole) TableName() string {
-	return "sgj_user_admin_role"
-}
+//func (SgjUserAdminRole) TableName() string {
+//	return "sgj_user_admin_role"
+//}
 
 type SgjUserAdmin struct {
 	ID           int64  `gorm:"column:id" json:"id" form:"id"`

models/self_drug_models.go

@@ -63,6 +63,7 @@ type XtBaseDrug struct {
 	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsMark                 int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
 }
 
 func (XtBaseDrug) TableName() string {

service/his_project_service.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"fmt"
 	"gdyb/models"
 	"github.com/jinzhu/gorm"
 	"time"
@@ -683,3 +684,35 @@ func GetProjectHisList(orgid int64) (hisProjectList []*models.XtHisProjectList,
 	error = XTReadDB().Model(&hisProjectList).Where("user_org_id = ? and status = 1", orgid).Group("project_id").Find(&hisProjectList).Error
 	return hisProjectList, error
 }
+
+func GetDrugListByDetailOne(id int64) (*models.BaseDrugList, error) {
+	list := &models.BaseDrugList{}
+	//err := XTReadDB().Model(&list).Where("id = ?", id).Find(&list).Error
+	//return list,err
+
+	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_manufacturer as m")
+	fmt.Print(table)
+	if id > 0 {
+		db = db.Where("x.id = ?", id)
+	}
+	err = db.Select("x.id,x.medical_insurance_number,x.code,x.drug_name,x.drug_spec,x.drug_type,x.min_unit,x.last_price,x.retail_price,x.limit_remark,x.drug_dosage_form,m.manufacturer_name").Joins("left join xt_manufacturer as m on m.id = x.manufacturer").Scan(&list).Error
+
+	return list, err
+}
+
+func GetBatchDrugList(idss []int64) (drug []*models.BaseDrugList, err error) {
+
+	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_manufacturer as m")
+	fmt.Print(table)
+	fmt.Println("长度22222222", len(idss))
+	if len(idss) == 1 {
+		db = db.Where("x.id = ?", idss[0])
+	} else {
+		db = db.Where("x.id IN(?)", idss)
+	}
+	err = db.Select("x.id,x.medical_insurance_number,x.code,x.drug_name,x.drug_spec,x.drug_type,x.min_unit,x.last_price,x.retail_price,x.limit_remark,x.drug_dosage_form,m.manufacturer_name").Joins("left join xt_manufacturer as m on m.id = x.manufacturer").Scan(&drug).Error
+
+	return drug, err
+}

service/his_service.go

@@ -981,7 +981,7 @@ func GetDrugList(orgID int64) (drug []*models.BaseDrugList, err error) {
 	table := XTReadDB().Table("xt_manufacturer as m")
 	fmt.Print(table)
 	if orgID > 0 {
-		db = db.Where("x.org_id = ? ", orgID)
+		db = db.Where("x.org_id = ? and x.id = 397", orgID)
 	}
 	err = db.Select("x.id,x.medical_insurance_number,x.code,x.drug_name,x.drug_spec,x.drug_type,x.min_unit,x.last_price,x.retail_price,x.limit_remark,x.drug_dosage_form,m.manufacturer_name").Joins("left join xt_manufacturer as m on m.id = x.manufacturer").Scan(&drug).Error
 
@@ -996,7 +996,13 @@ func GetDrugDosageForm(orgid int64) (dataconfig []*models.XtDrugDataConfig, err
 
 func GetDoctorList(orgid int64) (role []*models.SgjUserAdminRole, err error) {
 
-	err = UserReadDB().Model(&role).Where("org_id = ? and status = 1 and user_type = 2", orgid).Find(&role).Error
+	//err = UserReadDB().Model(&role).Where("org_id = ? and status = 1 and user_type = 2", orgid).Find(&role).Error
+	//return role, err
+
+	db := UserReadDB().Table("sgj_user_admin_role as x").Where("x.status =1")
+	table := UserReadDB().Table("sgj_user_admin as a")
+	fmt.Println(table)
+	err = db.Select("x.id,x.admin_user_id,x.org_id,x.app_id,x.role_id,x.user_name,x.avatar,x.user_type,x.user_title,x.intro,x.user_title_name,x.role_ids,x.message,x.sex,x.birthday,x.sort,x.is_sort,x.department,x.department_id,x.age,x.nation,x.card_type,x.id_card,x.education,x.study_major_name,x.work_major_name,x.role_type,x.medical_code,x.doctor_code,x.licensing,x.job_number,x.prescription_qualification_identification,x.identification_outpatients,x.start_time,x.medical_range_code,x.medical_level,x.medical_type_job,x.pharmacist_registration_number,x.doctor_range_code,x.doctor_level,x.doctor_type_job,x.doctor_number,x.outpatient_illness_category,x.is_active,x.active_status,a.mobile").Joins("left join sgj_user_admin as a on a.id = x.admin_user_id").Scan(&role).Error
 	return role, err
 }
 

service/sz_his_service.go

@@ -260,7 +260,7 @@ func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total f
 	inputMessage["transVersion"] = version_code // 交易编码
 
 	inputData["akc190"] = mz_number
-	inputData["aka130"] = "15"
+	inputData["aka130"] = "11"
 	inputData["bkc320"] = drug_doctor_code
 	inputData["ckc350"] = drug_doctor_name
 	inputData["aka030"] = "12"
@@ -312,7 +312,7 @@ func SzybFY005(doctor string, doctor_code string, fixmedins_code string, total f
 	inputData["aaz500"] = account
 	inputData["bzz269"] = "000000"
 	inputData["akc190"] = mz_number
-	inputData["aka130"] = "15"
+	inputData["aka130"] = "11"
 	inputData["bkc320"] = drug_doctor
 	inputData["ckc350"] = drug_doctor_name
 	inputData["aka030"] = "12"
@@ -529,38 +529,102 @@ func msToTime(ms int64) string {
 	return tm.Format("2006-02-01 15:04:05.000")
 }
 
-func SzybML008(doctor string, doctor_code string, fixmedins_code string, datas []*models.DrugDetail) string {
+//
+//func SzybML008(doctor string, doctor_code string, fixmedins_code string, datas []*models.DrugDetail) string {
+//  //生成输入报文
+//  inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
+//
+//  inputData := make(map[string]interface{})
+//  inputMessage["transType"] = "JY003" // 交易编码
+//
+//  inputData["listsize"] = len(datas)
+//  inputMessage["transType"] = "ML008" // 交易编码S
+//  feedetail := make([]map[string]interface{}, 0)
+//  //inputData["akc190"] = mz_number
+//  //inputData["bke384"] = setl_number
+//
+//  for _, item := range datas {
+//
+//    feedetailInfo := make(map[string]interface{})
+//    feedetailInfo["ake001"] = item.MedicalInsuranceNumber
+//    feedetailInfo["bkm017"] = item.Code
+//    feedetailInfo["ake005"] = item.Code
+//    feedetailInfo["ake006"] = item.DrugName
+//    feedetailInfo["aka074"] = item.DrugSpec
+//    feedetailInfo["aka070"] = item.DrugDosageName
+//    //feedetailInfo["aka070"] = "片"
+//    feedetailInfo["aka067"] = item.MinUnit
+//    feedetailInfo["bka053"] = item.ManufacturerName
+//    feedetailInfo["aka064"] = "1"
+//    feedetailInfo["bka505"] = item.LastPrice
+//    feedetailInfo["bka506"] = item.RetailPrice
+//    feedetailInfo["aae030"] = 20210406
+//    feedetailInfo["aae013"] = item.LimitRemark
+//    feedetail = append(feedetail, feedetailInfo)
+//  }
+//
+//  inputData["inputlist"] = feedetail
+//  inputMessage["transBody"] = inputData
+//
+//  bytesData, err := json.Marshal(inputMessage)
+//  fmt.Println(string(bytesData))
+//  if err != nil {
+//    fmt.Println(err.Error())
+//    return err.Error()
+//  }
+//  reader := bytes.NewReader(bytesData)
+//  //url := "http://192.168.1.99:10000"
+//  url := "http://192.168.1.228:17001/szsi-portal/transData"
+//
+//  request, err := http.NewRequest("POST", url, reader)
+//  if err != nil {
+//    fmt.Println(err.Error())
+//    return err.Error()
+//  }
+//
+//  request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+//
+//  client := http.Client{}
+//  resp, err := client.Do(request)
+//  if err != nil {
+//    fmt.Println(err.Error())
+//    return err.Error()
+//  }
+//  respBytes, err := ioutil.ReadAll(resp.Body)
+//  if err != nil {
+//    fmt.Println(err.Error())
+//    return err.Error()
+//  }
+//  fmt.Println(string(respBytes))
+//  str := string(respBytes)
+//  return str
+//}
+
+func SzybML008(doctor string, doctor_code string, fixmedins_code string, basedrug *models.DrugDetail) string {
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "JY003" // 交易编码
 
-	inputData["listsize"] = len(datas)
-	inputMessage["transType"] = "ML008" // 交易编码
+	inputMessage["transType"] = "ML008" // 交易编码S
 	feedetail := make([]map[string]interface{}, 0)
-	//inputData["akc190"] = mz_number
-	//inputData["bke384"] = setl_number
-
-	for _, item := range datas {
-
-		feedetailInfo := make(map[string]interface{})
-		feedetailInfo["ake001"] = item.MedicalInsuranceNumber
-		feedetailInfo["bkm017"] = item.Code
-		feedetailInfo["ake005"] = "110100002"
-		feedetailInfo["ake006"] = item.DrugName
-		feedetailInfo["aka074"] = item.DrugSpec
-		feedetailInfo["aka070"] = item.DrugDosageName
-		//feedetailInfo["aka070"] = "片"
-		feedetailInfo["aka067"] = item.MinUnit
-		feedetailInfo["bka053"] = item.ManufacturerName
-		feedetailInfo["aka064"] = "1"
-		feedetailInfo["bka505"] = item.LastPrice
-		feedetailInfo["bka506"] = item.RetailPrice
-		feedetailInfo["aae030"] = 20210406
-		feedetailInfo["aae013"] = item.LimitRemark
-		feedetail = append(feedetail, feedetailInfo)
-	}
+	feedetailInfo := make(map[string]interface{})
+	feedetailInfo["ake001"] = basedrug.MedicalInsuranceNumber
+	feedetailInfo["bkm017"] = basedrug.Code
+	feedetailInfo["ake005"] = basedrug.Code
+	feedetailInfo["ake006"] = basedrug.DrugName
+	feedetailInfo["aka074"] = basedrug.DrugSpec
+	feedetailInfo["aka070"] = basedrug.DrugDosageName
+	//feedetailInfo["aka070"] = "片"
+	feedetailInfo["aka067"] = basedrug.MinUnit
+	feedetailInfo["bka053"] = basedrug.ManufacturerName
+	feedetailInfo["aka064"] = "1"
+	feedetailInfo["bka505"] = basedrug.LastPrice
+	feedetailInfo["bka506"] = basedrug.RetailPrice
+	feedetailInfo["aae030"] = 20210406
+	feedetailInfo["aae013"] = basedrug.LimitRemark
+	feedetail = append(feedetail, feedetailInfo)
 
 	inputData["inputlist"] = feedetail
 	inputMessage["transBody"] = inputData
@@ -638,28 +702,26 @@ func SetSZDrugMessage(doctor string, doctor_code string, fixmedins_code string)
 	return inputMessage
 }
 
-func SzybML009(doctor string, doctor_code string, fixmedins_code string, datas []*models.ProjectDetail) string {
+func SzybML009(doctor string, doctor_code string, fixmedins_code string, pro *models.MyHisProject) string {
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
 	inputData := make(map[string]interface{})
 
-	inputData["listsize"] = len(datas)
 	inputMessage["transType"] = "ML009" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
 
-	for _, item := range datas {
-		feedetailInfo := make(map[string]interface{})
-		feedetailInfo["ake001"] = item.SocialSecurityDirectoryCode //社保目录编码
-		feedetailInfo["ake005"] = "110100002"                      //协议机构内部目录编码
-		feedetailInfo["ake006"] = item.ProjectName                 // 协议机构内部目录名称
-		feedetailInfo["bkf131"] = item.Category                    //协议机构项目类别
-		feedetailInfo["bkm062"] = "0"                              // 门诊特检项目标识
-		feedetailInfo["bka506"] = item.Price                       // 协议机构内部项目收费价格
-		feedetailInfo["aae030"] = 20210407                         // 备案日期
-		feedetailInfo["aae013"] = item.Remark                      // 备注
-		feedetail = append(feedetail, feedetailInfo)
-	}
+	feedetailInfo := make(map[string]interface{})
+	feedetailInfo["ake001"] = pro.MedicalCode //社保目录编码
+	feedetailInfo["ake005"] = pro.MedicalCode //协议机构内部目录编码
+	feedetailInfo["ake006"] = pro.ProjectName // 协议机构内部目录名称
+	feedetailInfo["bkf131"] = pro.Category    //协议机构项目类别
+	feedetailInfo["bkm062"] = "0"             // 门诊特检项目标识
+	feedetailInfo["bka506"] = pro.Price       // 协议机构内部项目收费价格
+	feedetailInfo["aae030"] = 20210407        // 备案日期
+	feedetailInfo["aae013"] = pro.Remark      // 备注
+	feedetail = append(feedetail, feedetailInfo)
+
 	fmt.Println("feeedDetal2333333333", feedetail)
 	inputData["inputlist"] = feedetail
 	inputMessage["transBody"] = inputData
@@ -699,6 +761,67 @@ func SzybML009(doctor string, doctor_code string, fixmedins_code string, datas [
 
 }
 
+//func SzybML009(doctor string, doctor_code string, fixmedins_code string, datas []*models.ProjectDetail) string {
+//	//生成输入报文
+//	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
+//
+//	inputData := make(map[string]interface{})
+//
+//	inputData["listsize"] = len(datas)
+//	inputMessage["transType"] = "ML009" // 交易编码
+//	feedetail := make([]map[string]interface{}, 0)
+//
+//	for _, item := range datas {
+//		feedetailInfo := make(map[string]interface{})
+//		feedetailInfo["ake001"] = item.SocialSecurityDirectoryCode //社保目录编码
+//		feedetailInfo["ake005"] = item.SocialSecurityDirectoryCode //协议机构内部目录编码
+//		feedetailInfo["ake006"] = item.ProjectName                 // 协议机构内部目录名称
+//		feedetailInfo["bkf131"] = item.Category                    //协议机构项目类别
+//		feedetailInfo["bkm062"] = "0"                              // 门诊特检项目标识
+//		feedetailInfo["bka506"] = item.Price                       // 协议机构内部项目收费价格
+//		feedetailInfo["aae030"] = 20210407                         // 备案日期
+//		feedetailInfo["aae013"] = item.Remark                      // 备注
+//		feedetail = append(feedetail, feedetailInfo)
+//	}
+//	fmt.Println("feeedDetal2333333333", feedetail)
+//	inputData["inputlist"] = feedetail
+//	inputMessage["transBody"] = inputData
+//
+//	bytesData, err := json.Marshal(inputMessage)
+//	fmt.Println(string(bytesData))
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	reader := bytes.NewReader(bytesData)
+//	//url := "http://192.168.1.99:10000"
+//	url := "http://192.168.1.228:17001/szsi-portal/transData"
+//
+//	request, err := http.NewRequest("POST", url, reader)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//
+//	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+//
+//	client := http.Client{}
+//	resp, err := client.Do(request)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	respBytes, err := ioutil.ReadAll(resp.Body)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	fmt.Println(string(respBytes))
+//	str := string(respBytes)
+//	return str
+//
+//}
+
 func SzybML010(doctor string, doctor_code string, fixmedins_code string, datas []*models.DrugDetail, typeId int64) string {
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
@@ -713,7 +836,7 @@ func SzybML010(doctor string, doctor_code string, fixmedins_code string, datas [
 		feedetailInfo := make(map[string]interface{})
 		feedetailInfo["ake003"] = strconv.FormatInt(typeId, 10)
 		feedetailInfo["ake001"] = item.MedicalInsuranceNumber //社保目录编码
-		feedetailInfo["ake005"] = "110100002"                 //协议机构内部目录编码
+		feedetailInfo["ake005"] = item.MedicalInsuranceNumber //协议机构内部目录编码
 		feedetail = append(feedetail, feedetailInfo)
 	}
 
@@ -994,33 +1117,31 @@ func SzybYS003(doctor string, doctor_code string, fixmedins_code string, datas [
 	return str
 }
 
-func SzybYML007(doctor string, doctor_code string, fixmedins_code string, datas []*models.GoodDetail) string {
+func SzybYML007(doctor string, doctor_code string, fixmedins_code string, infor *models.XtGoodInformation) string {
 
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
 	inputData := make(map[string]interface{})
 
-	inputData["listsize"] = len(datas)
 	inputMessage["transType"] = "ML007" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
 
-	for _, item := range datas {
-		fmt.Println("item222222222", item.BuyPrice)
-		feedetailInfo := make(map[string]interface{})
-		feedetailInfo["ake001"] = item.SocialSecurityDirectoryCode // 社保目录编码
-		feedetailInfo["ake005"] = "110100002"                      //协议机构内部目录编码
-		feedetailInfo["ake006"] = item.GoodName                    //医药机构内部目录名称
-		feedetailInfo["bka053"] = item.ManufacturerName            //生产厂家
-		feedetailInfo["ake004"] = "1"                              //生产地类别
-		feedetailInfo["ckf261"] = "1"                              //特殊医用材料标识
-		feedetailInfo["aka067"] = "支"                              //计价单位
-		feedetailInfo["aka074"] = "ftp"                            //规格
-		feedetailInfo["bka505"] = item.BuyPrice                    //进货价
-		feedetailInfo["bka506"] = item.SellPrice                   // 收获价
-		feedetailInfo["aae013"] = item.Remark                      //备注
-		feedetail = append(feedetail, feedetailInfo)
-	}
+	feedetailInfo := make(map[string]interface{})
+	feedetailInfo["ake001"] = infor.SocialSecurityDirectoryCode // 社保目录编码
+	//feedetailInfo["ake001"] = "3333333333" // 社保目录编码
+	feedetailInfo["ake005"] = infor.SocialSecurityDirectoryCode //协议机构内部目录编码
+	//feedetailInfo["ake006"] = item.GoodName                    //医药机构内部目录名称
+	feedetailInfo["ake006"] = "222222"                //医药机构内部目录名称
+	feedetailInfo["bka053"] = infor.ManufacturerName  //生产厂家
+	feedetailInfo["ake004"] = infor.ProductionType    //生产地类别
+	feedetailInfo["ckf261"] = infor.SpecialMedical    //特殊医用材料标识
+	feedetailInfo["aka067"] = "支"                     //计价单位
+	feedetailInfo["aka074"] = infor.SpecificationName //规格
+	feedetailInfo["bka505"] = infor.BuyPrice          //进货价
+	feedetailInfo["bka506"] = infor.SellPrice         // 收获价
+	feedetailInfo["aae013"] = infor.Remark            //备注
+	feedetail = append(feedetail, feedetailInfo)
 
 	inputData["inputlist"] = feedetail
 	inputMessage["transBody"] = inputData
@@ -1059,6 +1180,73 @@ func SzybYML007(doctor string, doctor_code string, fixmedins_code string, datas
 	return str
 }
 
+//func SzybYML007(doctor string, doctor_code string, fixmedins_code string, datas []*models.GoodDetail) string {
+//
+//	//生成输入报文
+//	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
+//
+//	inputData := make(map[string]interface{})
+//
+//	inputData["listsize"] = len(datas)
+//	inputMessage["transType"] = "ML007" // 交易编码
+//	feedetail := make([]map[string]interface{}, 0)
+//
+//	for _, item := range datas {
+//		fmt.Println("item222222222", item.BuyPrice)
+//		feedetailInfo := make(map[string]interface{})
+//		feedetailInfo["ake001"] = item.SocialSecurityDirectoryCode // 社保目录编码
+//		//feedetailInfo["ake001"] = "3333333333" // 社保目录编码
+//		feedetailInfo["ake005"] =  item.SocialSecurityDirectoryCode                     //协议机构内部目录编码
+//		//feedetailInfo["ake006"] = item.GoodName                    //医药机构内部目录名称
+//		feedetailInfo["ake006"] = "222222"                   //医药机构内部目录名称
+//		feedetailInfo["bka053"] = item.ManufacturerName            //生产厂家
+//		feedetailInfo["ake004"] = "1"                              //生产地类别
+//		feedetailInfo["ckf261"] = "1"                              //特殊医用材料标识
+//		feedetailInfo["aka067"] = "支"                              //计价单位
+//		feedetailInfo["aka074"] = "ftp"                            //规格
+//		feedetailInfo["bka505"] = item.BuyPrice                    //进货价
+//		feedetailInfo["bka506"] = item.SellPrice                   // 收获价
+//		feedetailInfo["aae013"] = item.Remark                      //备注
+//		feedetail = append(feedetail, feedetailInfo)
+//	}
+//
+//	inputData["inputlist"] = feedetail
+//	inputMessage["transBody"] = inputData
+//
+//	bytesData, err := json.Marshal(inputMessage)
+//	fmt.Println(string(bytesData))
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	reader := bytes.NewReader(bytesData)
+//	//url := "http://192.168.1.99:10000"
+//	url := "http://192.168.1.228:17001/szsi-portal/transData"
+//
+//	request, err := http.NewRequest("POST", url, reader)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//
+//	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+//
+//	client := http.Client{}
+//	resp, err := client.Do(request)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	respBytes, err := ioutil.ReadAll(resp.Body)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	fmt.Println(string(respBytes))
+//	str := string(respBytes)
+//	return str
+//}
+
 func GetDoseCode(dose_id int64, user_org_id int64) (error, string) {
 	var data models.DictDataconfig
 	err := readDb.Model(&models.DictDataconfig{}).Where(" (org_id = ? Or org_id = 0) AND parent_id = 4 AND module = 'system' AND status = 1 AND value = ?", user_org_id, dose_id).First(&data).Error
@@ -1082,10 +1270,41 @@ func UpdataOrderlog(id int64, user_org_id int64, refund_log string) (err error)
 
 }
 
-func UpdataOrderInfoStatus(id int64, number string, user_org_id int64) {
-	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error
-	err = writeDb.Model(&models.HisOrderInfo{}).Where("status = 1 AND user_org_id = ? AND order_number = ?", user_org_id, number).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error
+func UpdateBaseDrugById(id int64) (models.XtBaseDrug, error) {
 
-	return
+	drug := models.XtBaseDrug{}
+
+	err := XTWriteDB().Model(&drug).Where("id = ?", id).Updates(map[string]interface{}{"is_mark": 1}).Error
+	return drug, err
+}
+
+func UpdateDrugByIdDetail(id int64) (models.XtBaseDrug, error) {
+	drug := models.XtBaseDrug{}
+
+	err := XTWriteDB().Model(&drug).Where("id = ?", id).Updates(map[string]interface{}{"is_mark": 0}).Error
+	return drug, err
+}
+
+func UpdateGoodInformaitonByDetail(id int64) (models.XtGoodInformation, error) {
+	information := models.XtGoodInformation{}
+	err := XTWriteDB().Model(&information).Where("id=?", id).Updates(map[string]interface{}{"is_mark": 1}).Error
+	return information, err
+}
+
+func UpdateGoodInfoById(id int64) (models.XtGoodInformation, error) {
+	information := models.XtGoodInformation{}
+	err := XTWriteDB().Model(&information).Where("id=?", id).Updates(map[string]interface{}{"is_mark": 0}).Error
+	return information, err
+}
+
+func UpdateProjectById(id int64) (models.MyHisProject, error) {
+	project := models.MyHisProject{}
+	err := XTWriteDB().Model(&project).Where("id = ?", id).Updates(map[string]interface{}{"is_mark": 1}).Error
+	return project, err
+}
 
+func UpdateMyProjectById(id int64) (models.MyHisProject, error) {
+	project := models.MyHisProject{}
+	err := XTWriteDB().Model(&project).Where("id = ?", id).Updates(map[string]interface{}{"is_mark": 0}).Error
+	return project, err
 }