合并代码

controllers/mobile_api_controllers/patient_api_controller.go

@@ -7,6 +7,8 @@ import (
 	"XT_New/utils"
 	"encoding/json"
 	"fmt"
+	"github.com/jinzhu/gorm"
+	"math"
 	"strings"
 
 	// "fmt"
@@ -607,12 +609,117 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	advice.ExecutionState = 1
 	advice.Modifier = adminUserInfo.AdminUser.Id
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg":    "ok",
-		"advice": advice,
-		"ids":    ids,
-	})
-	return
+	//查询医嘱是否已经实行
+	if groupno > 0 {
+		advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+		for _, item := range advices {
+			//如果医嘱已经执行生成自备药出库单
+			if item.ExecutionState == 1 {
+
+				prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := service.FindAllWarehouseOut(adminUserInfo.Org.Id)
+				total = total + 1
+				warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+				number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+				number = number + total
+				warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+
+				medicalName, errcode := service.GetSelfMedicalByDrugName(item.AdviceName, item.AdviceDesc, item.PatientId)
+				if errcode == gorm.ErrRecordNotFound {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "ok",
+						"advice": advice,
+						"ids":    ids,
+					})
+					return
+				} else if errcode == nil {
+					stock := models.XtSelfOutStock{
+						DrugName:       item.AdviceName,
+						DrugNameId:     medicalName.DrugNameId,
+						DrugSpec:       item.AdviceDesc,
+						OutstoreNumber: outStoreNumber,
+						AdminUserId:    adminUserInfo.AdminUser.Id,
+						StorckTime:     item.AdviceDate,
+						UserOrgId:      adminUserInfo.Org.Id,
+						CreatedTime:    time.Now().Unix(),
+						Status:         1,
+						PatientId:      item.PatientId,
+						StockOutNumber: warehousing_out_order,
+						ExitMode:       2,
+						MedicId:        medicalName.ID,
+					}
+
+					//创建出库单
+					service.CreateOutStock(&stock)
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "ok",
+						"advice": advice,
+						"ids":    ids,
+					})
+					return
+				}
+
+			}
+		}
+	} else {
+		advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+		for _, item := range advices {
+			if item.ExecutionState == 1 {
+				prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := service.FindAllWarehouseOut(adminUserInfo.Org.Id)
+				total = total + 1
+				warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+				number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+				number = number + total
+				warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+
+				medicalName, errc := service.GetSelfMedicalByDrugName(item.AdviceName, item.AdviceDesc, item.PatientId)
+				if errc == gorm.ErrRecordNotFound {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "ok",
+						"advice": advice,
+						"ids":    ids,
+					})
+					return
+				} else if errc == nil {
+
+					stock := models.XtSelfOutStock{
+						DrugName:       item.AdviceName,
+						DrugNameId:     medicalName.DrugNameId,
+						DrugSpec:       item.AdviceDesc,
+						OutstoreNumber: outStoreNumber,
+						AdminUserId:    adminUserInfo.AdminUser.Id,
+						StorckTime:     item.AdviceDate,
+						UserOrgId:      adminUserInfo.Org.Id,
+						CreatedTime:    time.Now().Unix(),
+						Status:         1,
+						PatientId:      item.PatientId,
+						StockOutNumber: warehousing_out_order,
+						ExitMode:       2,
+						MedicId:        medicalName.ID,
+					}
+
+					//创建出库单
+					service.CreateOutStock(&stock)
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "ok",
+						"advice": advice,
+						"ids":    ids,
+					})
+					return
+				}
+
+			}
+		}
+	}
 
 }
 func (c *PatientApiController) ModifyExecDoctorAdvice() {

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -32,7 +32,6 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 	orgid := adminUserInfo.Org.Id
 	fmt.Println(orgid)
 	keywords := this.GetString("keyword")
-	fmt.Println("keyword099999999999---------------------------------", keywords)
 	start_time := this.GetString("start_time")
 	fmt.Println("start_time", start_time)
 	limit, _ := this.GetInt64("limit")

controllers/new_mobile_api_controllers/new_self_drug_api_controller.go

@@ -0,0 +1,50 @@
+package new_mobile_api_controllers
+
+import (
+	"XT_New/controllers/mobile_api_controllers"
+	"XT_New/enums"
+	"XT_New/service"
+	"fmt"
+)
+
+type NewDrugApiController struct {
+	mobile_api_controllers.MobileBaseAPIAuthController
+}
+
+func (this *NewDrugApiController) GetSelfMedicalList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	fmt.Println("222222222", patient_id)
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	orgId := adminUserInfo.Org.Id
+	medical, _ := service.GetSetSelfMedical(orgId)
+	//开启
+	if medical.DrugStart == 1 {
+		list, err := service.GetSelfMedicalList(patient_id)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取自备药失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"medicalList": list,
+		})
+	}
+}
+
+func (this *NewDrugApiController) GetDrugDescByDrugName() {
+
+	drug_name := this.GetString("drug_name")
+	fmt.Println("drug_name", drug_name)
+	patient_id, _ := this.GetInt64("patient_id")
+	fmt.Println("patient_id", patient_id)
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	orgId := adminUserInfo.Org.Id
+	drugspec, err := service.GetDrugDescByDrugName(drug_name, patient_id, orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugspec": drugspec,
+	})
+}

controllers/new_mobile_api_controllers/new_self_drug_api_router.go

@@ -0,0 +1,9 @@
+package new_mobile_api_controllers
+
+import "github.com/astaxie/beego"
+
+func NewDrugApiControllersRegisterRouters() {
+
+	beego.Router("/m/api/drug/getselfmedicallist", &NewDrugApiController{}, "Get:GetSelfMedicalList")
+	beego.Router("/m/api/getdrugdescbydrugname", &NewDrugApiController{}, "Get:GetDrugDescByDrugName")
+}

controllers/patient_api_controller.go

@@ -6,6 +6,8 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
+	"github.com/jinzhu/gorm"
+	"math"
 	"math/rand"
 	"reflect"
 	"regexp"
@@ -1510,11 +1512,13 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	advice, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
+
 	if advice.ID == 0 || advice.PatientId != patient {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
 		return
 	}
 
+	//医嘱已执行
 	if advice.ExecutionState == 1 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
 		return
