历史排班

controllers/patient_dataconfig_api_controller.go

@@ -719,15 +719,15 @@ func (this *PatientDataConfigAPIController) Courses() {
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	records, getRecordsErr := service.GetPatientCourseOfDisease(adminUserInfo.CurrentOrgId, patientID, startTime.Unix(), endTime.Unix())
 	if getRecordsErr != nil {

service/new_warehouse_service.go

@@ -1414,6 +1414,9 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			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("金5")
 			if minNumber > 0 {

service/patient_dataconfig_service.go

@@ -20,6 +20,13 @@ func GetPatientByID(orgID int64, patientID int64) (*models.Patients, error) {
 	return &patient, nil
 }
 
+func GetPatientByIDOne(orgID int64, patientID int64) (models.Patients, error) {
+	var patient models.Patients
+	err = readDb.Model(&models.Patients{}).Where("id = ? and user_org_id=? and status=1", patientID, orgID).First(&patient).Error
+
+	return patient, err
+}
+
 func GetPatientCourseOfDisease(orgID int64, patientID int64, startTime int64, endTime int64) ([]*models.PatientDiseaseCourse, error) {
 	var records []*models.PatientDiseaseCourse
 	err := readDb.Model(&models.PatientDiseaseCourse{}).Where("org_id = ? and patient_id = ? and record_time >= ? and record_time <= ? and status = 1", orgID, patientID, startTime, endTime).Order("record_time desc").Find(&records).Error

service/warhouse_service.go

@@ -132,6 +132,8 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 	storeConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
 	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+		//fmt.Println("lastWarehouse", lastWarehouse.StockMinNumber)
+		//fmt.Println("drugp.min", drup.MinNumber)
 		if lastWarehouse.StockMinNumber >= drup.MinNumber {
 			var stockMax int64
 			var stockMin int64
@@ -144,7 +146,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 	}
 
 	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
-
+		//fmt.Println("owowowowowoowowowowowo")
 		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
 		ChangeMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber)
 
@@ -182,7 +184,8 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 	//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
-
+	//fmt.Println("stock_number", stock_number)
+	//fmt.Println("deliver_numberwowowwo", deliver_number)
 	if stock_number >= deliver_number {
 
 		var maxNumber int64 = 0
@@ -193,6 +196,8 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
 
+		//fmt.Println("maxNumberowowowowo", warehouse.StockMaxNumber)
+		//fmt.Println("min_nu2o2o2332o23", warehouse.StockMinNumber)
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
 		}
@@ -202,10 +207,14 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 				return errors.New("库存数量不足")
 			}
 		}
+		//fmt.Println("min2o2o23o32", minNumber)
+		//fmt.Println("maxNumberowowoow", maxNumber)
 
 		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
 			//fmt.Println("金1")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
+			//fmt.Println("金1", warehouse.StockMaxNumber)
 		}
 
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
@@ -228,7 +237,12 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 		if warehouse.StockMinNumber < minNumber {
 			//fmt.Println("金4")
+
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+
+			if minNumber == 2 && warehouse.MaxUnit == warehouse.MinUnit && warehouse.StockMinNumber == 0 {
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			}
 			if warehouse.MaxUnit != warehouse.MinUnit {
 				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 			}
@@ -272,7 +286,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		}
 
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-
+		//fmt.Println("errThreeo23o2o32o32o23o32", errThree)
 		if errThree != nil {
 			return errThree
 		}