11月8日库存管理

controllers/drug_stock_api_contorller.go

@@ -242,8 +242,8 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 				}
 
 				if max_unit == min_unit {
-					warehouseInfo.StockMaxNumber = 0
-					warehouseInfo.StockMinNumber = warehousing_count
+					warehouseInfo.StockMaxNumber = warehousing_count
+					warehouseInfo.StockMinNumber = 0
 					warehouseInfo.MaxUnit = min_unit
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)

controllers/gobal_config_api_controller.go

@@ -2061,6 +2061,8 @@ func (c *GobalConfigApiController) GetBatchOrderDetail() {
 	page, _ := c.GetInt64("page")
 	detail, total, err := service.GetBatchOrderDetail(drug_id, orgId, page, limit)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+
+	drug, _ := service.GetBaseDrugMedical(drug_id)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -2069,6 +2071,7 @@ func (c *GobalConfigApiController) GetBatchOrderDetail() {
 		"detail":           detail,
 		"total":            total,
 		"manufacturerList": manufacturerList,
+		"drug":             drug,
 	})
 }
 

controllers/his_api_controller.go

@@ -3232,13 +3232,24 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 					advice.StartTime = hisAdvice.StartTime
 					advice.HospApprFlag = hisAdvice.HospApprFlag
 
-					if hisAdvice.SingleDose != advice.SingleDose || hisAdvice.DeliveryWay != advice.DeliveryWay || hisAdvice.ExecutionFrequency != advice.ExecutionFrequency || hisAdvice.Day != advice.Day || hisAdvice.PrescribingNumber != advice.PrescribingNumber || hisAdvice.Price != advice.Price || hisAdvice.Remark != advice.Remark || hisAdvice.PrescribingNumberUnit != advice.PrescribingNumberUnit {
-						advice.ExecutionTime = 0
-						advice.ExecutionStaff = 0
-						advice.ExecutionState = 2
-						advice.CheckTime = 0
-						advice.Checker = 0
-						advice.CheckState = 2
+					if hisAdvice.UserOrgId == 10028 {
+						if hisAdvice.DeliveryWay != advice.DeliveryWay || hisAdvice.ExecutionFrequency != advice.ExecutionFrequency || hisAdvice.Day != advice.Day || hisAdvice.PrescribingNumber != advice.PrescribingNumber || hisAdvice.Price != advice.Price || hisAdvice.Remark != advice.Remark || hisAdvice.PrescribingNumberUnit != advice.PrescribingNumberUnit {
+							advice.ExecutionTime = 0
+							advice.ExecutionStaff = 0
+							advice.ExecutionState = 2
+							advice.CheckTime = 0
+							advice.Checker = 0
+							advice.CheckState = 2
+						}
+					} else {
+						if hisAdvice.SingleDose != advice.SingleDose || hisAdvice.DeliveryWay != advice.DeliveryWay || hisAdvice.ExecutionFrequency != advice.ExecutionFrequency || hisAdvice.Day != advice.Day || hisAdvice.PrescribingNumber != advice.PrescribingNumber || hisAdvice.Price != advice.Price || hisAdvice.Remark != advice.Remark || hisAdvice.PrescribingNumberUnit != advice.PrescribingNumberUnit {
+							advice.ExecutionTime = 0
+							advice.ExecutionStaff = 0
+							advice.ExecutionState = 2
+							advice.CheckTime = 0
+							advice.Checker = 0
+							advice.CheckState = 2
+						}
 					}
 
 					//advice.Groupno = hisAdvice.Groupno

controllers/schedule_api_controller.go

@@ -1417,17 +1417,27 @@ func (this *ScheduleApiController) ExportSchedule() {
 			schedule_date := time.Now().Format("2006-01-02")
 			date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
 			clear_schedule_date := date.Unix() //根据日期去清除，该日期未来的排班数据
-			if err == nil {
 
+			if err == nil {
 				for _, item := range schedules {
 					if item.ScheduleDate > clear_schedule_date {
+						//查询已经存在的所有排班
+
 						//查找当天日期是否存在
 						_, errcode := service.GetTodayScheduleIsExistOne(item.PatientId, item.ScheduleDate, item.UserOrgId)
 						if errcode == gorm.ErrRecordNotFound {
+							//查询该床位是否有患者
+							sch, errcodes := service.GetPatientByBed(item.ScheduleDate, item.BedId, item.ScheduleType, item.UserOrgId)
+
+							if errcodes == gorm.ErrRecordNotFound {
+								service.CreateSchedule(item)
+							} else if errcodes == nil {
+
+								//清除当天该床位已有的患者
+								service.ModeFyScheduleById(sch.ScheduleDate, sch.BedId, sch.ScheduleType, sch.UserOrgId)
+								service.CreateSchedule(item)
+							}
 
-							//清除当天该床位已有的患者
-							service.ModeFyScheduleById(item.ScheduleDate, item.BedId, item.ScheduleType, item.UserOrgId)
-							service.CreateSchedule(item)
 						} else if errcode == nil {
 							schedule := models.XtSchedule{
 								PartitionId:  item.PartitionId,

controllers/stock_in_api_controller.go

@@ -1738,7 +1738,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 	if len(upDateWarehouseOutInfos) > 0 {
 		for _, item := range upDateWarehouseOutInfos {
-
+			fmt.Println("item233223232323233223", item.Count)
 			//1.查询该耗材该批次的最后一次出库记录
 			lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId, item.OrgId)
 
@@ -1776,7 +1776,8 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 					//判断该批次的剩余库存 和出库的库存进行比较
 					//如果出库的库存大于该批次的剩余库存,那么需要出库下一批次的库存
-
+					fmt.Println("total233322323232332232332", total)
+					fmt.Println("info333223322332323332233223", info.StockCount)
 					if total > info.StockCount {
 						//计算出库和该批次相差的库存
 						total_count = item.Count - info.StockCount
@@ -1789,9 +1790,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
 							return
 						}
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "1",
-						})
 					}
 					//如果与上次比的库存小于或等于于该批次的剩余库存,那么需要该批次出库
 					if total <= info.StockCount {
@@ -1837,10 +1835,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
 								return
 							}
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg": "1",
-							})
-							return
 						} else if errcode == nil {
 							service.UpDateWarehouseOutInfo(item)
 							//更新流水
@@ -1861,10 +1855,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 								Dealer:       item.Dealer,
 							}
 							service.UpdatedGoodInfo(goodInfo, item.GoodId)
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg": "1",
-							})
-							return
 						}
 					}
 				}