@@ -1558,11 +1562,56 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	advice.ExecutionTime = theTime.Unix()
 	// advice.Checker = checker
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg":    "ok",
-		"advice": advice,
-	})
-	return
+	adviceName, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
+
+	//如果医嘱已执行，生成自备药出库单
+	if adviceName.ExecutionState == 1 {
+		prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
+		outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+
+		total = total + 1
+		warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+		number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+		number = number + total
+		warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+
+		medicalName, errcode := service.GetSelfMedicalByDrugName(adviceName.AdviceName, adviceName.AdviceDesc, adviceName.PatientId)
+		if errcode == gorm.ErrRecordNotFound {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":    "ok",
+				"advice": advice,
+			})
+			return
+		} else if errcode == nil {
+			outStock := models.XtSelfOutStock{
+				DrugName:       adviceName.AdviceName,
+				DrugSpec:       adviceName.AdviceDesc,
+				OutstoreNumber: outStoreNumber,
+				AdminUserId:    adminUserInfo.AdminUser.Id,
+				CreatedTime:    time.Now().Unix(),
+				Status:         1,
+				PatientId:      adviceName.PatientId,
+				StockOutNumber: warehousing_out_order,
+				ExitMode:       2,
+				StorckTime:     adviceName.AdviceDate,
+				MedicId:        medicalName.ID,
+				DrugNameId:     medicalName.DrugNameId,
+				UserOrgId:      adminUserInfo.CurrentOrgId,
+			}
+			//创建出库单,自动出库
+			service.CreateOutStock(&outStock)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":    "ok",
+				"advice": advice,
+			})
+			return
+		}
+	}
+
 }
 
 func (c *PatientApiController) CheckGroupAdvice() {

controllers/self_drug_api_congtroller.go

@@ -0,0 +1,661 @@
+package controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"encoding/json"
+	"fmt"
+	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
+	"strconv"
+	"strings"
+	"time"
+)
+
+type SelfDrugApiController struct {
+	BaseAuthAPIController
+}
+
+func SelfDrugRouters() {
+
+	beego.Router("/api/drug/getcurrentpatient", &SelfDrugApiController{}, "Get:GetCurrentPatient")
+	beego.Router("/api/drug/getalldrugname", &SelfDrugApiController{}, "Get:GetAllDrugName")
+	beego.Router("/api/drug/savedrugname", &SelfDrugApiController{}, "Get:SaveDrugName")
+	beego.Router("/api/drug/getdrugnamelist", &SelfDrugApiController{}, "Get:GetDrugNameList")
+	beego.Router("/api/drug/getrullename", &SelfDrugApiController{}, "Get:GetRulleName")
+	beego.Router("/api/drug/getunitbybaseid", &SelfDrugApiController{}, "Get:GetUnitByBaseId")
+	beego.Router("/api/drug/saverullename", &SelfDrugApiController{}, "Get:SaveRulleName")
+	beego.Router("/api/drug/editrullername", &SelfDrugApiController{}, "Get:EditRullerName")
+	beego.Router("/api/drug/updatedrullername", &SelfDrugApiController{}, "Get:UpdatedRullerName")
+	beego.Router("/api/drug/getalldrugnamelist", &SelfDrugApiController{}, "Get:GetAllDrugNameList")
+	beego.Router("/api/drug/getrulllistbydrugname", &SelfDrugApiController{}, "Get:GetRullerListByDrugName")
+	beego.Router("/api/drug/saveselfmedicines", &SelfDrugApiController{}, "Post:SaveSelfMedicines")
+	beego.Router("/api/drug/getcurrentorgallstaff", &SelfDrugApiController{}, "Get:GetCurrentOrgAllStaff")
+	beego.Router("/api/drug/savestock", &SelfDrugApiController{}, "Post:SaveStock")
+	beego.Router("/api/drug/saveoutstock", &SelfDrugApiController{}, "Post:SaveOutStock")
+	beego.Router("/api/drug/deletedrugbyid", &SelfDrugApiController{}, "Get:DeleteDrugById")
+	beego.Router("/api/drug/saveradio", &SelfDrugApiController{}, "Get:SaveRadio")
+	beego.Router("/api/drug/deletedrugstand", &SelfDrugApiController{}, "Get:DeleteDrugStand")
+	beego.Router("/api/drug/getstocklist", &SelfDrugApiController{}, "Get:GetStockList")
+	beego.Router("/api/drug/deletedrugname", &SelfDrugApiController{}, "Get:DeleteDrugName")
+	beego.Router("/api/drug/getdrugdetail", &SelfDrugApiController{}, "Get:GetDrugDetail")
+	beego.Router("/api/drug/getallpatientstocklist", &SelfDrugApiController{}, "Get:GetAllPatientStockList")
+	beego.Router("/api/drug/getdrugdatabypatientid", &SelfDrugApiController{}, "Get:GetDrugDataByPatientId")
+	beego.Router("/api/drug/getselfmedicallist", &SelfDrugApiController{}, "Get:GetSelfMedicalList")
+	beego.Router("/api/drug/getdrugdescbydrugname", &SelfDrugApiController{}, "Get:GetDrugDescByDrugName")
+}
+
+func (this *SelfDrugApiController) GetCurrentPatient() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	patient, err := service.GetCurrentPatient(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient": patient,
+	})
+}
+
+func (this *SelfDrugApiController) GetAllDrugName() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	drugName, err := service.GetAllDrugName(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugName": drugName,
+	})
+}
+
+func (this *SelfDrugApiController) SaveDrugName() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	drug_name := this.GetString("drug_name")
+	fmt.Println("drug_name", drug_name)
+	drugName := models.XtDrugName{
+		UserOrgId:   orgId,
+		DrugName:    drug_name,
+		Status:      1,
+		CreatedTime: time.Now().Unix(),
+	}
+	_, errcode := service.GetDrugName(drug_name, orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.SaveDrugName(&drugName)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"drugName": drugName,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+		return
+	}
+}
+
+func (this *SelfDrugApiController) GetDrugNameList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	list, err := service.GetDrugNameList(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *SelfDrugApiController) GetRulleName() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	name := this.GetString("name")
+	rulleName, err := service.GetRulleName(orgId, name)
+	rullerList, err := service.GetRulleList(orgId, name)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"rulleName":  rulleName,
+		"rullerList": rullerList,
+	})
+}
+
+func (this *SelfDrugApiController) GetUnitByBaseId() {
+
+	id, _ := this.GetInt64("id")
+	baseList, err := service.GetUnitByBaseId(id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"baseList": baseList,
+	})
+}
+
+func (this *SelfDrugApiController) SaveRulleName() {
+	drug_name := this.GetString("drug_name")
+	drug_spec := this.GetString("drug_spec")
+	drug_stock_limit := this.GetString("drug_stock_limit")
+	drug_name_id, _ := this.GetInt64("drug_name_id")
+	price, _ := this.GetInt64("price")
+	prices := strconv.FormatInt(price, 10)
+	durg_price, _ := strconv.ParseFloat(prices, 64)
+	unit := this.GetString("unit")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	fmt.Println(drug_name, drug_stock_limit, unit, price, drug_spec, orgId)
+	drugSpecName := models.XtStandName{
+		DrugName:       drug_name,
+		DrugSpec:       drug_spec,
+		DrugStockLimit: drug_stock_limit,
+		DrugNameId:     drug_name_id,
+		Price:          durg_price,
+		MinUnit:        unit,
+		UserOrgId:      orgId,
+		Status:         1,
+		CreatedTime:    time.Now().Unix(),
+	}
+
+	err := service.SaveRulleName(&drugSpecName)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"RullerName": drugSpecName,
+	})
+}
+
+func (this *SelfDrugApiController) EditRullerName() {
+
+	id, _ := this.GetInt64("id")
+	rullerDetail, err := service.GetRullerNameDetail(id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"rullerDetail": rullerDetail,
+	})
+}
+
+func (this *SelfDrugApiController) UpdatedRullerName() {
+
+	id, _ := this.GetInt64("id")
+	drug_name := this.GetString("drug_name")
+	drug_stock_limit := this.GetString("drug_stock_limit")
+	price, _ := this.GetInt64("price")
+	prices := strconv.FormatInt(price, 10)
+	durg_price, _ := strconv.ParseFloat(prices, 64)
+
+	drug_spec := this.GetString("drug_spec")
+	unit := this.GetString("unit")
+	drug_name_id, _ := this.GetInt64("drug_name_id")
+	RullerName := models.XtStandName{
+		DrugName:       drug_name,
+		DrugStockLimit: drug_stock_limit,
+		Price:          durg_price,
+		DrugSpec:       drug_spec,
+		MinUnit:        unit,
+		DrugNameId:     drug_name_id,
+	}
+
+	err := service.UpdatedRullerName(id, &RullerName)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"RullerName": RullerName,
+	})
+}
+
+func (this *SelfDrugApiController) GetAllDrugNameList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	rullerName, err := service.GetAllDrugNameList(orgId)
+
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"rullerName": rullerName,
+	})
+}
+
+func (this *SelfDrugApiController) GetRullerListByDrugName() {
+
+	drug_name := this.GetString("drug_name")
+	fmt.Println(drug_name)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	fmt.Println("orgid", orgId)
+	drugName, err := service.GetRullerListByDrugName(drug_name, orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugName": drugName,
+	})
+}
+
+func (this *SelfDrugApiController) SaveSelfMedicines() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	patient_id := int64(dataBody["patient_id"].(float64))
+	medicineData, _ := dataBody["medicineData"].([]interface{})
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	for _, item := range medicineData {
+		items := item.(map[string]interface{})
+		drug_name := items["drug_name"].(string)
+		id := int64(items["id"].(float64))
+		drug_spec := items["drug_spec"].(string)
+		min_unit := items["min_unit"].(string)
+		medical := models.XtSelfMedical{
+			DrugName:    drug_name,
+			DrugNameId:  id,
+			DrugSpec:    drug_spec,
+			CreatedTime: time.Now().Unix(),
+			Status:      1,
+			UserOrgId:   orgId,
+			PatientId:   patient_id,
+			MinUnit:     min_unit,
+		}
+		//查询同个病人同个药品同个规格是否已存在
+		_, errcode := service.GetSelfMedicalByDrugName(drug_name, drug_spec, patient_id)
+
+		if errcode == gorm.ErrRecordNotFound {
+			err := service.CreateSelfMedical(&medical)
+			fmt.Println(err)
+		} else if errcode == nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+			return
+		}
+
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *SelfDrugApiController) GetCurrentOrgAllStaff() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgid := adminUserInfo.CurrentOrgId
+	//fmt.Println(orgid)
+	appId := adminUserInfo.CurrentAppId
+	staff, err := service.GetCurrentOrgAllStaff(orgid, appId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"staff": staff,
+	})
+}
+
+func (this *SelfDrugApiController) SaveStock() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	fmt.Println("start_time", start_time)
+	admin_user_id, _ := this.GetInt64("admin_user_id")
+	fmt.Println("admin_user_id", admin_user_id)
+	patient_id, _ := this.GetInt64("patient_id")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	stocks, _ := dataBody["stocks"].([]interface{})
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	for _, item := range stocks {
+		items := item.(map[string]interface{})
+		drug_name := items["drug_name"].(string)
+		fmt.Println("drug_name", drug_name)
+		drug_name_id := int64(items["drug_name_id"].(float64))
+		fmt.Println("parient_id", drug_name_id)
+		drug_spec := items["drug_spec"].(string)
+		store_number := items["store_number"].(string)
+		fmt.Println("store_number", store_number)
+		storeNumber, _ := strconv.ParseInt(store_number, 10, 64)
+		remarks := items["remarks"].(string)
+		min_unit := items["min_unit"].(string)
+		medic_id := int64(items["id"].(float64))
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+
+		total = total + 1
+		warehousing_in_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+		number, _ := strconv.ParseInt(warehousing_in_order, 10, 64)
+		number = number + total
+		warehousing_in_order = "RKD" + strconv.FormatInt(number, 10)
+
+		theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		stock := models.XtSelfStock{
+			DrugName:      drug_name,
+			DrugNameId:    drug_name_id,
+			DrugSpec:      drug_spec,
+			StoreNumber:   storeNumber,
+			Remarks:       remarks,
+			AdminUserId:   admin_user_id,
+			StorckTime:    theTime.Unix(),
+			CreatedTime:   time.Now().Unix(),
+			Status:        1,
+			UserOrgId:     orgId,
+			StockInNumber: warehousing_in_order,
+			PatientId:     patient_id,
+			MinUnit:       min_unit,
+			StorageMode:   1,
+			MedicId:       medic_id,
+		}
+		err := service.CreateStock(&stock)
+		fmt.Println("err", err)
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *SelfDrugApiController) SaveOutStock() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	admin_user_id, _ := this.GetInt64("admin_user_id")
+	patient_id, _ := this.GetInt64("patient_id")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	outStocks, _ := dataBody["outStocks"].([]interface{})
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+
+	for _, item := range outStocks {
+		items := item.(map[string]interface{})
+		drug_name := items["drug_name"].(string)
+		drug_name_id := int64(items["drug_name_id"].(float64))
+		drug_spec := items["drug_spec"].(string)
+		outstore_number := items["outstore_number"].(string)
+		outStoreNumber, _ := strconv.ParseInt(outstore_number, 10, 64)
+		remarks := items["remarks"].(string)
+		medic_id := int64(items["id"].(float64))
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+
+		total = total + 1
+		warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+		number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+		number = number + total
+		warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+		fmt.Println(remarks)
+		fmt.Println(items)
+		theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		stock := models.XtSelfOutStock{
+			DrugName:       drug_name,
+			DrugNameId:     drug_name_id,
+			DrugSpec:       drug_spec,
+			OutstoreNumber: outStoreNumber,
+			Remarks:        remarks,
+			AdminUserId:    admin_user_id,
+			StorckTime:     theTime.Unix(),
+			CreatedTime:    time.Now().Unix(),
+			Status:         1,
+			UserOrgId:      orgId,
+			StockOutNumber: warehousing_out_order,
+			PatientId:      patient_id,
+			ExitMode:       1,
+			MedicId:        medic_id,
+		}
+		err := service.CreateOutStock(&stock)
+		fmt.Println("err", err)
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *SelfDrugApiController) DeleteDrugById() {
+	id, _ := this.GetInt64("id")
+	drug_name := this.GetString("drug_name")
+	fmt.Println("drug_name", drug_name)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+
+	_, errcode := service.GetStandDrugByDrugName(drug_name, orgId)
+	fmt.Println("errcode", errcode)
+	if errcode == gorm.ErrRecordNotFound {
+		service.DeleteDrugName(id)
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+	} else if errcode == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+		return
+	}
+}
+
+func (this *SelfDrugApiController) SaveRadio() {
+
+	radio, _ := this.GetInt64("radio")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	drugSet := models.XtDrugSet{
+		DrugStart:   radio,
+		UserOrgId:   orgId,
+		Status:      1,
+		CreatedTime: time.Now().Unix(),
+	}
+	_, errcode := service.GetDrugSetByUserOrgId(orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.SaveRadio(&drugSet)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"drugSet": drugSet,
+		})
+	} else if errcode == nil {
+		err := service.UpdateDrugSet(&drugSet, orgId)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"drugSet": drugSet,
+		})
+	}
+
+}
+
+func (this *SelfDrugApiController) DeleteDrugStand() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteDrugStand(id)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+}
+
+func (this *SelfDrugApiController) GetStockList() {
+
+	patientid, _ := this.GetInt64("id")
+	start_time := this.GetString("start_time")
+	fmt.Println("开始时间", start_time)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	startimeUnix := theTime.Unix()
+	keyword := this.GetString("keyword")
+	fmt.Println("keyword", keyword)
+	//统计总数量
+	stocklist, err := service.GetStockList(patientid, startimeUnix, keyword)
+
+	//统计出库数量
+	outStocklist, err := service.GetOutStockList(patientid, startimeUnix, keyword)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"stocklist":    stocklist,
+		"outStocklist": outStocklist,
+	})
+}
+
+func (this *SelfDrugApiController) DeleteDrugName() {
+
+	drug_name := this.GetString("drugname")
+	patient_id, _ := this.GetInt64("patientid")
+
+	//查询该药品是否出库
+	stocklist, _ := service.GetStockOutDetail(drug_name, patient_id)
+	if len(stocklist) == 0 {
+		//删除该药品
+		service.DeleteDrugStockNumber(drug_name, patient_id)
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+		return
+	}
+}
+
+func (this *SelfDrugApiController) GetDrugDetail() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	drug_name := this.GetString("drug_name")
+	drug_spec := this.GetString("drug_spec")
+	start_time := this.GetString("start_time")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	end_time := this.GetString("end_time")
+	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+	patient_id, _ := this.GetInt64("patient_id")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	//查询入库明细
+	stockDetail, err := service.GetStockDetail(drug_name, drug_spec, startTime.Unix(), endTime.Unix(), patient_id, orgId)
+
+	//查询出库明细
+	outStockDetail, err := service.GetOutStockDetail(drug_name, drug_spec, startTime.Unix(), endTime.Unix(), patient_id, orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"stockDetail":    stockDetail,
+		"outStockDetail": outStockDetail,
+	})
+}
+
+func (this *SelfDrugApiController) GetAllPatientStockList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	drug_name := this.GetString("drug_name")
+	drug_spec := this.GetString("drug_spec")
+	start_time := this.GetString("start_time")
+	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	startUnix := theTime.Unix()
+	end_time := this.GetString("end_time")
+	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+	endTimeUnix := endTimes.Unix()
+	keywords := this.GetString("search_input")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+
+	//入库
+	stocklist, err := service.GetAllPatientStockList(drug_name, drug_spec, startUnix, endTimeUnix, keywords, orgId)
+
+	//出库
+	outStockList, err := service.GetAllPatientOutStockList(drug_name, drug_spec, startUnix, endTimeUnix, keywords, orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"stocklist":    stocklist,
+		"outStockList": outStockList,
+	})
+}
+
+func (this *SelfDrugApiController) GetDrugDataByPatientId() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	fmt.Println("patient_id", patient_id)
+	medicalList, err := service.GetDrugDataByPatientId(patient_id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"medicalList": medicalList,
+	})
+}
+
+func (this *SelfDrugApiController) GetSelfMedicalList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	//查询该机构是否开启自备药
+	medical, _ := service.GetSetSelfMedical(orgId)
+	//开启
+	if medical.DrugStart == 1 {
+		list, err := service.GetSelfMedicalList(patient_id)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"medicalList": list,
+		})
+	}
+}
+
+func (this *SelfDrugApiController) GetDrugDescByDrugName() {
+
+	drug_name := this.GetString("drug_name")
+	fmt.Println("drug_name", drug_name)
+	patient_id, _ := this.GetInt64("patient_id")
+	fmt.Println("patient_id", patient_id)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	drugspec, err := service.GetDrugDescByDrugName(drug_name, patient_id, orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugspec": drugspec,
+	})
+}

