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

controllers/his_deposit_controller.go

@@ -0,0 +1,434 @@
+package controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"encoding/json"
+	"fmt"
+	"github.com/astaxie/beego"
+	"github.com/shopspring/decimal"
+	"strings"
+	"time"
+)
+
+type HisDepositApiController struct {
+	BaseAuthAPIController
+}
+
+func HisDepositApiRegistRouters() {
+	beego.Router("/api/his/ttt", &HisDepositApiController{}, "get:TTT")                         //测试接口
+	beego.Router("/api/his/gethisuser", &HisDepositApiController{}, "get:GetHisUser")           //获取病例中心，有效患者名称
+	beego.Router("/api/his/adddeposit", &HisDepositApiController{}, "post:AddDeposit")          //新增押金
+	beego.Router("/api/his/getdepositcode", &HisDepositApiController{}, "get:GetDepositCode")   //获取新增押金编号
+	beego.Router("/api/his/getdeletecode", &HisDepositApiController{}, "get:GetDeleteCode")     //获取退款编号
+	beego.Router("/api/his/rechargedetails", &HisDepositApiController{}, "get:RechargeDetails") //充值明细列表
+	beego.Router("/api/his/updeposit", &HisDepositApiController{}, "get:UpDeposit")             //审核
+	beego.Router("/api/his/deletehistory", &HisDepositApiController{}, "get:DeleteHistory")     //删除
+	beego.Router("/api/his/rechargesummary", &HisDepositApiController{}, "get:RechargeSummary") //充值汇总列表
+	beego.Router("/api/his/getuserlist", &HisDepositApiController{}, "get:GetUserList")         //获取患者押金列表
+	beego.Router("/api/his/depositflow", &HisDepositApiController{}, "get:DepositFlow")         //根据患者id获取押金流水
+}
+func (this *HisDepositApiController) TTT() {
+	id, _ := this.GetInt64("id")
+	err := service.DelDecimalHistory(id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": err,
+	})
+	return
+}
+
+//获取病例中心，有效患者名称
+func (this *HisDepositApiController) GetHisUser() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	list, err := service.GetHisUser(orgid)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+	return
+}
+
+//新增押金
+func (this *HisDepositApiController) AddDeposit() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	switch {
+	case dataBody["code"] == nil:
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金编号不能为空")
+		return
+	case dataBody["his_patient_id"] == nil:
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "患者名称不能为空")
+		return
+	case dataBody["deposit"] == nil:
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金金额不能为空")
+		return
+	case dataBody["trial_status"] == nil:
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "审核状态不能为空")
+		return
+	}
+	code := dataBody["code"].(string)                              //押金编号
+	his_patient_id := int64(dataBody["his_patient_id"].(float64))  //患者编号
+	deposit := decimal.NewFromFloat(dataBody["deposit"].(float64)) //押金金额
+	var remarks string
+	if dataBody["remarks"] == nil {
+		remarks = ""
+	} else {
+		remarks = dataBody["remarks"].(string) //备注
+	}
+	trial_status := int64(dataBody["trial_status"].(float64)) //审核状态
+	createid := this.GetAdminUserInfo().AdminUser.Id
+	pp := this.GetAdminUserInfo()
+	fmt.Println(pp)
+	err = service.UpDeposit(code, remarks, his_patient_id, orgid, trial_status, createid, deposit)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "添加成功",
+	})
+	return
+}
+
+//获取新增押金编号
+func (this *HisDepositApiController) GetDepositCode() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	var code string
+	for a := true; a == true; {
+		code = service.CreateCPCode("CP")
+		tmp := service.FindDecimalCode(orgid, code)
+		if tmp == false {
+			a = false
+		}
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": code,
+	})
+	return
+}
+
+//获取退款编号
+func (this *HisDepositApiController) GetDeleteCode() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	var code string
+	for a := true; a == true; {
+		code = service.CreateCPCode("AF")
+		tmp := service.FindDecimalCode(orgid, code)
+		if tmp == false {
+			a = false
+		}
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": code,
+	})
+	return
+}
+
+//充值明细列表
+func (this *HisDepositApiController) RechargeDetails() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	keyword := this.GetString("keyword")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	var stime int64 //开始时间
+	var etime int64 //结束时间
+
+	namemap := make(map[int64]string)
+	slicekey := make([]int64, 0)
+	if len(keyword) > 0 {
+		list, _ := service.GetHisUser(orgid)
+		for _, v := range list {
+			namemap[v.ID] = v.Name
+		}
+		for k, v := range namemap {
+			res := strings.Contains(v, keyword)
+			if res == true {
+				slicekey = append(slicekey, k)
+			}
+		}
+	}
+	if start_time == "" && end_time == "" {
+		stime, etime = service.GetMondayOfWeek()
+	} else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		stime = stmp.Unix()
+		etime = etmp.Unix()
+	}
+	list, err := service.DetailsList(orgid, stime, etime, keyword, slicekey)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	var sum decimal.Decimal
+	for i := 0; i < len(list); i++ {
+		if list[i].TrialStatus == 1 {
+			sum = sum.Add(list[i].Deposit)
+		}
+		list[i].Name = service.GetCreateidName(list[i].CreateId)
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+		"sum":  sum,
+	})
+	return
+}
+
+//充值汇总列表
+func (this *HisDepositApiController) RechargeSummary() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	keyword := this.GetString("keyword")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	var stime int64 //开始时间
+	var etime int64 //结束时间
+	namemap := make(map[int64]string)
+	slicekey := make([]int64, 0)
+	lists, _ := service.GetHisUser(orgid)
+	for _, v := range lists {
+		namemap[v.ID] = v.Name
+	}
+	if len(keyword) > 0 {
+		for k, v := range namemap {
+			res := strings.Contains(v, keyword)
+			if res == true {
+				slicekey = append(slicekey, k)
+			}
+		}
+	}
+	if start_time == "" && end_time == "" {
+		stime, etime = service.GetMondayOfWeek()
+	} else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		stime = stmp.Unix()
+		etime = etmp.Unix()
+	}
+	list, err := service.SummaryList(orgid, stime, etime, keyword, slicekey)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	//list为详细数据，把list整理合并为maplist输出
+	maplist := make(map[int64]models.Summary)
+	Finlist := []models.Summary{}
+	tmpslice := make([]int64, 0)
+	var sum decimal.Decimal
+	for i := 0; i < len(list); i++ {
+		if list[i].TrialStatus == 1 {
+			if k, ok := maplist[list[i].HisPatientId]; ok {
+				k.SumDecimal = k.SumDecimal.Add(list[i].Deposit)
+				maplist[list[i].HisPatientId] = models.Summary{
+					namemap[list[i].HisPatientId],
+					k.SumDecimal,
+					service.GetUserMoney(list[i].HisPatientId, orgid),
+				}
+			} else {
+				maplist[list[i].HisPatientId] = models.Summary{
+					namemap[list[i].HisPatientId],
+					list[i].Deposit,
+					service.GetUserMoney(list[i].HisPatientId, orgid),
+				}
+				tmpslice = append(tmpslice, list[i].HisPatientId)
+			}
+			sum = sum.Add(list[i].Deposit)
+		}
+	}
+	//maplist虽然满足接口要求，但格式不行，整理为Finlist输出
+	for i := 0; i < len(tmpslice); i++ {
+		Finlist = append(Finlist, maplist[tmpslice[i]])
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": Finlist,
+		"sum":  sum,
+	})
+	return
+}
+
+//审核
+func (this *HisDepositApiController) UpDeposit() {
+	id, _ := this.GetInt64("id", 0)
+	if id == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "id不能为空")
+		return
+	}
+	tmp, err := service.GetDecimalHistoryOne(id)
+	if err != nil {
+		utils.ErrorLog("无法查询该记录信息", err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "无法查询该记录信息")
+		return
+	}
+	if tmp.TrialStatus == 0 {
+		err = service.UpDecimalHistory(id)
+		if err != nil {
+			utils.ErrorLog("更新押金历史表出错，原因为：", err.Error())
+			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "系统错误")
+			return
+		}
+	} else {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "当前状态不可审核")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "审核通过",
+	})
+	return
+}
+func (this *HisDepositApiController) DeleteHistory() {
+	id, _ := this.GetInt64("id", 0)
+	if id == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "id不能为空")
+		return
+	}
+	tmp, err := service.GetDecimalHistoryOne(id)
+	if err != nil {
+		utils.ErrorLog("无法查询该记录信息", err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "无法查询该记录信息")
+		return
+	}
+	if tmp.TrialStatus == 0 {
+		err = service.DelDecimalHistory(id)
+		if err != nil {
+			utils.ErrorLog("删除历史记录出错，原因为：", err.Error())
+			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "系统错误")
+			return
+		}
+	} else {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "已审核的单据不能进行删除操作")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "删除成功",
+	})
+	return
+}
+
+//根据id获取押金流水
+func (this *HisDepositApiController) DepositFlow() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	check := map[string][]string{
+		"id":             {"must", "int", "id"},
+		"deposit_status": {"must", "int", "deposit_status"},
+	}
+	_, err := checks(this, &check)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	id, _ := this.GetInt64("id") //患者id
+	//获取当前患者的姓名
+	tmp, _ := service.GetHisUserName(orgid, id)
+	name := tmp.Name
+	deposit_status, _ := this.GetInt64("deposit_status", 0) //押金类型
+	if deposit_status > 3 {
+		utils.ErrorLog("押金类型错误,deposit_status:", deposit_status)
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金类型错误")
+		return
+	}
+	start_time := this.GetString("start_time", "") //开始时间
+	end_time := this.GetString("end_time", "")     //结束时间
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime int64 //开始时间
+	var etime int64 //结束时间
+	if start_time == "" && end_time == "" {
+		stime, etime = service.GetMonth()
+	} else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		stime = stmp.Unix()
+		etime = etmp.Unix()
+	}
+	//获取该角色当前时间段的余额
+	decimal := service.GetMoneyforTime(id, orgid, etime)
+	//获取列表
+	deposirhistory, errs := service.GetFlowList(id, orgid, stime, etime, deposit_status)
+	if errs != nil {
+		utils.ErrorLog("获取列表失败，原因为:", errs.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, errs.Error())
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":    deposirhistory,
+		"name":    name,
+		"decimal": decimal,
+	})
+	return
+}
+
+//
+func (this *HisDepositApiController) GetUserList() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	keyword := this.GetString("keyword")
+	page, _ := this.GetInt64("page")   //页码
+	limit, _ := this.GetInt64("limit") //每一页查出来的条数
+	check := map[string][]string{
+		"page":  {"must", "string", "page"},
+		"limit": {"must", "string", "limit"},
+	}
+	_, err := checks(this, &check)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	namemap := make(map[int64]string)
+	slicekey := make([]int64, 0)
+	lists, _ := service.GetHisUser(orgid)
+	for _, v := range lists {
+		namemap[v.ID] = v.Name
+	}
+	if len(keyword) > 0 {
+		for k, v := range namemap {
+			res := strings.Contains(v, keyword)
+			if res == true {
+				slicekey = append(slicekey, k)
+			}
+		}
+	}
+	list, total, errs := service.GetUserList(page, limit, orgid, keyword, slicekey)
+	if errs != nil {
+		utils.ErrorLog(errs.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	for i := 0; i < len(list); i++ {
+		list[i].HisPatientName = namemap[list[i].HisPatientId]
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":  list,
+		"total": total,
+	})
+	return
+}
+
+//判断前端参数是否为空
+func checks(this *HisDepositApiController, m *map[string][]string) (map[string]string, error) {
+	tmp := make(map[string]string)
+	for k, v := range *m {
+		t := this.GetString(k)
+		if v[0] == "must" && t == "" {
+			return nil, fmt.Errorf(v[2] + "不能为空")
+		}
+		tmp[k] = t
+	}
+	return tmp, nil
+}

