11月9日库存管理

controllers/service/admin_service.go

@@ -1,414 +0,0 @@
-// 统计后台的 service
-
-package service
-
-import (
-	"XT_New/models"
-	"XT_New/models/admin_models"
-	"time"
-
-	"github.com/jinzhu/gorm"
-)
-
-func GetAdminAccount(account string, password string) (*admin_models.AdminAccount, error) {
-	var model admin_models.AdminAccount
-	err := readUserDb.Where("account = ? AND pwd = ? AND status = 1", account, password).First(&model).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		}
-		return nil, err
-	}
-	return &model, nil
-}
-
-// 获取总机构数
-func GetTotalOrgCount() (int, error) {
-	var count int
-	err := readUserDb.Model(&models.Org{}).Where("status <> 0").Count(&count).Error
-	if err != nil {
-		return 0, err
-	}
-	return count, nil
-
-}
-
-// 获取一段时间内注册的机构数量
-func GetRegistedOrgCountFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	err := readUserDb.Model(&models.Org{}).Where("status <> 0 AND ctime >= ? AND ctime <= ?", from.Unix(), to.Unix()).Count(&count).Error
-	if err != nil {
-		return 0, err
-	}
-	return count, nil
-}
-
-// 获取一段时间内注册的机构
-func GetRegistedOrgsFromDayToDay(from time.Time, to time.Time) ([]*models.Org, error) {
-	var orgs []*models.Org
-	err := readUserDb.Model(&models.Org{}).Where("status <> 0 AND ctime >= ? AND ctime <= ?", from.Unix(), to.Unix()).Find(&orgs).Error
-	if err != nil {
-		return nil, err
-	}
-	return orgs, nil
-}
-
-// 获取一段时间内的活跃机构数
-func GetActiveOrgCountFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	rows, err := readUserDb.Raw("SELECT COUNT(DISTINCT org_id) AS count FROM sgj_user_admin_login_log WHERE ctime >= ? AND ctime <= ?", from.Unix(), to.Unix()).Rows()
-	if err != nil {
-		return 0, err
-	}
-	if rows.Next() {
-		rows.Scan(&count)
-	}
-	return count, nil
-}
-
-type ActiveOrgListVM struct {
-	models.Org
-	ActiveTime int64 `gorm:"column:active_time" json:"active_time"`
-}
-
-// 获取一段时间内的活跃机构
-func GetActiveOrgsFromDayToDay(from time.Time, to time.Time) ([]*ActiveOrgListVM, error) {
-	var orgs []*ActiveOrgListVM
-	err := readUserDb.Raw("select * from (select log.org_id, org.*, log.ctime as active_time from sgj_user_admin_login_log as log left join sgj_user_org as org on log.org_id = org.id where log.ctime >= ? AND log.ctime <= ? AND org.status <> 0 order by log.ctime desc) as t group by t.org_id;", from.Unix(), to.Unix()).Scan(&orgs).Error
-	if err != nil {
-		return nil, err
-	}
-	return orgs, nil
-}
-
-// 获取一段时间内的活跃账户数
-func GetActiveAdminUserCountFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	rows, err := readUserDb.Raw("SELECT COUNT(DISTINCT admin_user_id) AS count FROM sgj_user_admin_login_log WHERE ctime >= ? AND ctime <= ? AND operate_type = 1", from.Unix(), to.Unix()).Rows()
-	if err != nil {
-		return 0, err
-	}
-	if rows.Next() {
-		rows.Scan(&count)
-	}
-	return count, nil
-}
-
-type ActiveAdminUserListVM struct {
-	models.App_Role
-	OrgName    string `gorm:"column:org_name" json:"org_name"`
-	ActiveTime int64  `gorm:"column:active_time" json:"active_time"`
-}
-
-// 获取一段时间内的活跃账户
-func GetActiveAdminUsersFromDayToDay(from time.Time, to time.Time) ([]*ActiveAdminUserListVM, error) {
-	var users []*ActiveAdminUserListVM
-	err := readUserDb.Raw("select * from (select log.admin_user_id as uid, admin.*, org.org_name, log.ctime as active_time from sgj_user_admin_login_log as log left join sgj_user_admin_role as admin on log.admin_user_id = admin.admin_user_id left join sgj_user_org as org on log.org_id = org.id where log.ctime >= ? AND log.ctime <= ? AND log.operate_type = 1 AND admin.status > 0 order by log.ctime desc) as t group by t.uid;", from.Unix(), to.Unix()).Scan(&users).Error
-	if err != nil {
-		return nil, err
-	}
-	return users, nil
-}
-
-// 获取即将到期机构数
-func GetWillExpireOrgCountFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	rows, err := readUserDb.Raw("SELECT COUNT(DISTINCT org_id) AS count FROM sgj_serve_subscibe WHERE period_end >= ? AND period_end <= ? AND state <> 9 GROUP BY org_id;", from.Unix(), to.Unix()).Rows()
-	if err != nil {
-		return 0, err
-	}
-	if rows.Next() {
-		rows.Scan(&count)
-	}
-	return count, nil
-}
-
-// 获取已到期机构数
-func GetDidExpiredOrgCountFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	rows, err := readUserDb.Raw("SELECT COUNT(DISTINCT org_id) AS count FROM sgj_serve_subscibe WHERE period_end >= ? AND period_end <= ? AND state <> 9 GROUP BY org_id;", from.Unix(), to.Unix()).Rows()
-	if err != nil {
-		return 0, err
-	}
-	if rows.Next() {
-		rows.Scan(&count)
-	}
-	return count, nil
-}
-
-type ExpireOrgListVM struct {
-	OrgID      int64  `gorm:"column:org_id" json:"org_id"`
-	OrgName    string `gorm:"column:org_name" json:"org_name"`
-	PeriodEnd  int64  `gorm:"column:period_end" json:"period_end"`
-	Telephone  string `gorm:"column:telephone" json:"telephone"`
-	ExpireDays int    `gorm:"-" json:"expire_days"`
-}
-
-// 获取即将到期机构
-func GetWillExpireOrgsFromDayToDay(from time.Time, to time.Time) ([]*ExpireOrgListVM, error) {
-	var vms []*ExpireOrgListVM
-	err := readUserDb.Raw("select s_o.org_id, s_o.period_end, o.org_name, o.telephone from (select ss.* from (select s.org_id as org_id, s.id as sid, s.period_end from sgj_serve_subscibe as s where s.period_end <= ? AND s.period_end >= ? AND s.state <> 9 order by s.id desc) as ss group by ss.org_id) as s_o left join sgj_user_org as o on o.id = s_o.org_id", to.Unix(), from.Unix()).Scan(&vms).Error
-	if err != nil {
-		return nil, err
-	}
-	for _, vm := range vms {
-		vm.ExpireDays = time.Unix(vm.PeriodEnd, 0).Day() - from.Day()
-	}
-	return vms, nil
-}
-
-// 获取已到期机构
-func GetDidExpireOrgsFromDayToDay(from time.Time, to time.Time) ([]*ExpireOrgListVM, error) {
-	var vms []*ExpireOrgListVM
-	err := readUserDb.Raw("select s_o.org_id, s_o.period_end, o.org_name, o.telephone from (select ss.* from (select s.org_id as org_id, s.id as sid, s.period_end from sgj_serve_subscibe as s where s.period_end >= ? AND s.period_end <= ? AND s.state <> 9 order by s.id desc) as ss group by ss.org_id) as s_o left join sgj_user_org as o on o.id = s_o.org_id", from.Unix(), to.Unix()).Scan(&vms).Error
-	if err != nil {
-		return nil, err
-	}
-	for _, vm := range vms {
-		vm.ExpireDays = to.Day() - time.Unix(vm.PeriodEnd, 0).Day()
-	}
-	return vms, nil
-}
-
-// 获取一段时间内的透析次数
-func GetDialysisTimesFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	err := readDb.Model(&models.DialysisOrder{}).Where("status > 0 AND dialysis_date >= ? AND dialysis_date <= ?", from.Unix(), to.Unix()).Count(&count).Error
-	if err != nil {
-		return 0, err
-	}
-	return count, nil
-}
-
-// 获取一段时间内的监控次数
-func GetMonitoringTimesFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	err := readDb.Model(&models.MonitoringRecord{}).Where("status > 0 AND monitoring_date >= ? AND monitoring_date <= ?", from.Unix(), to.Unix()).Count(&count).Error
-	if err != nil {
-		return 0, err
-	}
-	return count, nil
-}
-
-// 获取一段时间内新增病人数量
-func GetNewPatientCountFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	err := readDb.Model(&models.Patients{}).Where("status > 0 AND created_time >= ? AND created_time <= ?", from.Unix(), to.Unix()).Count(&count).Error
-	if err != nil {
-		return 0, err
-	}
-	return count, nil
-}
-
-// 获取病人性别分布
-func GetPatientGenderDistribution() (int, int, int, error) {
-	var maleCount, femaleCount, unknowGenderCount int
-	rows, err := readDb.Raw("SELECT count(id), gender FROM xt_patients WHERE (status > 0) group by gender;").Rows()
-	if err != nil {
-		return 0, 0, 0, err
-	}
-	for rows.Next() {
-		var gender, count int
-		rows.Scan(&count, &gender)
-		if gender == 1 {
-			maleCount = count
-		} else if gender == 2 {
-			femaleCount = count
-		} else {
-			unknowGenderCount = count
-		}
-	}
-	return maleCount, femaleCount, unknowGenderCount, nil
-}
-
-// 获取某种传染病的病人数，diseaseType = 0时为没有传染病
-// 1乙肝 2丙肝 3艾滋病 4肺结核 5梅毒
-func GetInfectiousDiseasePatientCount(diseaseType int) (int, error) {
-	if diseaseType == 0 {
-		var count int
-		rows, err := readDb.Raw("select count(p.id) from xt_patients as p where id not in (select p_d.patient_id from xt_patients_infectious_diseases as p_d where status = 1 group by p_d.patient_id) and status = 1;").Rows()
-		if err != nil {
-			return 0, err
-		}
-		if rows.Next() {
-			rows.Scan(&count)
-		}
-		return count, nil
-
-	} else {
-		var count int
-		rows, err := readDb.Raw("select count(distinct patient_id) from xt_patients_infectious_diseases where status = 1 and disease_id = ?;", diseaseType).Rows()
-		if err != nil {
-			return 0, err
-		}
-		if rows.Next() {
-			rows.Scan(&count)
-		}
-		return count, nil
-	}
-}
-
-// 获取患者年龄分布
-func GetPatientAgeDistribution() ([]*PatientAgeCountStruct, error) {
-	var counts []*PatientAgeCountStruct
-	err := readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM (
-		SELECT
-			CASE
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d'))<10 THEN '10'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=10 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<20 THEN '20'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=20 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<30 THEN '30'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=30 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<40 THEN '40'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=40 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<50 THEN '50'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=50 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<60 THEN '60'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=60 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<70 THEN '70'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=70 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<80 THEN '80'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=80 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<90 THEN '90'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=90 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<100 THEN '100'
-				ELSE '-1'
-			END
-		AS nnd FROM xt_patients where status=1
-	) a GROUP BY nnd;`).Scan(&counts).Error
-	if err != nil {
-		return nil, err
-	}
-	return counts, nil
-}
-
-func GetAdminUserElectronicSignatureTwo(userid int64) (*models.AdminUserElectronicSignature, error) {
-	var es models.AdminUserElectronicSignature
-	err := readUserDb.Model(&models.AdminUserElectronicSignature{}).Where("creator=? and status=1", userid).First(&es).Error
-
-	if err == gorm.ErrRecordNotFound {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	return &es, nil
-}
-
-func GetAdminUserElectronicSignature(orgID int64, appID int64, userID int64) (*models.AdminUserElectronicSignature, error) {
-	var es models.AdminUserElectronicSignature
-	err := readUserDb.Model(&models.AdminUserElectronicSignature{}).Where("org_id=? and app_id=? and creator=? and status=1", orgID, appID, userID).First(&es).Error
-
-	if err == gorm.ErrRecordNotFound {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	return &es, nil
-}
-
-func GetPatientSignature(orgID int64, patientid int64, dialysis_date int64) (*models.DialysisOrder, error) {
-	var es models.DialysisOrder
-	err := XTReadDB().Model(&models.DialysisOrder{}).Where("user_org_id=? and patient_id=? and dialysis_date=? and status=1", orgID, patientid, dialysis_date).First(&es).Error
-
-	if err == gorm.ErrRecordNotFound {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	return &es, nil
-}
-
-func GetPatinentHead(orgid int64, appid int64, userid int64) (*models.SgjUserAdminPatientHead, error) {
-	var es models.SgjUserAdminPatientHead
-	err := readUserDb.Model(&models.SgjUserAdminPatientHead{}).Where("org_id = ? and app_id = ? and creator=? and status =1", orgid, appid, userid).First(&es).Error
-	if err == gorm.ErrRecordNotFound {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	return &es, nil
-}
-
-func CreateAdminUserElectronicSignature(es *models.AdminUserElectronicSignature) error {
-	err := writeUserDb.Create(es).Error
-	return err
-}
-
-func SaveAdminUserElectronicSignature(es *models.AdminUserElectronicSignature) error {
-	err := writeUserDb.Save(es).Error
-	return err
-}
-
-func CreateAdminUserHead(es *models.SgjUserAdminPatientHead) error {
-	err := writeUserDb.Create(es).Error
-	return err
-}
-func SaveAdminUserHead(es *models.SgjUserAdminPatientHead) error {
-	err := writeUserDb.Create(es).Error
-	return err
-}
-
-func GetAdminUserSpecialPermission(orgID int64, appID int64, adminUserID int64, permissionType models.SpecialPermissionType) (*models.AdminUserSpecialPermission, error) {
-	var record models.AdminUserSpecialPermission
-	err := readDb.Model(&models.AdminUserSpecialPermission{}).Where("org_id = ? AND app_id = ? AND admin_user_id = ? AND permission = ? AND status = 1", orgID, appID, adminUserID, permissionType).First(&record).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		} else {
-			return nil, err
-		}
-	}
-	return &record, nil
-}
-
-func SaveAdminUserSpecialPermission(permission *models.AdminUserSpecialPermission) error {
-	err := writeDb.Save(permission).Error
-	return err
-}
-
-func GetAllValidAdminUsersWithSpecialPermission(orgID int64, appID int64, permissionType models.SpecialPermissionType) ([]*models.AdminUserSpecialPermission, error) {
-	var records []*models.AdminUserSpecialPermission
-	err := readDb.Model(&models.AdminUserSpecialPermission{}).Where("org_id = ? AND app_id = ? AND permission = ? AND status = 1", orgID, appID, permissionType).Find(&records).Error
-	if err != nil {
-		return nil, err
-	}
-	return records, nil
-}
-
-func GetAllSpecialPermissionAdminUsersWithoutStatus(orgID int64, appID int64, permissionType models.SpecialPermissionType) ([]*models.AdminUserSpecialPermission, error) {
-	var records []*models.AdminUserSpecialPermission
-	err := readDb.Model(&models.AdminUserSpecialPermission{}).Where("org_id = ? AND app_id = ? AND permission = ?", orgID, appID, permissionType).Find(&records).Error
-	if err != nil {
-		return nil, err
-	}
-	return records, nil
-}
-
-func CancelAllSpecialPermissionAdminUsers(orgID int64, appID int64, permissionType models.SpecialPermissionType) error {
-	tx := writeDb.Begin()
-	updateTime := time.Now().Unix()
-	err := tx.Model(&models.AdminUserSpecialPermission{}).Where("org_id = ? AND app_id = ? AND status = 1 AND permission = ?", orgID, appID, permissionType).Updates(map[string]interface{}{"status": 0, "mtime": updateTime}).Error
-	if err != nil {
-		tx.Rollback()
-		return err
-	}
-	tx.Commit()
-	return nil
-}
-
-func BatchSaveSpecialPermissionAdminUsers(users []*models.AdminUserSpecialPermission) error {
-	tx := writeDb.Begin()
-	for _, user := range users {
-		tx.Save(user)
-	}
-	return tx.Commit().Error
-}
-
-func ModifyAdminUserName(name string, id int64) error {
-	tx := writeUserDb.Begin()
-	updateTime := time.Now().Unix()
-	err := tx.Model(&models.AdminUser{}).Where("id = ?", id).Updates(map[string]interface{}{"name": name, "mtime": updateTime}).Error
-	if err != nil {
-		tx.Rollback()
-		return err
-	}
-	tx.Commit()
-	return nil
-
-}

controllers/service/app_version.go

@@ -1,458 +0,0 @@
-package service
-
-import (
-	"XT_New/models"
-	"github.com/jinzhu/gorm"
-	"time"
-)
-
-func GetAppVersionByAppType(apptype int64) (*models.AppVersion, error) {
-	var version models.AppVersion
-	err := readDb.Model(&models.AppVersion{}).Where("app_type=?", apptype).First(&version).Error
-	if err == gorm.ErrRecordNotFound {
-		return nil, nil
-	}
-
-	if err != nil {
-		return nil, err
-	}
-	return &version, nil
-}
-
-func GetAllAppOrg() ([]*models.OrgApp, error) {
-	var app []*models.OrgApp
-	err := readUserDb.Model(&models.OrgApp{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
-	if err == gorm.ErrRecordNotFound {
-		return nil, nil
-	}
-
-	if err != nil {
-		return nil, err
-	}
-	return app, nil
-}
-
-func GetSystemApp() ([]*models.OrgApp, error) {
-	var app []*models.OrgApp
-	err := readDb.Model(&models.OrgApp{}).Where("status = 1 AND org_id = 0 ").Find(&app).Error
-	if err == gorm.ErrRecordNotFound {
-		return nil, nil
-	}
-
-	if err != nil {
-		return nil, err
-	}
-	return app, nil
-}
-
-func GetApp() ([]*models.OrgApp, error) {
-	var app []*models.OrgApp
-	err := readDb.Model(&models.OrgApp{}).Where("status = 1 AND org_id = 0").Find(&app).Error
-	if err == gorm.ErrRecordNotFound {
-		return nil, nil
-	}
-
-	if err != nil {
-		return nil, err
-	}
-	return app, nil
-}
-
-func GetAppByType(orgID int64, app_type int) (*models.OrgApp, error) {
-	var apps models.OrgApp
-	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
-	if err != nil {
-		return nil, err
-	}
-	return &apps, nil
-}
-
-func CreateOrgApp(app *models.OrgApp) {
-	writeUserDb.Create(&app)
-
-}
-
-func GetAllUserRole(org_id int64) (appRole []*models.App_Role) {
-	if org_id == 0 {
-		readUserDb.Model(&models.App_Role{}).Where("status = 1").Find(&appRole)
-
-	} else {
-		readUserDb.Model(&models.App_Role{}).Where("status = 1 AND org_id = ? ", org_id).Find(&appRole)
-
-	}
-	return
-}
-
-func GetAllUserRoleByUserTypeOne(org_id int) (appRole []*models.App_Role) {
-	readUserDb.Model(&models.App_Role{}).Where("status = 1 AND user_type = 1").Find(&appRole)
-	return
-}
-
-func GetAllUserRoleByUserTypeOther() (appRole []*models.App_Role) {
-	//app, _ := GetOrgApp(int64(org_id), 3)
-
-	//if org_id == 0 {
-	readUserDb.Model(&models.App_Role{}).Where("status = 1 AND user_type > 1").Find(&appRole)
-	//
-	//} else {
-	//	readUserDb.Model(&models.App_Role{}).Where("status = 1 AND org_id = ?  AND user_type > 1 AND app_id = ? ", org_id, app.Id).Find(&appRole)
-	//
-	//}
-	return
-}
-
-func FindRoleByUserTypeOne(org_id int64) (role models.Role) {
-	readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 2 AND role_name = '医生'", org_id).First(&role)
-	return
-}
-
-func FindRoleByUserTypeTwo(org_id int64) (role models.Role) {
-	readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 3 AND role_name = '护士'", org_id).First(&role)
-	return
-}
-
-func GetAllRole() ([]*models.Role, error) {
-	var app []*models.Role
-	err := readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
-	if err == gorm.ErrRecordNotFound {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	return app, nil
-}
-
-func UpdateRoleIds(id int64, ids string) {
-	writeUserDb.Model(&models.App_Role{}).Where("status = 1 AND id = ?", id).Updates(map[string]interface{}{"role_ids": ids, "mtime": time.Now().Unix()})
-
-}
-
-func GetOrgAppA(orgID int64, app_type int) (*models.OrgApp, error) {
-	var apps models.OrgApp
-	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
-	if err != nil {
-		return nil, err
-	}
-	return &apps, nil
-}
-
-func GetOrgByIdB(orgID int64) (*models.Org, error) {
-	var org models.Org
-	err := readUserDb.Model(&models.Org{}).Where("id = ?", orgID).First(&org).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		} else {
-			return nil, err
-		}
-	}
-	return &org, nil
-}
-
-func GetOrgAppB(orgID int64, app_type int) (*models.OrgApp, error) {
-	var apps models.OrgApp
-	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
-	if err != nil {
-		return nil, err
-	}
-	return &apps, nil
-}
-
-func CreateOrgRoleB(role *models.Role) (err error) {
-	err = writeUserDb.Create(&role).Error
-	return
-}
-
-func CreateRolePurviewB(purview *models.RolePurview) (err error) {
-	err = writeUserDb.Create(&purview).Error
-	return
-}
-
-func CreateFuncRolePurviewB(purview *models.SgjUserRoleFuncPurview) (err error) {
-	err = writeUserDb.Create(&purview).Error
-	return
-}
-
-func GetSystemRole(orgID int64) ([]*models.Role, error) {
-	var roles []*models.Role
-	err := readUserDb.Where(" org_id = ? AND status = 1 AND is_system > 1", orgID).First(&roles).Error
-	if err != nil {
-		return nil, err
-	}
-	return roles, nil
-}
-
-func HandleData() {
-	var pe []*models.PredialysisEvaluation
-	//readDb.Model(&models.DialysisPrescription{}).Where("user_org_id = 12 AND record_date <= 1587571200").Find(&prescription)
-	//for _, item := range prescription {
-	//	writeDb.Model(&models.AssessmentAfterDislysis{}).Where("user_org_id =12 AND assessment_date = ?", item.RecordDate).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "actual_ultrafiltration": item.Ultrafiltration})
-	//}
-	readDb.Model(&models.PredialysisEvaluation{}).Where("status = 1 AND user_org_id = 9538 AND dialysis_order_id > 0").Find(&pe)
-
-	for _, item := range pe {
-		var sch models.Schedule
-		err := readDb.Model(&models.Schedule{}).Where("status = 1 AND schedule_date = ? AND patient_id = ? AND user_org_id = 9538", item.AssessmentDate, item.PatientId).First(&sch).Error
-
-		if err == nil {
-			if sch.ID > 0 {
-				order := &models.DialysisOrder{
-					DialysisDate:   sch.ScheduleDate,
-					UserOrgId:      9538,
-					PatientId:      sch.PatientId,
-					Stage:          2,
-					BedID:          sch.BedId,
-					StartNurse:     554,
-					FinishNurse:    554,
-					Status:         1,
-					CreatedTime:    sch.ScheduleDate,
-					UpdatedTime:    sch.ScheduleDate,
-					StartTime:      sch.ScheduleDate,
-					EndTime:        sch.ScheduleDate,
-					PunctureNurse:  554,
-					Creator:        554,
-					Modifier:       554,
-					FinishCreator:  554,
-					FinishModifier: 554,
-					SchedualType:   sch.ScheduleType,
-				}
-				writeDb.Create(&order)
-			}
-		}
-
-	}
-
-}
-
-func FindAllOrgByImportType() (org []*models.Org, err error) {
-	err = readUserDb.Model(&models.Org{}).Where("status =1 AND import = 0").Find(&org).Error
-	return
-}
-
-func FindAllPrescription(org_id int64) (prescription []*models.DialysisPrescription, err error) {
-	err = readDb.Model(&models.DialysisPrescription{}).Where("user_org_id=? AND status= 1 AND record_date >= 1593446400", org_id).Find(&prescription).Error
-	return
-}
-
-func AddSigleDialysisBeforePre(before *models.DialysisBeforePrepare) {
-	writeDb.Create(&before)
-}
-
-func GetAllHisDoctorInfo(org_id int64) (his []*models.HisDoctorAdviceInfo, err error) {
-	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id = ? AND status = 1", org_id).Find(&his).Error
-	return
-}
-
-func GetAllHisInfo(org_id int64) (his []*models.HisPrescriptionProject, err error) {
-	err = readDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND status = 1", org_id).Find(&his).Error
-	return
-}
-
-func UpDateHis(his *models.HisDoctorAdviceInfo) {
-	writeDb.Save(&his)
-}
-
-func UpDateHis2(his *models.HisPrescriptionProject) {
-	writeDb.Save(&his)
-}
-
-func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND fa_piao_code = '' AND fa_piao_number = '' ", org_id).Find(&his).Error
-	return
-}
-
-func GetAllHisOrderTwo(org_id int64) (his models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND fa_piao_code <> '' AND fa_piao_number <> '' ", org_id).Last(&his).Error
-	return
-}
-
-func GetLastHisOrder() (his models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106 AND status = 1 AND order_status = 2").Last(&his).Error
-	return
-}
-
-type HisPrescriptionAdviceTemplate struct {
-	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId          int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
-	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
-	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
-	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
-	ReminderDate          int64   `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
-	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
-	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
-	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
-	Status                int64   `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime           int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime           int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	AdviceAffirm          string  `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
-	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
-	StopTime              int64   `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
-	StopReason            string  `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
-	StopDoctor            int64   `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
-	StopState             int64   `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
-	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
-	ExecutionTime         int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
-	ExecutionStaff        int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
-	ExecutionState        int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
-	Checker               int64   `gorm:"column:checker" json:"checker" form:"checker"`
-	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	DialysisOrderId       int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
-	CheckTime             int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState            int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
-	Groupno               int64   `gorm:"column:groupno" json:"groupno" form:"groupno"`
-	RemindType            int64   `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
-	FrequencyType         int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount              int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay               string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	TemplateId            string  `gorm:"column:template_id" json:"template_id" form:"template_id"`
-	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Price                 float64 `gorm:"column:price" json:"price" form:"price"`
-	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	MedListCodg           string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	FeedetlSn             string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	Day                   int64   `gorm:"column:day" json:"day" form:"day"`
-	Diagnosis             int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	HospApprFlag          int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
-	LmtUsedFlag           int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
-}
-
-func (HisPrescriptionAdviceTemplate) TableName() string {
-	return "his_prescription_advice_template"
-}
-
-type HisPrescriptionInfoTemplateTwo 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"`
-	RecordDate                    int64                           `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PatientId                     int64                           `gorm:"column:patient_id" json:"patient_id" form:"patient_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"`
-	Type                          int64                           `gorm:"column:type" json:"type" form:"type"`
-	Creator                       int64                           `gorm:"column:creator" json:"creator" form:"creator"`
-	Modifier                      int64                           `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	PType                         int64                           `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	PTemplateId                   int64                           `gorm:"column:p_template_id" json:"p_template_id" form:"p_template_id"`
-	HisPrescriptionAdviceTemplate []HisPrescriptionAdviceTemplate `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
-	MedType                       string                          `gorm:"column:med_type" json:"med_type" form:"med_type"`
-}
-
-func (HisPrescriptionInfoTemplateTwo) TableName() string {
-	return "his_prescription_info_template"
-}
-
-func GetHisPrescriptionTemplateTwo() (prescription []*HisPrescriptionInfoTemplateTwo, err error) {
-	err = readDb.Model(&HisPrescriptionInfoTemplateTwo{}).
-		Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1")
-		}).
-		Where("status = 1 ").
-		Find(&prescription).Error
-	return
-}
-
-func SaveAdviceTemplate(advice HisPrescriptionAdviceTemplate) {
-	writeDb.Save(&advice)
-}
-
-func GetAllPT(org_id int64) (his []*models.HisPrescriptionTemplate, err error) {
-	err = readDb.Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? AND status = 1", org_id).Find(&his).Error
-	return
-}
-
-type HisPrescriptionProjectTemplate struct {
-	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
-	ProjectId          int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price              float64 `gorm:"column:price" json:"price" form:"price"`
-	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"`
-	PatientId          int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId       int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	RecordDate         int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Count              string  `gorm:"column:count" json:"count" form:"count"`
-	FeedetlSn          string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	MedListCodg        string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	SingleDose         string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	DeliveryWay        string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	Day                string  `gorm:"column:day" json:"day" form:"day"`
-	Remark             string  `gorm:"column:remark" json:"remark" form:"remark"`
-	Unit               string  `gorm:"column:unit" json:"unit" form:"unit"`
-	Type               int64   `gorm:"column:type" json:"type" form:"type"`
-	PrescriptionId     int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	FrequencyType      int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount           int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay            string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
-}
-
-func (HisPrescriptionProjectTemplate) TableName() string {
-	return "his_prescription_project_template"
-}
-
-type HisPrescriptionInfoTemplateTHree 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"`
-	RecordDate                     int64                            `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PatientId                      int64                            `gorm:"column:patient_id" json:"patient_id" form:"patient_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"`
-	Type                           int64                            `gorm:"column:type" json:"type" form:"type"`
-	Creator                        int64                            `gorm:"column:creator" json:"creator" form:"creator"`
-	Modifier                       int64                            `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	PType                          int64                            `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	PTemplateId                    int64                            `gorm:"column:p_template_id" json:"p_template_id" form:"p_template_id"`
-	HisPrescriptionAdviceTemplate  []HisPrescriptionAdviceTemplate  `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
-	HisPrescriptionProjectTemplate []HisPrescriptionProjectTemplate `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
-	MedType                        string                           `gorm:"column:med_type" json:"med_type" form:"med_type"`
-}
-
-func (HisPrescriptionInfoTemplateTHree) TableName() string {
-	return "his_prescription_info_template"
-}
-
-func GetAllPTInfo(org_id int64, p_template_id int64) (his []*HisPrescriptionInfoTemplateTHree, err error) {
-	err = readDb.Model(&HisPrescriptionInfoTemplateTHree{}).Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1")
-	}).Preload("HisPrescriptionProjectTemplate", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1")
-	}).Where("user_org_id = ? AND status = 1 AND p_template_id = ?", org_id, p_template_id).Find(&his).Error
-	return
-}
-
-func GetAllInfo(org_id int64, project_id int64) (his []*HisPrescriptionProjectTemplate, err error) {
-	err = readDb.Model(&HisPrescriptionProjectTemplate{}).Where("user_org_id = ? AND status = 1 AND project_id = ? ", org_id, project_id).Find(&his).Error
-	return
-}
-func UpdateStatus(project_id int64, p_id int64) {
-	writeDb.Model(&HisPrescriptionProjectTemplate{}).Where("id = ?", project_id).Updates(map[string]interface{}{"status": 0})
-	writeDb.Model(&HisPrescriptionInfoTemplateTwo{}).Where("id = ?", p_id).Updates(map[string]interface{}{"status": 0})
-}
-
-func SaveOrder(order *models.HisOrder) {
-	writeDb.Save(&order)
-}
-
-func GetAllPrivateHis(org_id int64) (his []*models.HisPatient) {
-	readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND balance_accounts_type = 2 AND status = 1", org_id).Find(&his)
-	return
-}
-
-func SaveHis(his *models.HisPatient) {
-	writeDb.Save(his)
-	return
-}

service/warhouse_service.go

@@ -134,72 +134,55 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 	// 将该批次的剩余库存数量转换为拆零数量
 
-	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
-
-		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-
-	}
-	if warehouse.MaxUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
-
-		stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
+	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 
-	}
-	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+	//查找药品信息
+	//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
 
-		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 
-	}
+	if stock_number >= deliver_number {
 
-	var maxNumber int64 = 0
-	var minNumber int64 = 0
+		var maxNumber int64 = 0
+		var minNumber int64 = 0
+		//var stock_max_number int64 = 0
+		//stock_max_number = warehouse.StockMaxNumber
 
-	maxNumber = deliver_number / drup.MinNumber
-	minNumber = deliver_number % drup.MinNumber
+		maxNumber = deliver_number / drup.MinNumber
+		minNumber = deliver_number % drup.MinNumber
 
-	if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
-		minNumber = maxNumber
-	}
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
 
-	if drup.MaxUnit != drup.MinUnit {
-		if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
-			return errors.New("库存数量不足")
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
+				return errors.New("库存数量不足")
+			}
 		}
-	}
 
-	if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
-		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
-	}
-	if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
-		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
-	}
-	if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
-	}
 
-	if warehouse.StockMaxNumber < 0 {
-		warehouse.StockMaxNumber = 0
-	}
-	if warehouse.StockMinNumber < 0 {
-		warehouse.StockMinNumber = 0
-	}
+		if warehouse.StockMaxNumber < 0 {
+			warehouse.StockMaxNumber = 0
+		}
+		if warehouse.StockMinNumber < 0 {
+			warehouse.StockMinNumber = 0
+		}
 
-	warehouse.Mtime = time.Now().Unix()
+		warehouse.Mtime = time.Now().Unix()
 
-	if warehouse.StockMinNumber < minNumber {
+		if warehouse.StockMinNumber < minNumber {
 
-		warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-		warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
-	} else {
-		if minNumber > 0 {
-			if (warehouse.StockMinNumber - minNumber) >= 0 {
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+		} else {
+			if minNumber > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 			}
 
-		}
-
-		if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
-			if warehouse.StockMinNumber > 0 {
-				if (warehouse.StockMinNumber - deliver_number) >= 0 {
+			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+				if warehouse.StockMinNumber > 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}
 
@@ -207,43 +190,37 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 		}
 
-	}
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
 
-	if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-		if (warehouse.StockMinNumber - deliver_number) >= 0 {
-			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 		}
 
-	}
-
-	if drup.MaxUnit != drup.MinUnit {
-		if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
-			return errors.New("库存数量不足")
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
+				return errors.New("库存数量不足")
+			}
+		}
+		if warehouse.StockMinNumber <= 0 {
+			warehouse.StockMinNumber = 0
 		}
-	}
-	if warehouse.StockMinNumber <= 0 {
-		warehouse.StockMinNumber = 0
-	}
-
-	errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 
-	if errThree != nil {
-		return errThree
-	}
+		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 
-	//查询剩余库存
-	stockInfo, _ := GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId)
-	var sum_count int64
-	for _, its := range stockInfo {
-		if its.MaxUnit == drup.MaxUnit {
-			its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+		if errThree != nil {
+			return errThree
 		}
-		sum_count += its.StockMaxNumber + its.StockMinNumber
-	}
 
-	// 当库存数量大于或等于出库数量的话，则正常出库该批次
-
-	if stock_number >= deliver_number {
+		//查询剩余库存
+		stockInfo, _ := GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
 
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -271,6 +248,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			IsCheck:                 1,
+			OverCount:               sum_count,
 		}
 
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
@@ -330,6 +308,15 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			return errTwo
 		}
 
+		var out_count int64
+		//查询出库数据
+		infoCountList, _ := FindDrugWarehouseOutInfoCount(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID)
+		for _, item := range infoCountList {
+			out_count += item.Count
+		}
+		//出库数量相加
+		AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+
 		return nil
 	} else {
 
@@ -433,6 +420,14 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 
+		var out_count int64
+
+		//查询出库数据
+		infoCountList, _ := FindDrugWarehouseOutInfoCount(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID)
+		for _, item := range infoCountList {
+			out_count += item.Count
+		}
+
 		drugflow := models.DrugFlow{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseout.ID,
@@ -463,6 +458,8 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		}
 
 		CreateDrugFlowOne(drugflow)
+		//出库数量相加
+		AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
 
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		prescribingNumber_two_temp := deliver_number - stock_number