@@ -1931,10 +1921,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
 							return
 						}
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "1",
-						})
-						return
+
 					} else if errcode == nil {
 						service.UpDateWarehouseOutInfo(item)
 						flow := models.VmStockFlow{
@@ -1953,7 +1940,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							Dealer:       item.Dealer,
 						}
 						service.UpdatedGoodInfo(goodInfo, item.GoodId)
-						return
+
 					}
 				}
 
@@ -1985,15 +1972,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 					Dealer:       item.Dealer,
 				}
 				service.UpdatedGoodInfo(goodInfo, item.GoodId)
-				if errs != nil {
-					utils.ErrorLog(errs.Error())
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-					return
-				}
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg": "1",
-				})
-				return
+
 			}
 
 		}

controllers/supply_order_api_contorller.go

@@ -0,0 +1,43 @@
+package controllers
+
+import (
+	"XT_New/service"
+	"github.com/astaxie/beego"
+)
+
+type SupplyOrderApiController struct {
+	BaseAuthAPIController
+}
+
+func SupplyOrderApiRegistRouters() {
+
+	beego.Router("/api/supply/getinitorder", &SupplyOrderApiController{}, "get:GetInitOrder")
+}
+
+func (this *SupplyOrderApiController) GetInitOrder() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//获取药品库数据
+	baseList, _ := service.GetSupplyDrugList(orgId)
+
+	goodList, _ := service.GetSupplyGoodList(orgId)
+
+	manufactuerList, _ := service.GetAllManufacturerList(orgId)
+
+	goodTypeList, _ := service.GetAllGoodType(orgId)
+
+	supplyList, _ := service.GetSupplierList(orgId)
+
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugList":        baseList,
+		"goodList":        goodList,
+		"manufactuerList": manufactuerList,
+		"goodTypeList":    goodTypeList,
+		"drugTypeList":    drugTypeList,
+		"supplyList":      supplyList,
+	})
+	return
+}

models/device_models.go

@@ -166,7 +166,6 @@ func (MDeviceNumberForList) TableName() string {
 	return "xt_device_number"
 }
 