controllers/sign_weigh_api_controller.go

@@ -403,7 +403,7 @@ func (c *SignWeighAPIController) EditData() {
 }
 
 func (c *SignWeighAPIController) Sighdata() {
-	fmt.Println("哈哈哈哈哈哈哈哈哈哈")
+
 	patientID, _ := c.GetInt64("patient_id", 0)
 	fmt.Println("patientID", patientID)
 	dateTime := c.GetString("date_time")
@@ -417,11 +417,9 @@ func (c *SignWeighAPIController) Sighdata() {
 		return
 	}
 	dateTimeStam := theTime.Unix()
-	fmt.Println("datatimestam是什么", dateTimeStam)
 	adminUserInfo := c.GetAdminUserInfo()
-	fmt.Println(adminUserInfo.CurrentOrgId, dateTimeStam, patientID)
 	sign, errord := service.GetSign(adminUserInfo.CurrentOrgId, dateTimeStam, patientID)
-	fmt.Println("sigh是什么东西", sign)
+	fmt.Println("sign", sign)
 	fmt.Println(err)
 	weighbefore, _ := c.GetFloat("weight_before", 0)
 	dryweightbefore, _ := c.GetFloat("dry_weight", 0)
@@ -436,9 +434,6 @@ func (c *SignWeighAPIController) Sighdata() {
 	breathingrateafter, _ := c.GetFloat("breathing_rateafter", 0)
 	systolicbloodpressureafter, _ := c.GetFloat("systolic_blood_pressureafter", 0)
 	diastolicbloodpressureafter, _ := c.GetFloat("diastolic_blood_pressureafter", 0)
-	fmt.Println("请查看数据")
-	fmt.Println("透前称重:", weighbefore, "干体重:", dryweightbefore, "透前温度", temperaturebefore, "透前脉搏", pulsefrequencybefore, "透前呼吸", breathinratebefore, "透前舒张压", systolicbloodpressurebefore, "透前伸缩呀", diastorlicbloodpressurebefore)
-	fmt.Println("透后体重", weightafter, "透后温度", temperatureafter, "透后脉搏", pulsefrequencyafter, "透后呼吸", breathingrateafter, "透后舒张压", systolicbloodpressureafter, "透后圣索亚", diastolicbloodpressureafter)
 
 	var sighForm models.SignWeight
 
@@ -469,21 +464,19 @@ func (c *SignWeighAPIController) Sighdata() {
 	if sighForm.WeightAfter > 0 {
 		sighForm.WeighTime = time.Now().Unix()
 	}
-	fmt.Println("sightForm是什么", sighForm)
+
 	if errord == gorm.ErrRecordNotFound {
-		fmt.Println("aaaaaaaaaaaaaa")
+
 		savesignweigh := service.Savesignweigh(&sighForm)
 		fmt.Println("savesignweight", savesignweigh)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"signs": sighForm,
 		})
-		//signweigh := service.GetSignweigh(adminUserInfo.CurrentOrgId, patientID)
-		//fmt.Println("signweigh是什么？",signweigh)
-		fmt.Println(sighForm)
+
 	} else if errord == nil {
 		service.Updatesignweigh(&sighForm, patientID, adminUserInfo.CurrentOrgId)
 	} else {
-		fmt.Println("ccccccccccccc")
+
 		service.Updatesignweigh(&sighForm, patientID, adminUserInfo.CurrentOrgId)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 	}

models/dialysis.go

@@ -759,6 +759,33 @@ type XtDialysisOrder struct {
 	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 }
 
+type XtDialysisOrders struct {
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	DialysisDate   int64  `gorm:"column:dialysis_date" json:"dialysis_date" form:"dialysis_date"`
+	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId      int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PrescriptionId int64  `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Stage          int64  `gorm:"column:stage" json:"stage" form:"stage"`
+	Remark         string `gorm:"column:remark" json:"remark" form:"remark"`
+	BedId          int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	StartNurse     int64  `gorm:"column:start_nurse" json:"start_nurse" form:"start_nurse"`
+	FinishNurse    int64  `gorm:"column:finish_nurse" json:"finish_nurse" form:"finish_nurse"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime    int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime    int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	StartTime      int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime        int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	PunctureNurse  int64  `gorm:"column:puncture_nurse" json:"puncture_nurse" form:"puncture_nurse"`
+	Creator        int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier       int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	FinishCreator  int64  `gorm:"column:finish_creator" json:"finish_creator" form:"finish_creator"`
+	FinishModifier int64  `gorm:"column:finish_modifier" json:"finish_modifier" form:"finish_modifier"`
+	SchedualType   int64  `gorm:"column:schedual_type" json:"schedual_type" form:"schedual_type"`
+	Number         int64  `gorm:"column:number" json:"number" form:"number"`
+	UserName       int64  `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+}
+
 func (XtDialysisOrder) TableName() string {
 	return "xt_dialysis_order"
 }

models/self_drug_models.go

@@ -0,0 +1,222 @@
+package models
+
+type DrugPatients 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"`
+	Name        string `gorm:"column:name" json:"name" form:"name"`
+	DialysisNo  string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+}
+
+func (DrugPatients) TableName() string {
+	return "xt_patients"
+}
+
+type XtBaseDrug struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName               string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias              string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin        string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi          string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory           int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec               string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType               int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit         string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace        string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm         int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	UnitMatrixing          string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
+	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice              float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugControl            int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
+	Number                 string  `gorm:"column:number" json:"number" form:"number"`
+	DrugClassify           string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
+	DrugDose               float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit           int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	PharmacologyCategory   int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
+	StatisticsCategory     int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	Code                   string  `gorm:"column:code" json:"code" form:"code"`
+	IsSpecialDiseases      int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord               int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	Agent                  int64   `gorm:"column:agent" json:"agent" form:"agent"`
+	DrugStatus             string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	LimitRemark            string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
+	DeliveryWay            string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency     string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	SingleDose             float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	PrescribingNumber      float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	Label                  int64   `gorm:"column:label" json:"label" form:"label"`
+	Sort                   int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsUseDoctorAdvice      int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
+	IsDefault              int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargePredict        int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork       int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	IsChargeUse            int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	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"`
+	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (XtBaseDrug) TableName() string {
+	return "xt_base_drug"
+}
+
+type XtDrugName struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName    string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ParentId    int64  `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+}
+
+func (XtDrugName) TableName() string {
+	return "xt_drug_name"
+}
+
+type XtStandName struct {
+	ID             int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugSpec       string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	MinUnit        string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Price          float64 `gorm:"column:price" json:"price" form:"price"`
+	DrugStockLimit string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugNameId     int64   `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status         int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime    int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime    int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	DrugName       string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+}
+
+func (XtStandName) TableName() string {
+	return "xt_stand_name"
+}
+
+type XtSelfMedical struct {
+	DrugName    string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugSpec    string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	DrugNameId  int64  `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	CreatedTime int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	MinUnit     string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+}
+
+func (XtSelfMedical) TableName() string {
+	return "xt_self_medical"
+}
+
+type XtSelfStock struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName      string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugNameId    int64  `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	DrugSpec      string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	Remarks       string `gorm:"column:remarks" json:"remarks" form:"remarks"`
+	StoreNumber   int64  `gorm:"column:store_number" json:"store_number" form:"store_number"`
+	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	StorckTime    int64  `gorm:"column:storck_time" json:"storck_time" form:"storck_time"`
+	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	CreatedTime   int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime   int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	StockInNumber string `gorm:"column:stock_in_number" json:"stock_in_number" form:"stock_in_number"`
+	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MinUnit       string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StorageMode   int64  `gorm:"column:storage_mode" json:"storage_mode" form:"storage_mode"`
+	MedicId       int64  `gorm:"column:medic_id" json:"medic_id" form:"medic_id"`
+}
+
+func (XtSelfStock) TableName() string {
+	return "xt_self_stock"
+}
+
+type XtSelfOutStock struct {
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName       string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugNameId     int64  `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	DrugSpec       string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	Remarks        string `gorm:"column:remarks" json:"remarks" form:"remarks"`
+	OutstoreNumber int64  `gorm:"column:outstore_number" json:"outstore_number" form:"outstore_number"`
+	AdminUserId    int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	StorckTime     int64  `gorm:"column:storck_time" json:"storck_time" form:"storck_time"`
+	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	CreatedTime    int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime    int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	PatientId      int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	StockOutNumber string `gorm:"column:stock_out_number" json:"stock_out_number" form:"stock_out_number"`
+	ExitMode       int64  `gorm:"column:exit_mode" json:"exit_mode" form:"exit_mode"`
+	MedicId        int64  `gorm:"column:medic_id" json:"medic_id" form:"medic_id"`
+}
+
+func (XtSelfOutStock) TableName() string {
+	return "xt_self_out_stock"
+}
+
+type XtDrugSet struct {
+	ID          int64 `gorm:"column:id" json:"id" form:"id"`
+	DrugStart   int64 `gorm:"column:drug_start" json:"drug_start" form:"drug_start"`
+	UserOrgId   int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status      int64 `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+}
+
+func (XtDrugSet) TableName() string {
+	return "xt_drug_set"
+}
+
+type SelfStocks struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName      string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugNameId    int64  `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	DrugSpec      string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	Remarks       string `gorm:"column:remarks" json:"remarks" form:"remarks"`
+	StoreNumber   int64  `gorm:"column:store_number" json:"store_number" form:"store_number"`
+	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	StorckTime    int64  `gorm:"column:storck_time" json:"storck_time" form:"storck_time"`
+	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	CreatedTime   int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime   int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	StockInNumber string `gorm:"column:stock_in_number" json:"stock_in_number" form:"stock_in_number"`
+	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MinUnit       string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	MedicId       int64  `gorm:"column:medic_id" json:"medic_id" form:"medic_id"`
+	Name          string `gorm:"column:name" json:"name" form:"name"`
+	DialysisNO    string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	Total         int64
+}
+
+type XtSelfOutStocks struct {
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName       string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugNameId     int64  `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	DrugSpec       string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	Remarks        string `gorm:"column:remarks" json:"remarks" form:"remarks"`
+	OutstoreNumber int64  `gorm:"column:outstore_number" json:"outstore_number" form:"outstore_number"`
+	AdminUserId    int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	StorckTime     int64  `gorm:"column:storck_time" json:"storck_time" form:"storck_time"`
+	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	CreatedTime    int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime    int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	PatientId      int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	StockOutNumber string `gorm:"column:stock_out_number" json:"stock_out_number" form:"stock_out_number"`
+	MedicId        int64  `gorm:"column:medic_id" json:"medic_id" form:"medic_id"`
+	Name           string `gorm:"column:name" json:"name" form:"name"`
+	DialysisNO     string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	Count          int64
+}