controllers/his_project_api_controller.go

@@ -1061,8 +1061,8 @@ func (this *HisProjectApiController) GetHisPatientHistory() {
 	register_type, _ := this.GetInt64("register_type")
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
-	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+":00", loc)
+	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+":59", loc)
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	history, total, err := service.GetHisPatientHistory(keyword, startTime.Unix(), endTime.Unix(), register_type, limit, page, orgId)
@@ -1234,6 +1234,8 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 	//hisPatient, _ := service.GetHisPatientById(patient_id)
 	hisHospitalRecord, _ := service.GetLastHospitalRecordTwo(patient_id, adminUserInfo.CurrentOrgId)
 
+	eles, _ := service.GetNewAdminUserES(adminUserInfo.CurrentOrgId)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
@@ -1245,6 +1247,7 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 		"his":               his,
 		"hisHospitalRecord": hisHospitalRecord,
 		"info":              prescriptionInfo,
+		"eles":              eles,
 	})
 }
 

controllers/self_drug_api_congtroller.go

@@ -2653,7 +2653,7 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 func (this *SelfDrugApiController) GetDamageByDrugId() {
 
 	drug_id, _ := this.GetInt64("drug_id")
-	warehousing_order := this.GetString("warehousing_order")
+	warehousing_order := this.GetString("warehouseing_order")
 	drug_type, _ := this.GetInt64("type")
 	list, err := service.GetDamageByDrugId(drug_id, warehousing_order, drug_type)
 	if err != nil {

controllers/supply_order_api_contorller.go

@@ -454,14 +454,15 @@ func (this *SupplyOrderApiController) DelSupply() {
 	supply := models.SpSupplierName{
 		ID: suid,
 	}
-	err := service.DelSupply(supply, orgId)
+	shiwu, err := service.DelSupply(supply, orgId)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": "删除成功",
+		"list":  "删除成功",
+		"shiwu": shiwu,
 	})
 	return
 }

controllers/verify_login_controller.go

@@ -301,6 +301,15 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 			}
 
 			subscibe, _ := service.GetOrgSubscibe(adminUserInfo.CurrentOrgId)
+			//判断该机构是否需要生成默认仓库
+			orgid := adminUserInfo.CurrentOrgId
+			boolean := service.IsStorehouse(orgid)
+			if boolean == false {
+				err = service.GetDefaultStorehouse(orgid)
+				if err != nil {
+					utils.ErrorLog("创建默认仓库失败，原因为：", err)
+				}
+			}
 
 			this.SetSession("admin_user_info", adminUserInfo)
 

models/his_deposit_models.go

