历史排班

controllers/drug_stock_api_contorller.go

@@ -3820,11 +3820,7 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		medical, _ := service.GetBaseDrugMedical(it.DrugId)
 		////出库数量累加
 		var out_count_one int64
-		//fmt.Println("it.count", it.CountUnit)
-		//fmt.Println("MaxUnit", medical.MaxUnit)
-		//fmt.Println("MinUnit", medical.MinUnit)
-		//fmt.Println("count", it.Count)
-		//fmt.Println("number", medical.MinNumber)
+
 		if it.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
 			out_count_one = it.Count * medical.MinNumber
 		}
@@ -3836,10 +3832,8 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		if it.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
 			out_count_one = it.Count
 		}
-		//fmt.Println("countone3232232323323232332332wo", out_count_one)
-		//增加出库数量
+
 		service.AddDrugCount(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut, out_count_one)
-		//fmt.Println("countunit23322332232323", it.CountUnit)
 
 	}
 	warehousingOutInfoListThree, _ := service.GetDrugWarehouseOutListById(warehouse_out_id, orgId)
@@ -3847,7 +3841,7 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		medical, _ := service.GetBaseDrugMedical(it.DrugId)
 		drup, _ := service.FindBaseDrugLibRecord(it.OrgId, it.DrugId)
 		//出库逻辑
-		service.AutoDrugDeliverInfoFourtyOne(orgId, it.Count, &drugWarehouseOut, &drup, it)
+		service.AutoDrugDeliverInfoFourtyOne(orgId, it.Count, &drugWarehouseOut, &drup, it, it.CountUnit)
 
 		//查询剩余库存
 		stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, it.OrgId, it.DrugId)
@@ -3861,13 +3855,6 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		//更新基础库库存
 		service.UpdateBaseDrugSumTwo(it.DrugId, sum_count, it.OrgId)
 
-		//查询该药品剩余库存
-		//infolist, _ := service.FindDrugWarehouseInfoFlushCountByStorehouse(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut)
-		//var over_count int64
-		//for _, its := range infolist {
-		//  over_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
-		//}
-		//更新剩余库存
 		service.UpdateDrugStockCount(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 
 	}
@@ -3996,8 +3983,17 @@ func (c *StockDrugApiController) ToReturnCheck() {
 		infolist, _ := service.FindDrugWarehouseInfoFlushCountByStorehouse(item.DrugId, item.OrgId, storeHouseConfig.DrugStorehouseOut)
 		var over_count int64
 		for _, its := range infolist {
-			over_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+			baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+			fmt.Println("ITS", its.MaxUnit)
+			fmt.Println("itwowoowow", baseDrug.MaxUnit)
+			if its.MaxUnit == baseDrug.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+			}
+			fmt.Println("its.StockMaxNumber", its.StockMaxNumber)
+			fmt.Println("its.StockMinNumber", its.StockMinNumber)
+			over_count += its.StockMaxNumber + its.StockMinNumber
 		}
+		fmt.Println("over_coutnwowowowowo", over_count)
 		service.UpdateDrugStockCount(item.DrugId, item.OrgId, storeHouseConfig.DrugStorehouseOut, over_count)
 
 	}

controllers/pharmacy_controller.go

@@ -90,7 +90,7 @@ func (this *PharmacyController) TodayNumber() {
 		etime = stime + 86399
 	}
 