-
 type XtDeviceNumber struct {
 	ID      int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
 	OrgId   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
@@ -416,6 +415,7 @@ type XtSchedule struct {
 	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"`
+	IsExport        int64                   `gorm:"column:is_export" json:"is_export" form:"is_export"`
 	LastAfterWeight AssessmentAfterDislysis `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
 }
 

models/supply.models.go

@@ -0,0 +1,89 @@
+package models
+
+type SpBaseDrug struct {
+	ID                int64                  `gorm:"column:id" json:"id" form:"id"`
+	DrugName          string                 `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	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"`
+	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"`
+	Dose              float64                `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit          string                 `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	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"`
+	Manufacturer      int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	OrgId             int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Number            string                 `gorm:"column:number" json:"number" form:"number"`
+	DrugWarehouseInfo []*SpDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+}
+
+func (SpBaseDrug) TableName() string {
+	return "xt_base_drug"
+}
+
+type SpGoodInformation struct {
+	ID                int64              `gorm:"column:id" json:"id" form:"id"`
+	SpecificationName string             `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId        int64              `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit          int64              `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	Manufacturer      int64              `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	OrgId             int64              `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	GoodName          string             `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	GoodWarehouseInfo []*SpWarehouseInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_warehouse_info"`
+}
+
+func (SpGoodInformation) TableName() string {
+	return "xt_good_information"
+}
+
+type SpWarehouseInfo struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	GoodId     int64 `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	StockCount int64 `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (SpWarehouseInfo) TableName() string {
+	return "xt_warehouse_info"
+}
+
+type SpDrugWarehouseInfo struct {
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugId         int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	MaxUnit        string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit        string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber int64  `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber int64  `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	BatchNumber    string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	OrgId          int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (SpDrugWarehouseInfo) TableName() string {
+	return "xt_drug_warehouse_info"
+}
+
+type SpSupplierName struct {
+	ID           int64   `gorm:"column:id" json:"id" form:"id"`
+	SupplierCode string  `gorm:"column:supplier_code" json:"supplier_code" form:"supplier_code"`
+	SupplierName string  `gorm:"column:supplier_name" json:"supplier_name" form:"supplier_name"`
+	SupplierType int64   `gorm:"column:supplier_type" json:"supplier_type" form:"supplier_type"`
+	VatRate      float64 `gorm:"column:vat_rate" json:"vat_rate" form:"vat_rate"`
+	Number       string  `gorm:"column:number" json:"number" form:"number"`
+	Bank         string  `gorm:"column:bank" json:"bank" form:"bank"`
+	BankAccount  string  `gorm:"column:bank_account" json:"bank_account" form:"bank_account"`
+	UserOrgId    int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status       int64   `gorm:"column:status" json:"status" form:"status"`
+	ContactsId   string  `gorm:"column:contacts_id" json:"contacts_id" form:"contacts_id"`
+	Ctime        int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creater      int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Modify       int64   `gorm:"column:modify" json:"modify" form:"modify"`
+}
+
+func (SpSupplierName) TableName() string {
+	return "xt_supplier_name"
+}

routers/router.go

@@ -76,4 +76,5 @@ func init() {
 	controllers.HisProjectRouters()
 	controllers.GdybRegistRouters()
 
+	controllers.SupplyOrderApiRegistRouters()
 }

service/schedule_service.go

@@ -199,6 +199,19 @@ func GetTodayScheduleIsExistOne(patientid int64, schedudate int64, orgid int64)
 	return &scheudle, nil
 }
 
+func GetPatientByBed(schedule_date int64, bed_id int64, scheduletype int64, orgid int64) (*models.XtSchedule, error) {
+	var scheudle models.XtSchedule
+	var err error
+	err = XTReadDB().Model(&scheudle).Where(" schedule_date= ? and bed_id = ? and  schedule_type = ? and  user_org_id = ? and status = 1", schedule_date, bed_id, scheduletype, orgid).Find(&scheudle).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &scheudle, nil
+}
+
 func ModeFyScheduleById(schedule_date int64, bedid int64, scheduletype int64, orgid int64) error {
 
 	schedule := models.XtSchedule{}

service/supply_service.go

@@ -0,0 +1,33 @@
+package service
+
+import "XT_New/models"
+
+func GetSupplyDrugList(orgid int64) (drug []*models.SpBaseDrug, err error) {
+
+	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	err = db.Preload("DrugWarehouseInfo", "status = 1 and org_id = ?", orgid).Find(&drug).Error
+	return drug, err
+}
+
+func GetSupplyGoodList(orgid int64) (good []*models.SpGoodInformation, err error) {
+
+	db := XTReadDB().Table("xt_good_information as x").Where("x.status = 1")
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	err = db.Preload("GoodWarehouseInfo", "status = 1 and org_id = ?", orgid).Find(&good).Error
+	return good, err
+}
+
+func GetSupplierList(orgid int64) (suppler []*models.SpSupplierName, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&suppler).Error
+	return suppler, err
+}