@@ -0,0 +1,97 @@
+package models
+
+import "github.com/shopspring/decimal"
+
+type Deposit 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"`          //机构id
+	HisPatientId int64           `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"` //his病人id
+	Ctime        int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status       int64           `gorm:"column:status" json:"status" form:"status"`
+	Deposit      decimal.Decimal `gorm:"column:deposit" json:"deposit" form:"deposit"` //押金
+}
+
+func (Deposit) TableName() string {
+	return "sgj_xt.his_deposit"
+}
+
+type DepositHistory 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"`          //机构id
+	HisPatientId   int64           `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"` //his病人id
+	DepositCode    string          `gorm:"column:deposit_code" json:"deposit_code" form:"deposit_code"`
+	Deposit        decimal.Decimal `gorm:"column:deposit" json:"deposit" form:"deposit"`                         //本次操作金额
+	SurplusDeposit decimal.Decimal `gorm:"column:surplus_deposit" json:"surplus_deposit" form:"surplus_deposit"` //剩余金额
+	DepositStatus  int64           `gorm:"column:deposit_status" json:"deposit_status" form:"deposit_status"`    //1：充值,2：扣费,3：退费
+	Status         int64           `gorm:"column:status" json:"status" form:"status"`
+	CreateId       int64           `gorm:"column:create_id" json:"create_id" form:"create_id"`
+	Ctime          int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	TrialStatus    int64           `gorm:"column:trial_status" json:"trial_status" form:"trial_status"` //审核状态0：未审核 ，1：已审核
+	Remarks        string          `gorm:"column:remarks" json:"remarks" form:"remarks"`                //备注
+}
+
+func (DepositHistory) TableName() string {
+	return "sgj_xt.his_deposit_history"
+}
+
+type GetHisName struct {
+	ID   int64  `gorm:"column:id" json:"id" form:"id"`
+	Name string `gorm:"column:name" json:"name" form:"name"`
+}
+
+func (GetHisName) TableName() string {
+	return "sgj_xt.xt_patients"
+}
+
+type DepositHistoryname 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"`          //机构id
+	HisPatientId   int64           `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"` //his病人id
+	DepositCode    string          `gorm:"column:deposit_code" json:"deposit_code" form:"deposit_code"`
+	Deposit        decimal.Decimal `gorm:"column:deposit" json:"deposit" form:"deposit"`                         //本次操作金额
+	SurplusDeposit decimal.Decimal `gorm:"column:surplus_deposit" json:"surplus_deposit" form:"surplus_deposit"` //剩余金额
+	DepositStatus  int64           `gorm:"column:deposit_status" json:"deposit_status" form:"deposit_status"`    //1：充值,2：扣费,3：退费
+	Status         int64           `gorm:"column:status" json:"status" form:"status"`
+	CreateId       int64           `gorm:"column:create_id" json:"create_id" form:"create_id"`
+	Ctime          int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	TrialStatus    int64           `gorm:"column:trial_status" json:"trial_status" form:"trial_status"` //审核状态0：未审核 ，1：已审核
+	Remarks        string          `gorm:"column:remarks" json:"remarks" form:"remarks"`                //备注
+	Name           string          ` json:"name" `
+}
+
+func (DepositHistoryname) TableName() string {
+	return "sgj_xt.his_deposit_history"
+}
+
+type CreateUser struct {
+	ID   int64  `gorm:"column:id" json:"id" form:"id"`
+	Name string `gorm:"column:name" json:"name" form:"name"`
+}
+
+func (CreateUser) TableName() string {
+	return "sgj_users.sgj_user_admin"
+}
+
+type Summary struct {
+	HisName    string          `json:"his_name"`    //患者姓名
+	SumDecimal decimal.Decimal `json:"sum_decimal"` //充值金额
+	Decimal    decimal.Decimal `json:"decimal"`     //押金余额
+}
+
+type Deposit1 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"`          //机构id
+	HisPatientId   int64           `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"` //his病人id
+	HisPatientName string          `json:"his_patient_name"`
+	Ctime          int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status         int64           `gorm:"column:status" json:"status" form:"status"`
+	Deposit        decimal.Decimal `gorm:"column:deposit" json:"deposit" form:"deposit"` //押金
+}
+
+func (Deposit1) TableName() string {
+	return "sgj_xt.his_deposit"
+}

models/secondary_models.go

@@ -136,7 +136,90 @@ type XtStorehouseConfig struct {
 func (XtStorehouseConfig) TableName() string {
 	return "xt_storehouse_config"
 }
+//二级仓库
+type Storehouse struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	StorehouseCode    string `gorm:"column:storehouse_code" json:"storehouse_code" form:"storehouse_code"`             //仓库编号
+	StorehouseName    string `gorm:"column:storehouse_name" json:"storehouse_name" form:"storehouse_name"`             //仓库名称
+	StorehouseAddress string `gorm:"column:storehouse_address" json:"storehouse_address" form:"storehouse_address"`    //仓库地址
+	StorehouseStatus  int64  `gorm:"column:storehouse_status" json:"storehouse_status" form:"storehouse_status"`       //仓库状态
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`                                        //数据状态
+	StorehouseAdminId int64  `gorm:"column:storehouse_admin_id" json:"storehouse_admin_id" form:"storehouse_admin_id"` //仓库管理员id
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (Storehouse) TableName() string {
+	return "xt_storehouse"
+}
+
+//仓库配置
+type StorehouseConfig 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"`                         //机构id
+	StorehouseInfo     int64 `gorm:"column:storehouse_info" json:"storehouse_info" form:"storehouse_info"`             //耗材 自动入库 的仓库id
+	StorehouseOutInfo  int64 `gorm:"column:storehouse_out_info" json:"storehouse_out_info" form:"storehouse_out_info"` //耗材 自动出库 的仓库id
+	DrugStorehouseInfo int64 `gorm:"drug_storehouse_info" json:"drug_storehouse_info" form:"drug_storehouse_info"`     //药品 自动入库 的仓库id
+	DrugStorehouseOut  int64 `gorm:"drug_storehouse_out" json:"drug_storehouse_out" form:"drug_storehouse_out"`        //药品 自动出库 的仓库id
+	Status             int64 `gorm:"status" json:"status" form:"status"`
+	Ctime              int64 `gorm:"ctime" json:"ctime" form:"ctime"`
+	Mtime              int64 `gorm:"mtime" json:"mtime" form:"mtime"`
+}
 