-	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 {
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10480 {
 		//查询表里当天的数据
 		var wtotal int
 		wtotal, err = service.GetTodayPharmacy(stime, etime, orgid, 1)
@@ -118,7 +118,7 @@ func (this *PharmacyController) TodayNumber() {
 		return
 	}
 
-	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 {
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10480 {
 		var wtotal int
 		var itotal int
 		//查找出库数量
@@ -169,7 +169,7 @@ func (this *PharmacyController) IssuedDrug() {
 		etime = stime + 86399
 	}
 
-	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 || orgid == 10387 || orgid == 10375 {
+	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 || orgid == 10387 || orgid == 10375 || orgid == 10480 {
 
 		//获取排班班次
 		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
@@ -193,7 +193,7 @@ func (this *PharmacyController) IssuedDrug() {
 		})
 	}
 
-	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 && orgid != 10375 {
+	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 && orgid != 10375 && orgid != 10480 {
 		//查询表里当天的数据
 		var flist []*models.TmpPatient
 		flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
@@ -249,7 +249,7 @@ func (this *PharmacyController) WaitingDrug() {
 		etime = stime + 86399
 	}
 
-	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 && orgid != 10375 {
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 && orgid != 10375 && orgid != 10480 {
 		//查询表里当天的数据
 		var flist []*models.TmpPatient
 		flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
@@ -273,7 +273,7 @@ func (this *PharmacyController) WaitingDrug() {
 	}
 
 	//当天已发药的人数
-	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10387 || orgid == 10375 {
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10387 || orgid == 10375 || orgid == 10480 {
 
 		//获取排班班次
 		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)

models/patient_models.go

@@ -25,6 +25,7 @@ type MSchedualPatientList struct {
 	TrobleShoot        int64  `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 	SchRemark          string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	ScheduleRemark     string `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
+	FirstLetter        string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (MSchedualPatientList) TableName() string {
@@ -832,6 +833,7 @@ type XtPatientsNew struct {
 	InfectiousRemark             string  `gorm:"column:infectious_remark" json:"infectious_remark" form:"infectious_remark"`
 	AllergicHistory              string  `gorm:"column:allergic_history" json:"allergic_history" form:"allergic_history"`
 	PatientAddress               string  `gorm:"column:patient_address" json:"patient_address" form:"patient_address"`
+	FirstLetter                  string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (XtPatientsNew) TableName() string {

service/new_warehouse_service.go

@@ -1554,7 +1554,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 			//查询今日该药品该患者是否有出库数据
 			lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
-			fmt.Println("以色列---------------------------------------", lastDrugOutInfo.ID)
+
 			if lastDrugOutInfo.ID == 0 {
 				errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 				if errOne != nil {
@@ -1575,7 +1575,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				}
 			}
 			if lastDrugOutInfo.ID > 0 {
-				fmt.Println("wowowowowowwwwwwwwwwwwwwwwwwwwwwwww")
+
 				//删除在新增
 				UpdateDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID)
 

service/warhouse_service.go

@@ -5764,61 +5764,78 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 }
 
 // 药品手动出库 递归方式
-func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo) (err error) {
+func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo, unit string) (err error) {
 
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
+
 	var stock_number int64 = 0
-	var retail_price float64
+
+	var drug_price float64
 	if advice.CountUnit == drup.MaxUnit {
 		deliver_number = prescribingNumber * drup.MinNumber
-		formatInt := strconv.FormatInt(prescribingNumber, 10)
-		floatcount, _ := strconv.ParseFloat(formatInt, 64)
-		retail_price = floatcount * advice.Price
+
 	} else {
 		deliver_number = prescribingNumber
-		formatInt := strconv.FormatInt(prescribingNumber, 10)
-		floatcount, _ := strconv.ParseFloat(formatInt, 64)
-		retail_price = floatcount * advice.Price
+
 	}
+	if advice.CountUnit == drup.MaxUnit {
+		drug_price = drup.RetailPrice
+	}
+	fmt.Println(drug_price)
 
-	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, warehouseout.StorehouseId)
-	if lastWarehouse.StockMinNumber >= drup.MinNumber {
-		var stockMax int64
-		var stockMin int64
-		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
-		stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
-		//fmt.Println("stockmax", stockMax)
-		//fmt.Println("stockMin", stockMin)
-		ChangeMaxNumber(lastWarehouse.ID, stockMax)
-		UpdateMinNumber(lastWarehouse.ID, stockMin)
+	if advice.CountUnit == drup.MinUnit {
+		drug_price = drup.MinPrice
 	}
 
-	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, warehouseout.StorehouseId)
+	if advice.CountUnit != drup.MaxUnit || advice.CountUnit != drup.MinUnit {
+		drug_price = drup.RetailPrice
+	}
 
-	if err != nil {
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, advice.StorehouseId)
 
-		return err
+	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+		if lastWarehouse.StockMinNumber >= drup.MinNumber {
+			var stockMax int64
+			var stockMin int64
+			stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
+			stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+
+			ChangeMaxNumber(lastWarehouse.ID, stockMax)
+			UpdateMinNumber(lastWarehouse.ID, stockMin)
+
+		}
 	}
 
+	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+
+		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
+		ChangeMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber)
+
+	}
+
+	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, advice.StorehouseId)
+
 	// 将该批次的剩余库存数量转换为拆零数量
 	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
+
 	}
 	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+
 		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-	}
 
-	fmt.Println("stock_number", stock_number)
-	fmt.Println("deliver_number", deliver_number)
-	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	}
 	if stock_number >= deliver_number {
 
-		// 出库完成后，要减去对应批次的库存数量
-		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
 
@@ -5836,12 +5853,16 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 		}
 
 		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			//fmt.Println("金1")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
 		}
+
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			//fmt.Println("金2")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+			//fmt.Println("金3")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
 
@@ -5854,37 +5875,42 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 
 		warehouse.Mtime = time.Now().Unix()
 
+		//fmt.Println("stockmin", warehouse.StockMinNumber)
+		//fmt.Println("minnubmerr", minNumber)
 		if warehouse.StockMinNumber < minNumber {
+			//fmt.Println("金4")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			if warehouse.MaxUnit != warehouse.MinUnit {
 				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 			}
-
+			if minNumber == 2 && warehouse.MaxUnit == warehouse.MinUnit && warehouse.StockMinNumber == 0 {
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			}
 		} else {
-			//fmt.Println("maxNumber23323323332322323w9", maxNumber)
-			//fmt.Println("maxNumber23323323332322323w9", minNumber)
+			//fmt.Println("金5")
 			if minNumber > 0 {
-				if minNumber == 1 && maxNumber == 1 && drup.MaxUnit != drup.MinUnit {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-				} else {
-					if (warehouse.StockMinNumber - minNumber) >= 0 {
-						warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
-					}
-
+				if (warehouse.StockMinNumber - minNumber) >= 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 				}
+
 			}
 
-			if minNumber == 0 && maxNumber != 1 {
+			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+				//fmt.Println("6")
 				if warehouse.StockMinNumber > 0 {
-					if (warehouse.StockMinNumber - deliver_number) >= 0 {
+					if warehouse.StockMinNumber-deliver_number >= 0 {
 						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 					}
+
 				}
+
 			}
+
 		}
 
-		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) >= 0 {
+				//fmt.Println("金7")
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 			}
 
@@ -5946,7 +5972,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			StockCount:              advice.StockCount,
 			WarehousingDetailId:     warehouse.ID,
 			OverCount:               over_count,
-			RetailPrice:             retail_price, //手动出库出库价格
+			RetailPrice:             drug_price, //手动出库出库价格
 			WarehousingId:           warehouse.ID,
 			SystemTime:              advice.SysRecordTime,
 		}
@@ -5964,7 +5990,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 	} else {
 		stock_number_int := strconv.FormatInt(stock_number, 10)
 		stock_number_int_count, _ := strconv.ParseFloat(stock_number_int, 64)
-		retail_price = stock_number_int_count * advice.Price
+		drug_price = stock_number_int_count * advice.Price
 		//扣减库存
 		warehouse.StockMaxNumber = 0
 		warehouse.StockMinNumber = 0
@@ -6014,7 +6040,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			LastPrice:               warehouse.Price,
 			StockCount:              advice.StockCount,
 			OverCount:               over_count,
-			RetailPrice:             retail_price, //手动出库出库价格
+			RetailPrice:             drug_price, //手动出库出库价格
 			WarehousingId:           warehouse.ID,
 			WarehousingDetailId:     warehouse.ID,
 			SystemTime:              advice.SysRecordTime,
@@ -6029,7 +6055,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 
 		advice.CountUnit = drup.MinUnit
 
-		AutoDrugDeliverInfoFourtyOne(orgID, prescribingNumber_two_temp, warehouseout, drup, advice)
+		AutoDrugDeliverInfoFourtyOne(orgID, prescribingNumber_two_temp, warehouseout, drup, advice, unit)
 	}
 
 	return