修改药房发药

.idea/.gitignore

@@ -1,2 +1,4 @@
 # Default ignored files
-/workspace.xml
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources.local.xml

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 #dev/prod
 

controllers/base_api_controller.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
@@ -70,36 +69,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 1//4，809
-		userAdmin.Mobile = "12222222222"
-		userAdmin.IsSuperAdmin = true
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 11
-		subscibe.OrgId = 14//机构id
-		subscibe.PeriodStart = 1547447814
-		subscibe.PeriodEnd = 1550039814
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 14//机构id小英9675或4
-		adminUserInfo.CurrentAppId = 14//4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 1//4，809
+		//userAdmin.Mobile = "12222222222"
+		//userAdmin.IsSuperAdmin = true
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 11
+		//subscibe.OrgId = 14//机构id
+		//subscibe.PeriodStart = 1547447814
+		//subscibe.PeriodEnd = 1550039814
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 14//机构id小英9675或4
+		//adminUserInfo.CurrentAppId = 14//4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 
 	}
 
@@ -316,35 +315,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 1//4，809
-		userAdmin.Mobile = "12222222222"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 11
-		subscibe.OrgId = 14//机构id小英9675或4
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 14//机构id小英9675或4
-		adminUserInfo.CurrentAppId = 14//4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 1//4，809
+		//userAdmin.Mobile = "12222222222"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 11
+		//subscibe.OrgId = 14//机构id小英9675或4
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 14//机构id小英9675或4
+		//adminUserInfo.CurrentAppId = 14//4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/his_api_controller.go

@@ -1263,51 +1263,54 @@ func (c *HisApiController) CreateHisPrescription() {
 												}
 
 											}
+											//没通过药房发药的才退库
+											if drug.IsPharmacy != 1 {
+												if device_number != number_count {
 
-											if device_number != number_count {
+													// 查询该药品最后一次出库记录
+													druginfo, _ := service.GetLastDrugWarehouseOutByDrugId(drug_id, patient_id, recordDateTime, adviceId)
 
-												// 查询该药品最后一次出库记录
-												druginfo, _ := service.GetLastDrugWarehouseOutByDrugId(drug_id, patient_id, recordDateTime, adviceId)
+													//回退库存
+													if druginfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
 
-												//回退库存
-												if druginfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-
-													service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, number_count)
-												}
-												if druginfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-													var stock_max_number int64
-													var stock_min_number int64
+														service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, number_count)
+													}
+													if druginfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+														var stock_max_number int64
+														var stock_min_number int64
 
-													if number_count >= drug.MinNumber {
+														if number_count >= drug.MinNumber {
 
-														stock_max_number = device_number / drug.MinNumber
-														service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, stock_max_number)
-														stock_min_number = device_number % drug.MinNumber
-														service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, stock_min_number)
+															stock_max_number = device_number / drug.MinNumber
+															service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, stock_max_number)
+															stock_min_number = device_number % drug.MinNumber
+															service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, stock_min_number)
 
-													} else {
+														} else {
 
-														service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, device_number)
+															service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, device_number)
+														}
 													}
-												}
 
-												if druginfo.CountUnit == drug.MaxUnit && druginfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
-													service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, device_number)
-												}
-												//删除记录
-												service.DeleteDrugAutoWarehouseSeven(drug_id, patient_id, recordDateTime, adviceId)
+													if druginfo.CountUnit == drug.MaxUnit && druginfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
+														service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, device_number)
+													}
+													//删除记录
+													service.DeleteDrugAutoWarehouseSeven(drug_id, patient_id, recordDateTime, adviceId)
+
+													//查询默认仓库
+													storeHouseConfig, _ := service.GetAllStoreHouseConfig(druginfo.OrgId)
+													//查询默认仓库剩余多少库存
+													var sum_count int64
+													stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
+													for _, its := range stockInfo {
+														sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
+													}
+													service.UpdateBaseDrugSumTwo(drug_id, sum_count, druginfo.OrgId)
 
-												//查询默认仓库
-												storeHouseConfig, _ := service.GetAllStoreHouseConfig(druginfo.OrgId)
-												//查询默认仓库剩余多少库存
-												var sum_count int64
-												stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
-												for _, its := range stockInfo {
-													sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
 												}
-												service.UpdateBaseDrugSumTwo(drug_id, sum_count, druginfo.OrgId)
-
 											}
+
 										}
 									}
 								}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -550,7 +550,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	origin, _ := c.GetInt64("origin", 0)
 	groupno, _ := c.GetInt64("groupno", -1)