+func (StorehouseConfig) TableName() string {
+	return "xt_storehouse_config"
+}
+
+type App_Role_byli struct {
+	Id          int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
+	OrgId       int64  `gorm:"column:org_id" json:"org_id"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	UserName    string `gorm:"column:user_name" json:"user_name"` // 用户名称
+}
+
+func (App_Role_byli) TableName() string {
+	return "sgj_users.sgj_user_admin_role"
+}
+
+type UserOrg struct {
+	Id      int64 `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
+	Creator int64 `gorm:"column:creator" json:"creator"`
+}
+
+func (UserOrg) TableName() string {
+	return "sgj_users.sgj_user_org"
+}
+
+//分页
+type Storehouselist struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	StorehouseCode      string `gorm:"column:storehouse_code" json:"storehouse_code" form:"storehouse_code"`                 //仓库编号
+	StorehouseName      string `gorm:"column:storehouse_name" json:"storehouse_name" form:"storehouse_name"`                 //仓库名称
+	StorehouseAddress   string `gorm:"column:storehouse_address" json:"storehouse_address" form:"storehouse_address"`        //仓库地址
+	StorehouseStatus    int64  `gorm:"column:storehouse_status" json:"storehouse_status" form:"storehouse_status"`           //仓库状态
+	Status              int64  `gorm:"column:status" json:"status" form:"status"`                                            //数据状态
+	StorehouseAdminId   int64  `gorm:"column:storehouse_admin_id" json:"storehouse_admin_id" form:"storehouse_admin_id"`     //仓库管理员id
+	StorehouseAdminName string `gorm:"column:storehouse_admin_name" json:"storehouse_admin_name" form:"storehouse_admin_id"` //仓库管理员名字
+	UserOrgId           int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime               int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime               int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+type RolePurviews struct {
+	Id         int64 `gorm:"PRIMARY_KEY;AUTO_INCREMENT"`
+	RoleId     int64
+	OrgId      int64
+	AppId      int64
+	PurviewIds string `gorm:"column:purview_ids"`
+	Status     int8   // 状态 0.无效 1.有效 2.禁用
+	CreateTime int64  `gorm:"column:ctime"` // 创建时间
+	ModifyTime int64  `gorm:"column:mtime"` // 修改时间
+	Role       Role   `gorm:"ForeignKey:RoleId;AssociationForeignKey:ID" json:"role_info"`
+}
+
+func (RolePurviews) TableName() string {
+	return "sgj_users.sgj_user_role_purview"
 type XtSecondWarehouse struct {
 	ID                int64  `gorm:"column:id" json:"id" form:"id"`
 	SecondOrderNumber string `gorm:"column:second_order_number" json:"second_order_number" form:"second_order_number"`

models/stock_models.go

@@ -141,6 +141,7 @@ type WarehousingInfo struct {
 	SupplyWarehouseId         int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	SupplyWarehouseDetailInfo int64       `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 	StorehouseId              int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	StorehouseId              int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId     int64       `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 }
 
@@ -256,6 +257,7 @@ type WarehouseOutInfo struct {
 	StorehouseId            int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId   int64        `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	AdminUserId             int64        `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	StorehouseId            int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -355,7 +357,6 @@ type CancelStock struct {
 	Manufacturer      int64                `gorm:"column:manufacturer" json:"manufacturer"`
 	Type              int64                `gorm:"column:type" json:"type"`
 	XtCancelStockInfo []*XtCancelStockInfo `gorm:"ForeignKey:CancelStockId;AssociationForeignKey:ID" json:"XtCancelStockInfo"`
-	StorehouseId      int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (CancelStock) TableName() string {

models/supply.models.go

@@ -2,16 +2,16 @@ package models
 
 //供应商联系人
 type SpSupplierContacts struct {
-	ID           int64  `gorm:"column:id" json:"id" from:"id"`
-	Name         string `gorm:"column:name" json:"name" from:"name"`
-	Phone        string `gorm:"column:phone" json:"phone" from:"phone"`
-	Address      string `gorm:"column:address" json:"address" from:"address"`
-	IsFirst      int64  `gorm:"column:is_first" json:"is_first" from:"is_first"`
-	SupplierCode string `gorm:"column:supplier_code" json:"supplier_code" from:"supplier_code"`
-	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" from:"user_org_id"`
-	Status       int64  `gorm:"column:status" json:"status" from:"status"`
-	Ctime        int64  `gorm:"column:ctime" json:"ctime" from:"ctime"`
-	Mtime        int64  `gorm:"column:mtime" json:"mtime" from:"mtime"`
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	Phone        string `gorm:"column:phone" json:"phone" form:"phone"`
+	Address      string `gorm:"column:address" json:"address" form:"address"`
+	IsFirst      int64  `gorm:"column:is_first" json:"is_first" form:"is_first"`
+	SupplierCode string `gorm:"column:supplier_code" json:"supplier_code" form:"supplier_code"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 }
 
 func (SpSupplierContacts) TableName() string {

routers/router.go

@@ -10,7 +10,7 @@ import (
 
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
-		// AllowAllOrigins:  true,
+		//AllowAllOrigins:  true,
 		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com"},
 		//AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://xt.test.shengws.com","https://xt.test.shengws.com", "http://xt.test.sgjyun.com","https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com","https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com","http://mobile.sgjyun.com","http://mobile.kuyicloud.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
@@ -79,4 +79,5 @@ func init() {
 
 	controllers.SupplyOrderApiRegistRouters()
 	controllers.SecondaryOrderApiRegistRouters()
+	controllers.HisDepositApiRegistRouters()
 }

service/his_deposit_service.go

@@ -0,0 +1,304 @@
+package service
+
+import (
+	"XT_New/models"
+	"XT_New/utils"
+	"fmt"
+	"github.com/shopspring/decimal"
+	"math/rand"
+	"strconv"
+	"time"
+)
+
+//生成编号?+yymmdd+随机数（4位）
+//新增参数为CP
+//退款参数为AF
+func CreateCPCode(str string) string {
+	s := fmt.Sprintf("%04v", rand.New(rand.NewSource(time.Now().UnixNano())).Int63n(10000))
+	t := time.Now().Format("20060102")
+	code := str + t + s
+	return code
+}
+
+//获取his中的有效患者
+func GetHisUser(orgid int64) (hisname []models.GetHisName, err error) {
+	err = XTReadDB().Model(&models.GetHisName{}).Where("status = 1 and user_org_id = ?", orgid).Find(&hisname).Error
+	return
+}
+
+//获取his中的有效患者
+func GetHisUserName(orgid, id int64) (hisname models.GetHisName, err error) {
+	err = XTReadDB().Model(&models.GetHisName{}).Where("status = 1 and user_org_id = ? and id = ?", orgid, id).Find(&hisname).Error
+	return
+}
+
+//添加押金(开始)调用接口前记得判断审核状态，确认通过审核后在调用
+func UpDeposit(code, remarks string, his_patient_id, orgid, trial_status, createid int64, deposit decimal.Decimal) (err error) {
+	//查押金表是否存在记录
+	tmp, tmpdeposit := IsHisPatientId(his_patient_id, orgid)
+	if tmp == 0 {
+		//需要生成一条数据
+		de := models.Deposit{
+			UserOrgId:    orgid,
+			HisPatientId: his_patient_id,
+			Ctime:        time.Now().Unix(),
+			Status:       1,
+		}
+		i, d, err := AddDeposit(de)
+		if err != nil || i == 0 {
+			utils.ErrorLog("添加用户押金记录失败: %v", err.Error())
+			return err
+		}
+		tmp = i
+		tmpdeposit = d
+	}
+	if trial_status == 1 {
+		de := models.Deposit{
+			ID:      tmp,
+			Mtime:   time.Now().Unix(),
+			Deposit: deposit.Add(tmpdeposit),
+		}
+		err = UpdateDeposit(de)
+		if err != nil {
+			utils.ErrorLog("添加用户押金失败: %v", err.Error())
+			return
+		}
+	}
+	dehistory := models.DepositHistory{
+		UserOrgId:      orgid,
+		HisPatientId:   his_patient_id,
+		DepositCode:    code,
+		Deposit:        deposit,                 //本次操作的押金
+		SurplusDeposit: tmpdeposit.Add(deposit), //剩余金额
+		DepositStatus:  1,
+		Status:         1,
+		CreateId:       createid,
+		Ctime:          time.Now().Unix(),
+		Mtime:          time.Now().Unix(),
+		TrialStatus:    trial_status,
+		Remarks:        remarks,
+	}
+	err = AddDepositHistory(dehistory)
+	if err != nil {
+		utils.ErrorLog("添加用户押金历史记录失败: %v", err.Error())
+	}
+	return
+}
+
+//添加押金记录
+func AddDepositHistory(dh models.DepositHistory) error {
+	err := XTWriteDB().Create(&dh).Error
+	return err
+}
+
+//押金中添加一条记录,并返回该数据的id和押金余额（当没有该用户记录时调用）
+func AddDeposit(de models.Deposit) (int64, decimal.Decimal, error) {
+	var tmp models.Deposit
+	err := XTWriteDB().Create(&de).Find(&tmp).Error
+	if err != nil {
+		return 0, decimal.NewFromFloat(0.00), err
+	}
+	return tmp.ID, tmp.Deposit, err
+}
+
+//更改押金记录
+func UpdateDeposit(de models.Deposit) (err error) {
+	err = XTWriteDB().Model(&models.Deposit{}).Where("id = ? and status = 1", de.ID).Updates(map[string]interface{}{
+		"mtime":   de.Mtime,
+		"deposit": de.Deposit,
+	}).Error
+	return
+}
+
+//判断押金表是否存在当前的患者的一条有效数据,如果有返回id和押金余额,没有返回0
+func IsHisPatientId(his_patient_id, orgid int64) (int64, decimal.Decimal) {
+	var tmp []models.Deposit
+	XTReadDB().Model(&models.Deposit{}).Where("user_org_id = ? and his_patient_id = ? and status = 1", orgid, his_patient_id).Find(&tmp)
+	if len(tmp) != 1 {
+		return 0, decimal.NewFromFloat(0.00)
+	}
+	return tmp[0].ID, tmp[0].Deposit
+}
+
+//查询押金编号是否重复
+func FindDecimalCode(orgid int64, code string) bool {
+	var total int
+	XTReadDB().Model(&models.DepositHistory{}).Where("user_org_id = ? and deposit_code = ? and status = 1", orgid, code).Count(&total)
+	if total > 0 {
+		return true
+	} else {
+		return false
+	}
+}
+
+//充值明细列表
+func DetailsList(orgid, stime, etime int64, keyword string, slicekey []int64) (deposithistory []models.DepositHistoryname, err error) {
+	db := XTReadDB().Model(&models.DepositHistory{}).Where("status = 1 and user_org_id = ? and deposit_status = 1 ", orgid).Where("ctime >= ? and ctime <= ?", stime, etime)
+	if len(keyword) > 0 {
+		var tmp string = "deposit_code like ?"
+		if len(slicekey) > 0 {
+			for i := 0; i < len(slicekey); i++ {
+				tmp = tmp + " or his_patient_id = " + strconv.FormatInt(slicekey[i], 10)
+			}
+		}
+		keyword = "%" + keyword + "%"
+		db = db.Where(tmp, keyword)
+	}
+	err = db.Order("ctime desc").Find(&deposithistory).Error
+	return
+}
+
+//充值汇总列表
+func SummaryList(orgid, stime, etime int64, keyword string, slicekey []int64) (deposithistory []models.DepositHistory, err error) {
+	db := XTReadDB().Model(&models.DepositHistory{}).Where("status = 1 and trial_status = 1 and user_org_id = ? and deposit_status = 1 ", orgid).Where("ctime >= ? and ctime <= ?", stime, etime)
+	if len(slicekey) > 0 {
+		tmp := ""
+		for i := 0; i < len(slicekey); i++ {
+			tmp = tmp + " his_patient_id = " + strconv.FormatInt(slicekey[i], 10)
+			if i < len(slicekey)-1 {
+				tmp = tmp + " or "
+			}
+		}
+		db = db.Where(tmp)
+	} else {
+		if len(keyword) > 0 {
+			return
+		}
+	}
+	err = db.Order("ctime desc").Find(&deposithistory).Error
+	return
+}
+
+//获取本周周一和周日的起止时间戳
+func GetMondayOfWeek() (int64, int64) {
+	t := time.Now()
+	dayObj := GetZeroTime(t)
+	var dayStr string
+	loc, _ := time.LoadLocation("Local")
+	if t.Weekday() == time.Monday {
+		dayStr = dayObj.Format("2006-01-02")
+	} else {
+		offset := int(time.Monday - t.Weekday())
+		if offset > 0 {
+			offset = -6
+		}
+		dayStr = dayObj.AddDate(0, 0, offset).Format("2006-01-02")
+	}
+	dayStr = dayStr + " 00:00:00"
+	stime, _ := time.ParseInLocation("2006-01-02 15:04:05", dayStr, loc)
+	return stime.Unix(), stime.Unix() + 604799
+}
+
+//获取本月的起止时间戳
+func GetMonth() (int64, int64) {
+	timeNow := time.Now()
+	timeToday := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, timeNow.Location()) // 获取当天0点时间 time类型
+	timeMonthStartUnix1 := timeToday.AddDate(0, 0, -timeToday.Day()+1).Unix()                              // 获取本月第一天0点 时间戳类型
+	timeMonthEndUnix1 := timeToday.AddDate(0, 1, -timeToday.Day()+1).Unix() - 1                            // 获取下个月第一天/ 本月最后一天24点 时间戳类型
+	return timeMonthStartUnix1, timeMonthEndUnix1
+}
+func GetCreateidName(id int64) string {
+	var tmp models.CreateUser
+	XTReadDB().Select("name").Where("id = ?", id).Find(&tmp)
+	return tmp.Name
+}
+
+//审核通过
+func UpDecimalHistory(id int64) (err error) {
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	//改状态
+	err = tx.Model(models.DepositHistory{}).Where("id = ?", id).Updates(map[string]interface{}{
+		"trial_status": 1,
+		"mtime":        time.Now().Unix(),
+	}).Error
+	if err != nil {
+		return
+	}
+	//查记录x2
+	var history models.DepositHistory
+	var detmp models.Deposit
+	err = tx.Model(&models.DepositHistory{}).Where("id = ?", id).Find(&history).Error
+	if err != nil {
+		return
+	}
+	err = tx.Model(&models.Deposit{}).Where("user_org_id = ? and his_patient_id = ? and status = 1 ", history.UserOrgId, history.HisPatientId).Find(&detmp).Error
+	if err != nil {
+		return
+	}
+	//相加
+	err = tx.Model(&models.Deposit{}).Where("id = ? and status = 1", detmp.ID).Updates(map[string]interface{}{
+		"mtime":   time.Now().Unix(),
+		"deposit": detmp.Deposit.Add(history.Deposit),
+	}).Error
+
+	return
+}
+
+//删除本次记录
+func DelDecimalHistory(id int64) (err error) {
+	err = XTWriteDB().Model(models.DepositHistory{}).Where("id = ?", id).Updates(map[string]interface{}{
+		"status": 0,
+		"mtime":  time.Now().Unix(),
+	}).Error
+	return
+}
+
+//根据id获取一条押金历史记录
+func GetDecimalHistoryOne(id int64) (history models.DepositHistory, err error) {
+	err = XTReadDB().Model(&models.DepositHistory{}).Where("id = ?", id).Find(&history).Error
+	return
+}
+
+//根据患者id获取该患者当前剩余的押金
+func GetUserMoney(id, orgid int64) decimal.Decimal {
+	tmp := models.Deposit{}
+	XTReadDB().Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&tmp)
+	return tmp.Deposit
+}
+
+//查询时间段内患者的余额
+func GetMoneyforTime(id, orgid, etime int64) decimal.Decimal {
+	tmp := models.DepositHistory{}
+	XTReadDB().Model(&models.DepositHistory{}).Where("his_patient_id = ? and user_org_id = ? and status = 1 and mtime <= ?", id, orgid, etime).Order("mtime").Find(&tmp)
+	return tmp.SurplusDeposit
+}
+
+//押金流水
+func GetFlowList(id, orgid, stime, etime, deposit_status int64) (deposit []models.DepositHistory, err error) {
+	s := "status = 1 and trial_status = 1 and user_org_id = ? and his_patient_id = ? and mtime >= ? and mtime <= ?"
+	if deposit_status != 0 {
+		s = s + " and deposit_status = " + string(deposit_status)
+	}
+	err = XTReadDB().Model(&models.DepositHistory{}).Where(s, orgid, id, stime, etime).Order("mtime desc").Find(&deposit).Error
+	return
+}
+
+func GetUserList(page, limit, orgid int64, keyword string, slicekey []int64) (m []models.Deposit1, total int64, err error) {
+	db := XTReadDB().Model(&models.Deposit{}).Where("status = 1 and user_org_id = ? ", orgid)
+	offset := (page - 1) * limit
+	if len(slicekey) > 0 {
+		tmp := ""
+		for i := 0; i < len(slicekey); i++ {
+			tmp = tmp + " his_patient_id = " + strconv.FormatInt(slicekey[i], 10)
+			if i < len(slicekey)-1 {
+				tmp = tmp + " or "
+			}
+		}
+		db = db.Where(tmp)
+	} else {
+		if len(keyword) > 0 {
+			return
+		}
+	}
+	err = db.Count(&total).Offset(offset).Order("mtime desc").Find(&m).Error
+	return
+}

service/his_project_service.go

@@ -747,3 +747,8 @@ func GetLastHisPatient(patient_id int64, org_id int64) (his models.HisPatient, e
 	err = XTReadDB().Model(&models.HisPatient{}).Where("user_org_id = ? AND patient_id = ? and status = 1 AND patient_info <> ''", org_id, patient_id).First(&his).Error
 	return
 }
+
+func GetNewAdminUserES(orgID int64) (es []*models.AdminUserElectronicSignature, err error) {
+	err = readUserDb.Model(&models.AdminUserElectronicSignature{}).Where("org_id=?  and status=1", orgID).Find(&es).Error
+	return
+}

service/role_service.go

@@ -485,6 +485,25 @@ func GetAllGeneralPurviewVMsProcessed(module int) ([]*PurviewTreeViewModel, erro
 	return purviewVMs, nil
 }
 
+//用来处理树形结构
+func Totree(map1 map[int64]int64, map2 map[int64]*PurviewTreeViewModel, tmp int64) []*PurviewTreeViewModel {
+	var j int //用来计数
+	var tmp_purview []*PurviewTreeViewModel
+	for k, v := range map1 {
+		if v == tmp {
+			tmp_purview = append(tmp_purview, map2[k])
+			delete(map1, k)
+			for k1, v1 := range tmp_purview {
+				if k1 == j {
+					v1.Childs = Totree(map1, map2, k)
+				}
+			}
+			j++
+		}
+	}
+	return tmp_purview
+}
+
 func GetAllGeneralFuncPurviewVMsProcessed() ([]*PurviewTreeViewModel, error) {
 	var originPurviews []*models.SgjUserOperatePurview
 	getPurviewErr := readUserDb.Model(models.SgjUserOperatePurview{}).Where(" status = 1").Order("number asc").Find(&originPurviews).Error

service/secondary_service.go

@@ -966,7 +966,777 @@ func GetStoreWarehouseOutById(id int64, orgid int64) (models.WarehouseOut, error
 	err := XTReadDB().Where("id = ? and org_id = ?", id, orgid).Find(&out).Error
 	return out, err
 }
+import (
+	"XT_New/models"
+	"XT_New/utils"
+	"fmt"
+	"github.com/jinzhu/gorm"
+	"math/rand"
+	"strconv"
+	"time"
+)
+
+//生成编号，规则为:"SH-"+4位随机数
+func CreateCode() string {
+	s := fmt.Sprintf("%04v", rand.New(rand.NewSource(time.Now().UnixNano())).Int63n(10000))
+	code := "SH-" + s
+	return code
+}
+
+//查询编号是否重复
+func FindStorehouseCode(orgid int64, code string) bool {
+	var total int
+	XTReadDB().Model(&models.Storehouse{}).Where(" storehouse_code = ? and user_org_id = ? and status = 1", code, orgid).Count(&total)
+	if total > 0 {
+		return true
+	} else {
+		return false
+	}
+}
+
+//判断仓库的库存是否为零 true为零，false不为零
+func IsStorehouseNil(id, orgid int64) bool { //根据 id gro_id 查为零的库存
+	var h, y int
+	//判断耗材是否为零
+	XTReadDB().Model(&models.WarehousingInfo{}).Where("stock_count > 0 and status = 1 and org_id = ? and storehouse_id = ?", orgid, id).Count(&h)
+	if h > 0 {
+		return false
+	}
+	//判断药品是否为零
+	XTReadDB().Model(&models.XtDrugWarehouseInfo{}).Where("stock_max_number > 0 or stock_min_number > 0 ").Where(" org_id = ? and storehouse_id = ?", orgid, id).Count(&y)
+	if y > 0 {
+		return false
+	}
+	return true
+}
+
+//修改仓库状态
+func UpdateStorehouseStatus(id int64) error {
+	err := XTWriteDB().Exec("UPDATE xt_storehouse,(SELECT CASE storehouse_status WHEN 1 THEN 0 WHEN 0 THEN 1 END AS tt FROM xt_storehouse WHERE id=?)tmp SET storehouse_status = tmp.tt where id=?", id, id).Error
+	return err
+}
+
+//删除仓库
+func DeleteStorehouse(id int64) error {
+	err := XTWriteDB().Model(&models.Storehouse{}).Where("id = ?", id).Update("status", 0).Error
+	return err
+}
+
+//查询仓库名称是否重复
+func IsStorehouseName(orgid int64, storehouse_name string) (bool, error) {
+	var total int
+	var tmp bool
+	err := XTReadDB().Model(&models.Storehouse{}).Where("storehouse_name = ? and user_org_id = ? and status = 1", storehouse_name, orgid).Count(&total).Error
+	if total > 0 {
+		tmp = true //有重复的
+	} else {
+		tmp = false
+	}
+	return tmp, err
+}
+
+//查询仓库地址是否重复
+func IsStorehouseAddress(orgid int64, storehouse_address string) (bool, error) {
+	var total int
+	var tmp bool
+	err := XTReadDB().Model(&models.Storehouse{}).Where("storehouse_address = ? and user_org_id = ? and status = 1", storehouse_address, orgid).Count(&total).Error
+	if total > 0 {
+		tmp = true //有重复的
+	} else {
+		tmp = false
+	}
+	return tmp, err
+}
+
+//查询仓库名称是否重复(用于修改)
+func IsStorehouseNameUp(orgid, id int64, storehouse_name string) (bool, error) {
+	var total int
+	var tmp bool
+	err := XTReadDB().Model(&models.Storehouse{}).Where("storehouse_name = ? and user_org_id = ? and status = 1 and id != ?", storehouse_name, orgid, id).Count(&total).Error
+	if total > 0 {
+		tmp = true //有重复的
+	} else {
+		tmp = false
+	}
+	return tmp, err
+}
+
+//查询仓库地址是否重复（用于修改）
+func IsStorehouseAddressUp(orgid, id int64, storehouse_address string) (bool, error) {
+	var total int
+	var tmp bool
+	err := XTReadDB().Model(&models.Storehouse{}).Where("storehouse_address = ? and user_org_id = ? and status = 1 and id != ?", storehouse_address, orgid, id).Count(&total).Error
+	if total > 0 {
+		tmp = true //有重复的
+	} else {
+		tmp = false
+	}
+	return tmp, err
+}
+
+//新增仓库
+func AddStroehouse(storehouse models.Storehouse) error {
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("新增仓库_事务失败，原因为", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	//创建仓库
+	err := tx.Create(&storehouse).Error
+	if err != nil {
+		return err
+	}
+	var id models.Storehouse
+	//获取创建仓库的id
+	err = tx.Model(&models.Storehouse{}).Select("id").Where("status = 1 and user_org_id = ?", storehouse.UserOrgId).Order("id desc").First(&id).Error
+	if err != nil {
+		return err
+	}
+	//判断是否存在仓库配置
+	boolean := IsStorehouseconfigXT(storehouse.UserOrgId, tx)
+	if boolean == false {
+		//创建仓库配置
+		err = CreateStorehouseConfigXT(storehouse.UserOrgId, id.ID, tx)
+	} else {
+		utils.ErrorLog("仓库配置已存在")
+	}
+
+	return err
+}
+
+//修改仓库
+func UpdateStroehouse(storehouse models.Storehouse) error {
+	err := XTWriteDB().Model(&models.Storehouse{}).Where("id = ? and status = 1", storehouse.ID).Updates(
+		map[string]interface{}{
+			"storehouse_name":     storehouse.StorehouseName,
+			"storehouse_address":  storehouse.StorehouseAddress,
+			"storehouse_status":   storehouse.StorehouseStatus,
+			"storehouse_admin_id": storehouse.StorehouseAdminId,
+			"mtime":               storehouse.Mtime,
+		}).Error
+	return err
+}
+
+//查询一条仓库的信息
+func GetOneStorehouse(id, orgid int64) (storehouse models.Storehouse, err error) {
+	err = XTReadDB().Model(&models.Storehouse{}).Where("id = ? and user_org_id = ?", id, orgid).Find(&storehouse).Error
+	return
+}
+
+//分页
+func StorehouseList(page, limit, orgid int64, keyword string, slicekey []int64) (storehouse []models.Storehouse, total int64, err error) {
+	db := XTReadDB().Model(&storehouse).Where("status = 1 and user_org_id = ?", orgid)
+	offset := (page - 1) * limit
+	if len(keyword) > 0 {
+		var adminid string = "storehouse_code like ? or storehouse_name like ? or storehouse_address like ? "
+		if len(slicekey) > 0 {
+			for i := 0; i < len(slicekey); i++ {
+				adminid = adminid + " or storehouse_admin_id =" + strconv.FormatInt(slicekey[i], 10)
+			}
+		}
+		keyword = "%" + keyword + "%"
+		db = db.Where(adminid, keyword, keyword, keyword)
+	}
+	err = db.Count(&total).Offset(offset).Order("id").Limit(limit).Find(&storehouse).Error
+	return storehouse, total, err
+}
+
+//获取当前机构所有可用的仓库名字
+func GetAllStorehouseName(orgid int64) (storehouse []models.Storehouse, err error) {
+	err = XTReadDB().Model(&models.Storehouse{}).Where("storehouse_status = 1 and status = 1 and user_org_id = ?", orgid).Find(&storehouse).Error
+	return
+}
+
+//根据机构id,生成一个默认仓库
+func GetDefaultStorehouse(orgid int64) error {
+	var code string
+	for a := true; a == true; {
+		code = CreateCode()
+		tmp := FindStorehouseCode(orgid, code)
+		//如果没有重复的编码结束循环
+		if tmp == false {
+			a = false
+		}
+	}
+	createid, err := Getcreateid(orgid)
+	if err != nil {
+		return err
+	}
+	storehouse := models.Storehouse{
+		StorehouseCode:    code,
+		StorehouseName:    "默认仓库",
+		StorehouseAddress: "",
+		StorehouseStatus:  1,
+		UserOrgId:         orgid,
+		StorehouseAdminId: createid.Creator,
+		Status:            1,
+		Ctime:             time.Now().Unix(),
+	}
+	err = AddStroehouse(storehouse)
+	return err
+}
+
+//查找该机构id是否有仓库存在,ture存在，false不存在
+func IsStorehouse(orgid int64) bool {
+	var total int
+	XTReadDB().Model(&models.Storehouse{}).Where("user_org_id = ?", orgid).Count(&total)
+	if total > 0 {
+		return true
+	} else {
+		return false
+	}
+}
+
+//查找该机构id是否有仓库配置存在,ture存在，false不存在
+func IsStorehouseconfigXT(orgid int64, tx *gorm.DB) bool {
+	var total int
+	tx.Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Count(&total)
+	if total > 0 {
+		return true
+	} else {
+		return false
+	}
+}
+
+//  根据机构id查询仓库配置
+//storehouse_info:耗材 自动入库 的仓库id
+//storehouse_out_info:耗材 自动出库 的仓库id
+//drug_storehouse_info:药品 自动入库 的仓库id
+//drug_storehouse_out:药品 自动出库 的仓库id
+func FindStorehouseConfig(orgid int64) (storehouse_config models.StorehouseConfig, err error) {
+	err = XTReadDB().Model(&models.StorehouseConfig{}).Where("status = 1 and user_org_id = ?", orgid).Find(&storehouse_config).Error
+	return
+}
+
+//根据机构id,仓库id新建一个仓库配置
+func CreateStorehouseConfig(orgid, id int64) (err error) {
+	storeconfig := models.StorehouseConfig{
+		UserOrgId:          orgid,
+		StorehouseInfo:     id,
+		StorehouseOutInfo:  id,
+		DrugStorehouseInfo: id,
+		DrugStorehouseOut:  id,
+		Status:             1,
+		Ctime:              time.Now().Unix(),
+	}
+	err = XTWriteDB().Create(&storeconfig).Error
+	return
+}
+
+//根据机构id,仓库id新建一个仓库配置,带事务
+func CreateStorehouseConfigXT(orgid, id int64, tx *gorm.DB) (err error) {
+	storeconfig := models.StorehouseConfig{
+		UserOrgId:          orgid,
+		StorehouseInfo:     id,
+		StorehouseOutInfo:  id,
+		DrugStorehouseInfo: id,
+		DrugStorehouseOut:  id,
+		Status:             1,
+		Ctime:              time.Now().Unix(),
+	}
+	err = tx.Create(&storeconfig).Error
+	return
+}
+
+//更改耗材自动入库仓库
+func UpdateInfo(orgid, id int64) (err error) {
+	mtime := time.Now().Unix()
+	err = XTWriteDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"storehouse_info": id, "mtime": mtime}).Error
+	return
+}
+
+//更改耗材自动出库仓库
+func UpdateOutInfo(orgid, id int64) (err error) {
+	mtime := time.Now().Unix()
+	err = XTWriteDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"storehouse_out_info": id, "mtime": mtime}).Error
+	return
+}
+
+//更改药品自动入库仓库
+func UpdateDrugInfo2(orgid, id int64) (err error) {
+	mtime := time.Now().Unix()
+	err = XTWriteDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"drug_storehouse_info": id, "mtime": mtime}).Error
+	return
+}
+
+//更改药品自动出库仓库
+func UpdateDrugOut(orgid, id int64) (err error) {
+	mtime := time.Now().Unix()
+	err = XTWriteDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"drug_storehouse_out": id, "mtime": mtime}).Error
+	return
+}
+
+//根据id查询仓库名称
+func FindStorehouseName(id int64) (storehouse models.Storehouse, err error) {
+	err = XTReadDB().Model(&models.Storehouse{}).Where("id = ?", id).Find(&storehouse).Error
+	return
+}
+
+//判断该仓库是否在仓库配置表中
+func IsInConfig(orgid, id int64) bool {
+	var total int
+	XTReadDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Where(
+		"storehouse_info = ? or storehouse_out_info = ? or drug_storehouse_info = ? or drug_storehouse_out = ?", id, id, id, id).Count(&total)
+	if total > 0 {
+		return true //存在
+	} else {
+		return false
+	}
+}
+
+//兼容旧数据
+func Byliinit() (err error) {
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil && err.Error() != "record not found" {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	err = initsgj_user_admin(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = StoreReduceOrg(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = StoreReduceConfig(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_storehouse(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_stock_flow(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_drug_flow(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initdialysis_before_prepare(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_automatic_reduce_detail(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_drug_automatic_reduce_detail(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_warehouse(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_warehouse_info(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_warehouse_out(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_warehouse_out_info(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_drug_warehouse(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_drug_warehouse_info(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_drug_warehouse_out(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_drug_warehouse_out_info(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_cancel_stock(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_cancel_stock_info(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_drug_cancel_stock(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_drug_cancel_stock_info(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_supplier_warehouse_info(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_supplier_warehousing_info_order(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_supplier_warehouse_out(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_supplier_warehousing_out_order(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_supplier_warehouse_cancel(tx)
+	if err != nil && err.Error() != "record not found" {
+		return
+	}
+	err = initxt_supplier_warehousing_cancel_order(tx)
+
+	return
+}
+
+//初始化管理员名字
+func initsgj_user_admin(tx *gorm.DB) (err error) {
+	err = tx.Exec("update sgj_users.sgj_user_admin set name = \"超级管理员\" where name is null or name = \"\"").Error
+	return
+}
+
+//根据xt_gobal_template 获取的机构id减去仓库表存在的机构id，把结果插入到仓库表
+func StoreReduceOrg(tx *gorm.DB) (err error) {
+	err = tx.Exec("INSERT INTO sgj_xt.xt_storehouse(storehouse_code,storehouse_name,user_org_id,ctime)" +
+		"SELECT CONCAT(\"SH-\",FLOOR(RAND()*9000+1000)),\"默认仓库\",tmp.id,UNIX_TIMESTAMP()" +
+		"FROM" +
+		"(select t1.org_id as id FROM sgj_xt.xt_gobal_template as t1 LEFT JOIN " +
+		"(SELECT distinct user_org_id as i FROM sgj_xt.xt_storehouse) as t2 on t1.org_id = t2.i WHERE t2.i is null and t1.status = 1)tmp").Error
+	//err = tx.Exec("INSERT INTO sgj_xt.xt_storehouse(storehouse_code,storehouse_name,user_org_id,ctime)" +
+	//	"SELECT CONCAT(\"sh-\",FLOOR(RAND()*9000+1000)),\"默认仓库\",tmp.id,UNIX_TIMESTAMP()" +
+	//	"FROM" +
+	//	"(select t1.id FROM sgj_users.sgj_user_org as t1 LEFT JOIN " +
+	//	"(SELECT distinct user_org_id as i FROM sgj_xt.xt_storehouse) as t2 on t1.id = t2.i WHERE t2.i is null and t1.status != 0 and t1.import = 0)tmp").Error
+	return
+}
+
+//查找仓库表的orgid 减去仓库配置表的orgid，把结果插入到仓库配置表
+func StoreReduceConfig(tx *gorm.DB) (err error) {
+	err = tx.Exec("INSERT INTO sgj_xt.xt_storehouse_config(user_org_id,storehouse_info,storehouse_out_info,drug_storehouse_info,drug_storehouse_out,ctime)" +
+		"SELECT tmp.user_org_id,tmp.id,tmp.id,tmp.id,tmp.id,UNIX_TIMESTAMP()" +
+		"FROM(select t1.id,t1.user_org_id FROM sgj_xt.xt_storehouse as t1 LEFT JOIN " +
+		"(SELECT user_org_id as i FROM sgj_xt.xt_storehouse_config) as t2 on t1.user_org_id = t2.i WHERE t2.i is null and t1.status = 1)tmp").Error
+	return
+}
+
+//初始化 xt_storehouse 管理员的名字
+func initxt_storehouse(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_storehouse as t," +
+		"(SELECT o.id,o.creator from sgj_users.sgj_user_org as o," +
+		"(SELECT DISTINCT org_id from sgj_xt.xt_gobal_template)as t " +
+		"WHERE t.org_id = o.id )tmp " +
+		"SET t.storehouse_admin_id = tmp.creator,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE t.status = 1 and t.user_org_id = tmp.id").Error
+	return
+}
+
+//初始化 xt_stock_flow（完成）
+func initxt_stock_flow(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_stock_flow as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_stock_flow  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_drug_flow（完成）
+func initxt_drug_flow(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_drug_flow as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_drug_flow  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 dialysis_before_prepare（完成）
+func initdialysis_before_prepare(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.dialysis_before_prepare as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct user_org_id as orgid FROM sgj_xt.dialysis_before_prepare  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
+	return
+}
 
+//初始化 xt_automatic_reduce_detail（完成）
+func initxt_automatic_reduce_detail(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_automatic_reduce_detail as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_automatic_reduce_detail  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_drug_automatic_reduce_detail（完成）
+func initxt_drug_automatic_reduce_detail(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_drug_automatic_reduce_detail as t," +
+		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_automatic_reduce_detail  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_warehouse（完成）
+func initxt_warehouse(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_warehouse as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_warehouse  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_warehouse_info（完成）
+func initxt_warehouse_info(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_warehouse_info as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_warehouse_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_warehouse_out（完成）
+func initxt_warehouse_out(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_warehouse_out as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_warehouse_out  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_warehouse_out_info（完成）
+func initxt_warehouse_out_info(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_warehouse_out_info as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_warehouse_out_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_drug_warehouse（完成）
+func initxt_drug_warehouse(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_drug_warehouse as t," +
+		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_warehouse  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_drug_warehouse_info（完成）
+func initxt_drug_warehouse_info(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_drug_warehouse_info as t," +
+		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_warehouse_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_drug_warehouse_out（完成）
+func initxt_drug_warehouse_out(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_drug_warehouse_out as t," +
+		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_warehouse_out  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_drug_warehouse_out_info（完成）
+func initxt_drug_warehouse_out_info(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_drug_warehouse_out_info as t," +
+		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_warehouse_out_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_cancel_stock（完成）
+func initxt_cancel_stock(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_cancel_stock as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_cancel_stock  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_cancel_stock_info（完成）
+func initxt_cancel_stock_info(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_cancel_stock_info as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_cancel_stock_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_drug_cancel_stock（完成）
+func initxt_drug_cancel_stock(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_drug_cancel_stock as t," +
+		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_cancel_stock  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_drug_cancel_stock_info（完成）
+func initxt_drug_cancel_stock_info(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_drug_cancel_stock_info as t," +
+		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_cancel_stock_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_supplier_warehouse_info（完成）
+func initxt_supplier_warehouse_info(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehouse_info as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_supplier_warehouse_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_supplier_warehousing_info_order（完成）
+func initxt_supplier_warehousing_info_order(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehousing_info_order as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_supplier_warehousing_info_order  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_supplier_warehouse_out（完成）
+func initxt_supplier_warehouse_out(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehouse_out as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_supplier_warehouse_out  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_supplier_warehousing_out_order（完成）
+func initxt_supplier_warehousing_out_order(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehousing_out_order as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_supplier_warehousing_out_order  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_supplier_warehouse_cancel（完成）
+func initxt_supplier_warehouse_cancel(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehouse_cancel as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_supplier_warehouse_cancel  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
+	return
+}
+
+//初始化 xt_supplier_warehousing_cancel_order（完成）
+func initxt_supplier_warehousing_cancel_order(tx *gorm.DB) (err error) {
+	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehousing_cancel_order as t," +
+		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
+		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_supplier_warehousing_cancel_order  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
+		"WHERE t1.user_org_id = t2.orgid)tmp " +
+		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
+		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
+	return
+}
+
+//查询机构创建者的id
+func Getcreateid(orgid int64) (createid models.UserOrg, err error) {
+	err = XTReadDB().Select("id,creator").Where("id = ? and status = 1", orgid).Find(&createid).Error
+	return
+}
+
+//根据机构id查询拥有仓库管理权限的角色
+func FindRoles(orgid int64) map[string]int {
+	role := []models.RolePurviews{}
+	roles := make(map[string]int)
+	XTReadDB().Select("role_id").Where("purview_ids like \"%299%\" and org_id = ? and status = 1", orgid).Find(&role)
+	for i := 0; i < len(role); i++ {
+		roles[strconv.FormatInt(role[i].RoleId, 10)] = i
+	}
+	return roles
+}
+
+//判断两个切片中的元素是否有重复的，true有重复的元素，false无相同元素
+func IsIdentical(str1 []string, str2 []string) (t bool) {
+	t = false
+	if len(str1) == 0 || len(str2) == 0 {
+		return
+	}
+	map1, map2 := make(map[string]int), make(map[string]int)
+	for i := 0; i < len(str1); i++ {
+		map1[str1[i]] = i
+	}
+	for i := 0; i < len(str2); i++ {
+		map2[str2[i]] = i
+	}
+	for k, _ := range map1 {
+		if _, ok := map2[k]; ok {
+			t = true
+		}
+	}
+	return
 func ModifyWarehouseOut(id int64, orgid int64, good_id int64) error {
 	err := XTWriteDB().Model(&models.WarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"status": 0}).Error
 

service/self_drug_service.go

@@ -1006,7 +1006,7 @@ func GetDrugInventoryList(keyword string, page int64, limit int64, orgid int64,
 	if endtime > 0 {
 		db = db.Where("x.start_time<=?", endtime)
 	}
-	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.min_count,x.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.min_count,x.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Order("x.id desc").Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
 	return list, total, err
 }
 
@@ -1111,6 +1111,7 @@ func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid i
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
 	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Order("x.ctime desc").Offset(offset).Limit(limit).Scan(&list).Error
 	return list, total, err
 }
 

service/stock_service.go

@@ -5626,6 +5626,7 @@ func GetInventoryDetailList(keyword string, limit int64, page int64, orgid int64
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
 	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit,x.last_stock_count,x.type,x.inventory_type,x.stock_count,x.storehouse_id").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit,x.last_stock_count,x.type,x.inventory_type,x.stock_count,x.ctime").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Order("x.ctime desc").Offset(offset).Limit(limit).Scan(&list).Error
 	return list, total, err
 }
 

service/supply_service.go

@@ -169,30 +169,32 @@ func GetSupplyAndContactOne(id, orgId int64) (supply models.SpSupplierName, cont
 }
 
 //删除供应商及联系人
-func DelSupply(supply models.SpSupplierName, orgId int64) error {
+func DelSupply(supply models.SpSupplierName, orgId int64) (shiwu string, err error) {
 	tx := XTWriteDB().Begin()
 	defer func() {
 		if err != nil {
+			shiwu = "失败"
 			tx.Rollback()
 		} else {
+			shiwu = "成功"
 			tx.Commit()
 		}
 	}()
 	//删除供应商
-	err := tx.Model(&supply).Update("status", 0).Error
+	err = tx.Model(&supply).Update("status", 0).Error
 	if err != nil {
-		return err
+		return shiwu, err
 	}
 	var spcode models.SpSupplierName
 	//获取供应商编号
 	err = tx.Model(&models.SpSupplierName{}).Select("supplier_code").Where("user_org_id = ? and id = ?", orgId, supply.ID).First(&spcode).Error
 	if err != nil {
-		return err
+		return shiwu, err
 	}
 	//删除联系人
 	err = tx.Model(&models.SpSupplierContacts{}).Where("supplier_code = ? and user_org_id = ?", spcode.SupplierCode, orgId).Update("status", 0).Error
 
-	return err
+	return shiwu, err
 }
 
 //保存供应商和联系人