routers/router.go

@@ -68,5 +68,6 @@ func init() {
 	new_m_api.StaffScheduleApiControllersRegisterRouters()
 	controllers.DialysisPrameteRoutes()
 	new_m_api.DialysisParameterApiControllersRegisterRouters()
-
+	controllers.SelfDrugRouters()
+	new_m_api.NewDrugApiControllersRegisterRouters()
 }

service/dialysis_service.go

@@ -547,8 +547,8 @@ func FindDialysisMode(orgID int64, patientId int64, scheduleDate int64) (models.
 	return schedule, err
 }
 
-func FindDialysisMacher(orgid int64, patientid int64, dialysisDate int64) (models.XtDialysisOrder, error) {
-	orders := models.XtDialysisOrder{}
+func FindDialysisMacher(orgid int64, patientid int64, dialysisDate int64) (models.XtDialysisOrders, error) {
+	orders := models.XtDialysisOrders{}
 	db := readDb.Table("xt_dialysis_order as o").Where("o.status = 1")
 	table := readDb.Table("xt_device_number as n")
 	fmt.Print("table", table)

service/self_drug_service.go

@@ -0,0 +1,309 @@
+package service
+
+import (
+	"XT_New/models"
+	"fmt"
+	"github.com/jinzhu/gorm"
+)
+
+func GetCurrentPatient(orgid int64) (patients []*models.DrugPatients, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&patients).Error
+	return patients, err
+}
+
+func GetAllDrugName(orgid int64) (baseDrug []*models.XtBaseDrug, err error) {
+
+	err = XTReadDB().Group("drug_name").Where("org_id = ? and status = 1", orgid).Find(&baseDrug).Error
+	return baseDrug, err
+
+}
+
+func GetDrugName(drugname string, orgid int64) (*models.XtDrugName, error) {
+
+	drugName := models.XtDrugName{}
+	err := XTReadDB().Model(&drugName).Where("drug_name = ? and user_org_id = ? and status  =1", drugname, orgid).Find(&drugName).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &drugName, nil
+}
+
+func SaveDrugName(drugname *models.XtDrugName) error {
+
+	err := XTWriteDB().Create(&drugname).Error
+	return err
+}
+
+func GetDrugNameList(orgid int64) (druname []*models.XtDrugName, err error) {
+
+	err = XTReadDB().Model(&druname).Where("user_org_id = ? and status = 1", orgid).Find(&druname).Error
+	return druname, err
+}
+
+func GetRulleName(orgid int64, name string) (baseDrug []*models.XtBaseDrug, err error) {
+
+	err = XTReadDB().Model(&baseDrug).Where("org_id = ? and drug_name = ? and status = 1", orgid, name).Find(&baseDrug).Error
+	return baseDrug, err
+}
+
+func GetRulleList(orgid int64, name string) (rulleName []*models.XtStandName, err error) {
+
+	err = XTReadDB().Model(&rulleName).Where("user_org_id = ? and drug_name = ? and status = 1", orgid, name).Find(&rulleName).Error
+	return rulleName, err
+}
+
+func GetUnitByBaseId(id int64) (models.XtBaseDrug, error) {
+	drug := models.XtBaseDrug{}
+	err := XTReadDB().Model(&drug).Where("id = ? and status = 1", id).Find(&drug).Error
+	return drug, err
+}
+
+func SaveRulleName(rullName *models.XtStandName) error {
+
+	err := XTWriteDB().Model(&rullName).Create(&rullName).Error
+	return err
+}
+
+func GetRullerNameDetail(id int64) (models.XtStandName, error) {
+	rullerName := models.XtStandName{}
+	err := XTReadDB().Model(&rullerName).Where("id= ? and status = 1", id).Find(&rullerName).Error
+	return rullerName, err
+}
+
+func UpdatedRullerName(id int64, re *models.XtStandName) error {
+
+	err := XTWriteDB().Model(&re).Where("id=?", id).Update(map[string]interface{}{"drug_spec": re.DrugSpec, "min_unit": re.MinUnit, "price": re.Price, "drug_stock_limit": re.DrugStockLimit, "drug_name": re.DrugName, "drug_name_id": re.DrugNameId}).Error
+	return err
+}
+
+func GetAllDrugNameList(orgid int64) (rullername []*models.XtStandName, err error) {
+
+	err = XTReadDB().Group("drug_name").Model(&rullername).Where("user_org_id = ? and status = 1", orgid).Find(&rullername).Error
+	return rullername, err
+}
+
+func GetRullerListByDrugName(drugname string, orgid int64) (rullername []*models.XtStandName, err error) {
+
+	err = XTReadDB().Model(&rullername).Where("drug_name = ? and user_org_id = ? and status = 1", drugname, orgid).Find(&rullername).Error
+	return rullername, err
+}
+
+func GetSelfMedicalByDrugName(drugname string, drug_spec string, patientid int64) (*models.XtSelfMedical, error) {
+	medical := models.XtSelfMedical{}
+	err := XTReadDB().Model(&medical).Where("drug_name = ? and drug_spec = ? and patient_id = ? and status = 1", drugname, drug_spec, patientid).Find(&medical).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &medical, err
+}
+
+func CreateSelfMedical(medical *models.XtSelfMedical) error {
+
+	err = XTWriteDB().Model(&medical).Create(&medical).Error
+	return err
+}
+
+func GetCurrentOrgAllStaff(orgid int64, app int64) (role []*models.SgjUserAdminRole, err error) {
+
+	err = UserReadDB().Model(&role).Where("org_id = ? and app_id = ? and status = 1", orgid, app).Find(&role).Error
+	return role, err
+}
+
+func CreateStock(stock *models.XtSelfStock) error {
+
+	err := XTWriteDB().Model(&stock).Create(&stock).Error
+	return err
+}
+
+func CreateOutStock(stock *models.XtSelfOutStock) error {
+
+	err := XTWriteDB().Model(&stock).Create(&stock).Error
+	return err
+}
+
+func GetStandDrugByDrugName(drugname string, orgid int64) (*models.XtStandName, error) {
+	standname := models.XtStandName{}
+	err := XTReadDB().Model(&standname).Where("drug_name = ? and user_org_id = ? and status = 1", drugname, orgid).Find(&standname).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &standname, nil
+}
+
+func DeleteDrugName(id int64) (models.XtStandName, error) {
+	standName := models.XtStandName{}
+	err := XTWriteDB().Model(&standName).Where("id = ?", id).Update(map[string]interface{}{"status": 0}).Error
+	return standName, err
+}
+
+func GetDrugSetByUserOrgId(orgid int64) (*models.XtDrugSet, error) {
+	set := models.XtDrugSet{}
+	err := XTReadDB().Model(&set).Where("user_org_id = ? and status = 1", orgid).Find(&set).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &set, nil
+}
+
+func SaveRadio(drugSet *models.XtDrugSet) error {
+
+	err := XTWriteDB().Model(&drugSet).Create(&drugSet).Error
+	return err
+}
+
+func UpdateDrugSet(set *models.XtDrugSet, orgid int64) error {
+
+	err := XTWriteDB().Model(&set).Where("user_org_id = ?", orgid).Update(map[string]interface{}{"drug_start": set.DrugStart}).Error
+	return err
+}
+
+func DeleteDrugStand(id int64) error {
+
+	standName := models.XtStandName{}
+	err := XTWriteDB().Model(&standName).Where("id =?", id).Update(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetStockList(patientid int64, startime int64, keyword string) (stock []*models.SelfStocks, err error) {
+	db := XTReadDB().Table("xt_self_stock as x").Where("x.status = 1")
+	likeKey := "%" + keyword + "%"
+	table := XTReadDB().Table("xt_patients as s")
+	fmt.Println(table)
+	if patientid > 0 {
+		db = db.Where("x.patient_id = ?", patientid)
+	}
+	//if startime >0 {
+	//  db = db.Where("x.storck_time = ?", startime)
+	//}
+	err = db.Group("x.drug_name,x.drug_spec").Select("x.id,x.drug_name,x.drug_name_id,x.drug_spec,x.remarks,x.store_number,x.admin_user_id,x.storck_time,x.user_org_id,x.stock_in_number,x.patient_id,x.min_unit,sum(x.store_number) as total").Joins("left join xt_patients as  s on s.id = x.patient_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Scan(&stock).Error
+	return stock, err
+}
+
+func GetOutStockList(patientid int64, startime int64, keyword string) (outStock []*models.XtSelfOutStocks, err error) {
+	db := XTReadDB().Table("xt_self_out_stock as x").Where("x.status = 1")
+	likeKey := "%" + keyword + "%"
+	table := XTReadDB().Table("xt_patients as s")
+	fmt.Println(table)
+	if patientid > 0 {
+		db = db.Where("x.patient_id = ?", patientid)
+	}
+	//if startime > 0 {
+	//  db = db.Where("x.storck_time = ?", startime)
+	//}
+	err = db.Group("x.drug_name,x.drug_spec").Select("x.drug_name,x.drug_spec,x.patient_id,x.stock_out_number,sum(x.outstore_number) as count").Joins("left join xt_patients as  s on s.id = x.patient_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Scan(&outStock).Error
+	return outStock, err
+}
+
+func GetStockOutDetail(durgname string, patientid int64) (stock []*models.XtSelfOutStock, err error) {
+
+	err = XTReadDB().Model(&stock).Where("drug_name = ? and patient_id = ? and status = 1", durgname, patientid).Find(&stock).Error
+	return stock, err
+}
+
+func DeleteDrugStockNumber(drugname string, patientid int64) (models.XtSelfStock, error) {
+	stock := models.XtSelfStock{}
+	err := XTWriteDB().Model(&stock).Where("drug_name = ? and patient_id = ?", drugname, patientid).Update(map[string]interface{}{"status": 0}).Error
+	return stock, err
+}
+
+func GetStockDetail(drugname string, drugspec string, startime int64, endtime int64, patientid int64, orgid int64) (stock []*models.XtSelfStock, err error) {
+	fmt.Println("startime", startime)
+	fmt.Println("endtime", endtime)
+	err = XTReadDB().Model(&stock).Where("drug_name = ? and drug_spec = ? and patient_id =? and user_org_id = ? and status = 1", drugname, drugspec, patientid, orgid).Find(&stock).Error
+	return stock, err
+}
+
+func GetOutStockDetail(drugname string, drugspec string, startime int64, endtime int64, patientid int64, orgid int64) (outStock []*models.XtSelfOutStock, err error) {
+	fmt.Println(startime)
+	fmt.Println(endtime)
+	err = XTReadDB().Model(&outStock).Where("drug_name = ? and drug_spec=? and patient_id = ? and user_org_id = ? and status = 1", drugname, drugspec, patientid, orgid).Find(&outStock).Error
+	return outStock, err
+}
+
+func GetAllPatientStockList(drug_name string, drug_spec string, startime int64, endtime int64, keyword string, orgid int64) (stocks []*models.SelfStocks, err error) {
+
+	db := XTReadDB().Table("xt_self_stock as x").Where("x.status = 1")
+	likeKey := "%" + keyword + "%"
+	table := XTReadDB().Table("xt_patients as s")
+	fmt.Println(table)
+	if len(drug_name) > 0 {
+		db = db.Where("x.drug_name = ?", drug_name)
+	}
+	if len(drug_spec) > 0 {
+		db = db.Where("x.drug_spec = ?", drug_spec)
+	}
+	if startime > 0 {
+		db = db.Where("x.storck_time >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.storck_time <= ?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Group("x.patient_id,x.drug_name,x.drug_spec").Select("x.drug_name,x.drug_spec,x.patient_id,x.store_number,sum(x.store_number) as total,s.name,s.dialysis_no,x.min_unit").Joins("left join xt_patients as  s on s.id = x.patient_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Scan(&stocks).Error
+	return stocks, err
+}
+
+func GetAllPatientOutStockList(drug_name string, drug_spec string, startime int64, endtime int64, keyword string, orgid int64) (outStock []*models.XtSelfOutStocks, err error) {
+
+	db := XTReadDB().Table("xt_self_out_stock as x").Where("x.status = 1")
+	likeKey := "%" + keyword + "%"
+	table := XTReadDB().Table("xt_patients as s")
+	fmt.Println(table)
+	if len(drug_name) > 0 {
+		db = db.Where("x.drug_name = ?", drug_name)
+	}
+	if len(drug_spec) > 0 {
+		db = db.Where("x.drug_spec=?", drug_spec)
+	}
+
+	if startime > 0 {
+		db = db.Where("x.storck_time >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.storck_time<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Group("x.patient_id,x.drug_name,x.drug_spec").Select("x.drug_name,x.drug_spec,x.patient_id,x.stock_out_number,sum(x.outstore_number) as count").Joins("left join xt_patients as  s on s.id = x.patient_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Scan(&outStock).Error
+	return outStock, err
+}
+
+func GetDrugDataByPatientId(patientid int64) (selfMedical []*models.XtSelfMedical, err error) {
+
+	err = XTReadDB().Group("drug_name,drug_spec").Model(&selfMedical).Where("patient_id = ? and status = 1", patientid).Find(&selfMedical).Error
+	return selfMedical, err
+}
+
+func GetSetSelfMedical(orgid int64) (models.XtDrugSet, error) {
+	medical := models.XtDrugSet{}
+	err := XTReadDB().Model(&medical).Where("user_org_id = ? and status = 1", orgid).Find(&medical).Error
+	return medical, err
+}
+
+func GetSelfMedicalList(patientid int64) (selfmedical []*models.XtSelfMedical, err error) {
+
+	err = XTReadDB().Group("drug_name").Model(&selfmedical).Where("patient_id = ? and status = 1", patientid).Find(&selfmedical).Error
+	return selfmedical, err
+}
+
+func GetDrugDescByDrugName(drugname string, patient_id int64, orgid int64) (selfMedical []*models.XtSelfMedical, err error) {
+
+	err = XTReadDB().Model(&selfMedical).Where("drug_name = ? and patient_id = ? and user_org_id = ? and status = 1", drugname, patient_id, orgid).Find(&selfMedical).Error
+	return selfMedical, err
+}