-	orgid := c.GetMobileAdminUserInfo().Org.Id
 
 	if origin != 2 {
 		adminUserInfo := c.GetMobileAdminUserInfo()
@@ -759,7 +758,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									//查询是否出库按钮开启
 									prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
 									if prescriptionConfig.IsOpen == 1 {
-										if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId,orgid) {
+										if medical.IsUse == 2 && medical.IsPharmacy != 1 {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 
 											//更新字典里面的库存
@@ -772,7 +771,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										}
 									}
 								} else {
-									if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId,orgid) {
+									if medical.IsUse == 2 && medical.IsPharmacy != 1 {
 										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 
 										stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
@@ -862,7 +861,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 
 							if prescribing_number_total <= total {
-								if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId,orgid) {
+								if medical.IsUse == 2 && medical.IsPharmacy != 1 {
 									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 
 									//更新字典里面的库存
@@ -1166,7 +1165,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 
 						if prescribing_number_total <= total {
-							if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId,orgid) {
+							if medical.IsUse == 2 && medical.IsPharmacy != 1 {
 
 								if config.IsOpen != 1 {
 									service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)

controllers/patient_api_controller.go

@@ -1710,7 +1710,7 @@ func (c *PatientApiController) ExecGroupAdvice() {
 				return
 			}
 			if prescribing_number_total <= total {
-				if medical.IsUse == 2 {
+				if medical.IsUse == 2 && medical.IsPharmacy != 1 {
 					service.DrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
 					//查询默认仓库
 					storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
@@ -1933,9 +1933,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if adviceSetting.IsAdviceOpen == 1 {
 						//查询是否出库按钮开启
 						prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
-						fmt.Println("prescriptionConfigwodweweeeweweweweweewewewwewew", prescriptionConfig)
 						if prescriptionConfig.IsOpen == 1 {
-							if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId, item.UserOrgId) {
+							if medical.IsUse == 2 && medical.IsPharmacy != 1 {
 								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 								//查询默认仓库
 								storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
@@ -1972,7 +1971,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 
 					} else {
-						if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId, item.UserOrgId) {
+						if medical.IsUse == 2 && medical.IsPharmacy != 1 {
 							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 							//更新字典里面的库存
 							var sum_count int64
@@ -2252,7 +2251,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 					if prescribing_number_total <= total {
-						if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId, item.UserOrgId) {
+						if medical.IsUse == 2 && medical.IsPharmacy != 1 {
 
 							if config.IsOpen != 1 {
 								service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)

models/drug.go

@@ -74,7 +74,7 @@ type BaseDrugLib struct {
 	BatchRetaiPrice       float64                `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
 	SumCount              int64                  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 	SumInCount            int64                  `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
-	IsPharmacy			  int64					`gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+	IsPharmacy            int64                  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
 }
 
 func (BaseDrugLib) TableName() string {
@@ -82,13 +82,14 @@ func (BaseDrugLib) TableName() string {
 }
 
 type BaseDrugLibSeven struct {
-	ID        int64  `gorm:"column:id" json:"id" form:"id"`
-	DrugName  string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	MaxUnit   string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit   string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	SumCount  int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
-	IsUse     int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName   string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	MaxUnit    string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber  int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit    string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	SumCount   int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	IsUse      int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	IsPharmacy int64  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
 }
 
 func (BaseDrugLibSeven) TableName() string {

models/self_drug_models.go

@@ -75,6 +75,7 @@ type XtBaseDrug struct {
 	DrugDay               string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	MinPrice              float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
 	IsUse                 int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	IsPharmacy            int64   `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
 }
 
 func (XtBaseDrug) TableName() string {

service/manage_center_service.go

@@ -177,7 +177,7 @@ func FindBaseDrugLibRecord(org_id int64, id int64) (lib models.BaseDrugLib, err
 }
 
 func FindBaseDrugLibRecordSeven(org_id int64, id int64) (lib models.BaseDrugLibSeven, err error) {
-	err = readDb.Select("id,drug_name,max_unit,min_number,min_unit,sum_count,is_user").Where("org_id = ? AND id = ? AND status = 1", org_id, id).First(&lib).Error
+	err = readDb.Select("id,drug_name,max_unit,min_number,min_unit,sum_count,is_user,is_pharmacy").Where("org_id = ? AND id = ? AND status = 1", org_id, id).First(&lib).Error
 	return
 }
 

service/pharmacy_service.go

@@ -970,6 +970,7 @@ func MapToJson(param map[string]interface{}) string {
 
 //封装扣减库存
 func FenStock(orgid, creater int64, v *models.HisDoctorAdviceInfo) (err error) {
+
 	err = HisDrugsDelivery(orgid, creater, v)
 	if err != nil {
 		err = fmt.Errorf("!:%v", err)