历史排班

controllers/gobal_config_api_controller.go

@@ -2387,7 +2387,7 @@ func (c *GobalConfigApiController) GetDrugOutOrderPrint() {
 	warehousing, _ := service.GetExportOutOrderDrugListOne(ids)
 
 	drug_warhouse_out, _ := service.GetDrugWarehouseOutTenty(ids, admin.CurrentOrgId)
-	fmt.Println("drug_warhouse_out9999999", drug_warhouse_out)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"info":              info,
 		"warehousing":       warehousing,

controllers/his_project_api_controller.go

@@ -87,6 +87,7 @@ func HisProjectRouters() {
 	beego.Router("/api/hispatient/getmaintemplatebyid", &HisProjectApiController{}, "Get:GetMainTemplateById")
 	beego.Router("/api/hispatient/updatemaintemplate", &HisProjectApiController{}, "Get:UpdateMainTemplate")
 	beego.Router("/api/hispatient/deletemaintemplate", &HisProjectApiController{}, "Get:DeleteMainTemplate")
+
 }
 
 func (this *HisProjectApiController) SaveProject() {
@@ -1268,6 +1269,11 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 	prescriptionInfo, _ := service.GetPrscriptionInfo(patient_id, recordDateTime)
 	//advicePrint, err := service.GetPre(patient_id, recordDateTime, idStrs, adminUserInfo.CurrentOrgId, temp_p_type)
 	hisPatient, _ := service.GetHisPatientInfoFour(adminUserInfo.CurrentOrgId, patient_id, recordDateTime, his_patient_id)
+	hisPatient_two, _ := service.GetHisPatientInfoTen(adminUserInfo.CurrentOrgId, patient_id, recordDateTime)
+	if hisPatient.ID == 0 {
+		hisPatient = hisPatient_two
+	}
+
 	//hisPatient, _ := service.GetHisPatientById(patient_id)
 	hisHospitalRecord, _ := service.GetLastHospitalRecordTwo(patient_id, adminUserInfo.CurrentOrgId)
 

service/his_service.go

@@ -297,6 +297,11 @@ func GetHisPatientInfoThree(org_id int64, number string) (info models.HisPatient
 	return
 }
 
+func GetHisPatientInfoTen(org_id int64, patient_id int64, record_date int64) (info models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).Last(&info).Error
+	return
+}
+
 func GetHisPatientInfoFour(org_id int64, patient_id int64, record_date int64, his_patient_id int64) (info models.HisPatient, err error) {
 	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND id = ?", org_id, record_date, patient_id, his_patient_id).First(&info).Error
 	return

service/new_warehouse_service.go

@@ -813,6 +813,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 		}
 
 		//如果本次出库数据大于历史出库数据 新增1条流水
+
 		if deliver_number > (out_count - cancel_count) {
 			drugflow := models.DrugFlow{
 				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -1262,7 +1263,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 }
 
 // 药品自动出库 递归方式
-func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo) (err error) {
+func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, hisprescribingNumber float64) (err error) {
 
 	drugError := models.XtDrugError{
 		UserOrgId:             orgID,
@@ -1280,11 +1281,15 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 	CreateDrugError(drugError)
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
+	var deliver_number_one int64 = 0
 	var stock_number int64 = 0
 
 	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
 	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 
+	prescribingNumber_temp_one := strconv.FormatFloat(math.Abs(hisprescribingNumber), 'f', 0, 64)
+	countone, _ := strconv.ParseInt(prescribingNumber_temp_one, 10, 64)
+
 	var drug_price float64
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		deliver_number = count * drup.MinNumber
@@ -1294,6 +1299,16 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 	}
 
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		deliver_number_one = countone * drup.MinNumber
+
+	} else {
+		deliver_number_one = countone
+
+	}
+
+	fmt.Println(deliver_number_one)
+
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		drug_price = drup.RetailPrice
 	}
@@ -1320,6 +1335,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 			ChangeMaxNumber(lastWarehouse.ID, stockMax)
 			UpdateMinNumber(lastWarehouse.ID, stockMin)
+
 		}
 	}
 
@@ -1543,33 +1559,41 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			}
 		}
 		if lastDrugOutInfo.ID > 0 {
-			var his_count int64
-			if lastDrugOutInfo.CountUnit == drup.MaxUnit {
-				his_count = lastDrugOutInfo.Count * drup.MinNumber
-			}
-			if lastDrugOutInfo.CountUnit == drup.MinUnit {
-				his_count = lastDrugOutInfo.Count
-			}
-			if deliver_number != his_count {
-				errThree := UpdateSigleDrugWarehouseOutInfo(lastDrugOutInfo.ID, warehouseOutInfo)
-				if errThree != nil {
-					drugError := models.XtDrugError{
-						UserOrgId:             orgID,
-						DrugId:                advice.DrugId,
-						RecordDate:            advice.AdviceDate,
-						PatientId:             advice.PatientId,
-						Remark:                "更新出库单失败",
-						Status:                1,
-						Ctime:                 time.Now().Unix(),
-						Mtime:                 0,
-						SumCount:              0,
-						Prescribingnumber:     advice.PrescribingNumber,
-						PrescribingNumberUnit: advice.PrescribingNumberUnit,
-					}
-					CreateDrugError(drugError)
-					return errThree
-				}
-			}
+
+			//删除在新增
+			UpdateDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID)
+
+			AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+
+			//var his_count int64
+			//if lastDrugOutInfo.CountUnit == drup.MaxUnit {
+			//	his_count = lastDrugOutInfo.Count * drup.MinNumber
+			//}
+			//if lastDrugOutInfo.CountUnit == drup.MinUnit {
+			//	his_count = lastDrugOutInfo.Count
+			//}
+			//fmt.Println("deliver_number", deliver_number)
+			//fmt.Println("his_countwowowoowow", his_count)
+			//if deliver_number != his_count {
+			//	errThree := UpdateSigleDrugWarehouseOutInfo(lastDrugOutInfo.ID, warehouseOutInfo)
+			//	if errThree != nil {
+			//		drugError := models.XtDrugError{
+			//			UserOrgId:             orgID,
+			//			DrugId:                advice.DrugId,
+			//			RecordDate:            advice.AdviceDate,
+			//			PatientId:             advice.PatientId,
+			//			Remark:                "更新出库单失败",
+			//			Status:                1,
+			//			Ctime:                 time.Now().Unix(),
+			//			Mtime:                 0,
+			//			SumCount:              0,
+			//			Prescribingnumber:     advice.PrescribingNumber,
+			//			PrescribingNumberUnit: advice.PrescribingNumberUnit,
+			//		}
+			//		CreateDrugError(drugError)
+			//		return errThree
+			//	}
+			//}
 		}
 
 		var out_count int64
@@ -1586,11 +1610,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			cancel_count += item.Count
 		}
 
-		//如果本次出库数据大于历史出库数据 新增1条流水
-		//fmt.Println("deliver_number233233223232wi", deliver_number)
-		//fmt.Println("out_coutn23333333333333333", out_count)
-		//fmt.Println("cancel_coutn099992ow", cancel_count)
-		if deliver_number >= (out_count - cancel_count) {
+		if deliver_number_one-(out_count-cancel_count) >= 0 {
 			if (deliver_number - out_count - cancel_count) != 0 {
 				drugflow := models.DrugFlow{
 					WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -1599,7 +1619,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 					Number:                  warehouse.Number,
 					ProductDate:             warehouse.ProductDate,
 					ExpireDate:              warehouse.ExpiryDate,
-					Count:                   deliver_number - (out_count - cancel_count), //按最小单位计算,
+					Count:                   deliver_number_one - (out_count - cancel_count), //按最小单位计算,
 					Price:                   warehouse.RetailPrice,
 					Status:                  1,
 					Ctime:                   advice.AdviceDate,
@@ -1667,7 +1687,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		}
 
 		//如果本次出库数据小于历史出库数据 新增1条退库流水
-		if deliver_number < (out_count - cancel_count) {
+		if deliver_number_one-(out_count-cancel_count) < 0 {
 
 			operation_time := time.Now().Unix()
 
@@ -2340,7 +2360,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
 		advice.PrescribingNumberUnit = drup.MinUnit
 
-		BloodHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
+		BloodHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, hisprescribingNumber)
 	}
 
 	return
@@ -3935,7 +3955,6 @@ func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64
 		utils.ErrorLog("事务失败，原因为: %v", err)
 		tx.Rollback()
 	} else {
-		fmt.Println("err-----------------------", err)
 		tx.Commit()
 	}
 	var deliver_number int64 = 0
@@ -4513,3 +4532,9 @@ func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64
 
 	return nil
 }
+
+func UpdateDrugWarehouseOutInfoTen(patient_id int64, sys_record_time int64, advice_id int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("patient_id = ? and sys_record_time  = ? and status=1 and advice_id = ?", patient_id, sys_record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/warhouse_service.go

@@ -619,7 +619,7 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
 
-			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
+			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber)
 
 		} else {
 			return errors.New("药品信息不存在")