历史排班

controllers/his_api_controller.go

@@ -3380,11 +3380,6 @@ func (c *HisApiController) CreateHisPrescription() {
 									var is_user_total int64
 									var no_user_total int64
 
-									//fmt.Println("s-------------------------------------------", s.PrescribingNumber)
-									//fmt.Println("s.PrescribingNumberUnit------------------", s.PrescribingNumberUnit)
-									//fmt.Println("drug.MaxUnit", drug.MaxUnit)
-									//fmt.Println("drug.MinUnit", drug.MinUnit)
-
 									if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
 
 										prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
@@ -3425,45 +3420,41 @@ func (c *HisApiController) CreateHisPrescription() {
 
 									}
 
-									//fmt.Println("is_user_total-----------------------------", is_user_total)
-									//fmt.Println("no_user_total-----------------------------", no_user_total)
+									fmt.Println("is_user_total-----------------------------", is_user_total)
+									fmt.Println("no_user_total-----------------------------", no_user_total)
 
 									if is_user_total != no_user_total {
 
 										if len(druginfo) > 0 {
 											//回退库存
-											for _, it := range druginfo {
-												if it.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-
-													service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
-
-												}
-												if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-
-													service.ModifyDrugWarehouseInfoStockMinNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
-
-												}
-												if it.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-
-													service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
-
-												}
-											}
+											//for _, it := range druginfo {
+											//	if it.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+											//
+											//		service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+											//
+											//	}
+											//	if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+											//
+											//		service.ModifyDrugWarehouseInfoStockMinNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+											//
+											//	}
+											//	if it.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+											//
+											//		service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+											//
+											//	}
+											//}
 
 											//删除记录
-											service.DeleteNewDrugAutoWarehouseSeven(s.DrugId, patient_id, recordDateTime, s.ID)
+											//service.DeleteNewDrugAutoWarehouseSeven(s.DrugId, patient_id, recordDateTime, s.ID)
 
 										}
 
-										service.CreateHisDoctorAdviceOne(&s, tx)
-
-										advicelast, _ := service.GetLastHisAdvicesList(s.PatientId, s.AdviceDate, s.UserOrgId, tx)
-
 										//出库
 										if drug.IsUse == 2 {
 											creater := adminInfo.AdminUser.Id
 											newadviceInfo := &models.HisDoctorAdviceInfo{
-												ID:                    advicelast.ID,
+												ID:                    s.ID,
 												UserOrgId:             s.UserOrgId,
 												PatientId:             s.PatientId,
 												HisPatientId:          s.HisPatientId,
@@ -3529,7 +3520,80 @@ func (c *HisApiController) CreateHisPrescription() {
 												DrugWayCount:          s.DrugWayCount,
 											}
 
-											service.NewHisDrugsDelivery(s.UserOrgId, creater, newadviceInfo, tx)
+											var history_count int64
+											var local_count int64
+											//查找已经开过的医嘱信息
+											adviceHistory, _ := service.GetHistory(s.ID, s.UserOrgId, tx)
+
+											if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+												prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+												prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+
+												local_count += prescribingNumberSevenTy * drug.MinNumber
+											}
+
+											if s.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+												prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+												prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+												local_count += prescribingNumberSevenTy
+											}
+
+											if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+
+												prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+												prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+												local_count += prescribingNumberSevenTy
+											}
+
+											if adviceHistory.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+												prescribingNumberTenty := strconv.FormatFloat(adviceHistory.PrescribingNumber, 'f', -1, 64)
+												prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+
+												history_count += prescribingNumberSevenTy * drug.MinNumber
+											}
+
+											if adviceHistory.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+												prescribingNumberTenty := strconv.FormatFloat(adviceHistory.PrescribingNumber, 'f', -1, 64)
+												prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+												history_count += prescribingNumberSevenTy
+											}
+
+											if adviceHistory.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+
+												prescribingNumberTenty := strconv.FormatFloat(adviceHistory.PrescribingNumber, 'f', -1, 64)
+												prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+												history_count += prescribingNumberSevenTy
+											}
+
+											//fmt.Println("local_count0000000000000000000000000000000000000000000", local_count)
+											//
+											//fmt.Println("history_count999999999999999999999999999999999999999", history_count)
+
+											//如果当前出库数量大于历史出库数量则需要出库
+											if local_count > history_count {
+												//按最小单位出库
+												var cha_count = local_count - history_count
+
+												//fmt.Println("cha_count000000000000000000000000000", cha_count)
+
+												newadviceInfo.PrescribingNumber = float64(cha_count)
+												newadviceInfo.PrescribingNumberUnit = drug.MinUnit
+												service.NewHisDrugsDelivery(s.UserOrgId, creater, newadviceInfo, tx)
+											}
+
+											//如果当前出库数量小于历史出库数量则需要退库
+											if local_count < history_count {
+
+												var cha_count = history_count - local_count
+												//fmt.Println("退库----------------------------", cha_count)
+												service.NewHisDrugCancelInfo(s.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+
+												service.NewHisDrugAutoCancelInfo(s.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+											}
 
 										}
 
@@ -3551,6 +3615,25 @@ func (c *HisApiController) CreateHisPrescription() {
 										over, _ := service.FindNewOverCount(s.DrugId, s.UserOrgId, storeConfig.DrugStorehouseOut, tx)
 										service.UpdateNewActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount, tx)
 
+										//创建医嘱
+										service.CreateHisDoctorAdviceOne(&s, tx)
+
+										adviceObj, _ := service.GetLastHisDoctorAdviceById(s.PatientId, s.UserOrgId, s.AdviceDate, s.DrugId, tx)
+
+										outInfoTwo, _ := service.GetDrugWarehouseOutInfoByAdviceId(s.PatientId, s.UserOrgId, s.AdviceDate, s.DrugId, tx)
+
+										if len(outInfoTwo) > 0 {
+											for _, item := range outInfoTwo {
+												service.UpdateDrugOutInfoByAdviceId(item.ID, adviceObj.ID, tx)
+											}
+										}
+
+										drugAutoDetail, _ := service.GetDrugAutoDetail(s.PatientId, s.UserOrgId, s.AdviceDate, s.DrugId, tx)
+										if len(drugAutoDetail) > 0 {
+											for _, item := range drugAutoDetail {
+												service.UpdateDrugAutoDetail(item.ID, adviceObj.ID, tx)
+											}
+										}
 									}
 								}
 
@@ -3587,53 +3670,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								timeFormat := tempTime.Format("20060102150405")
 								s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
 								service.CreateHisDoctorAdviceOne(&s, tx)
-								//list, _ := service.GetHisToday(s.PatientId, s.AdviceDate, s.UserOrgId, s.DrugId, tx)
-								//var count_total int64
-								//var count_one int64
-								//for _, its := range list {
-								//	baseDrug, _ := service.GetNewBaseDrugMedical(its.DrugId, tx)
-								//	if its.PrescribingNumberUnit == baseDrug.MaxUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
-								//		prescribingNumberTenty := strconv.FormatFloat(its.PrescribingNumber, 'f', -1, 64)
-								//		prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
-								//		count_total += prescribingNumberSevenTy * baseDrug.MinNumber
-								//	}
-								//
-								//	if its.PrescribingNumberUnit == baseDrug.MinUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
-								//		prescribingNumberTenty := strconv.FormatFloat(its.PrescribingNumber, 'f', -1, 64)
-								//		prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
-								//		count_total += prescribingNumberSevenTy
-								//	}
-								//
-								//	if its.PrescribingNumberUnit == baseDrug.MaxUnit && baseDrug.MaxUnit == baseDrug.MinUnit {
-								//		prescribingNumberTenty := strconv.FormatFloat(its.PrescribingNumber, 'f', -1, 64)
-								//		prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
-								//		count_total += prescribingNumberSevenTy
-								//	}
-								//
-								//	drugAuto, _ := service.GetLastDrugAuto(its.ID, its.DrugId, its.AdviceDate, its.PatientId,its.UserOrgId, tx)
-								//
-								//	if drugAuto.CountUnit == baseDrug.MaxUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
-								//
-								//		count_one = drugAuto.Count * baseDrug.MinNumber
-								//	}
-								//
-								//	if drugAuto.CountUnit == baseDrug.MinUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
-								//
-								//		count_one = drugAuto.Count
-								//	}
-								//
-								//	if drugAuto.CountUnit == baseDrug.MaxUnit && baseDrug.MaxUnit == baseDrug.MinUnit {
-								//
-								//		count_one = drugAuto.Count
-								//	}
-								//	fmt.Println("count_one==================", count_one)
-								//	fmt.Println("count_total==================", count_total)
-								//	if count_total != count_one {
-								//
-								//		service.UpdateTodayHis(its.DrugId, its.AdviceDate, its.PatientId, its.UserOrgId, baseDrug.MinUnit, count_total, its.ID, tx)
-								//	}
-								//
-								//}
+
 								tx.Commit()
 
 								keySix := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
@@ -5933,8 +5970,8 @@ func (c *HisApiController) DeleteProject() {
 					//查询已出库数量
 					dialysisInfo, _ := service.GetGoodDialysisOutInfoSix(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId)
 
-					fmt.Println("aiwohonguo --------------------", prescribingNumber)
-					fmt.Println("aiwohonguo --------------------", dialysisInfo.Count)
+					//fmt.Println("aiwohonguo --------------------", prescribingNumber)
+					//fmt.Println("aiwohonguo --------------------", dialysisInfo.Count)
 					if prescribingNumber < dialysisInfo.Count {
 						//改变数量
 						service.UpdateAutoGood(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId, id, prescribingNumber)
@@ -7372,7 +7409,7 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 							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 {
+						if hisAdvice.SingleDoseUnit != advice.SingleDoseUnit || 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

controllers/sign_api_controller.go

@@ -1223,7 +1223,7 @@ func (this *SignApiController) ToAutoDrug() {
 
 func (this *SignApiController) ToAutoDiagnose() {
 
-	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	//order, _ := service.GetDialysisOrderTotalCount()
 	//
@@ -1238,23 +1238,24 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
 	//}
 
-	list, _ := service.GetAllDialysisOrder(10469)
-	for _, item := range list {
-		schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
-		service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
-	}
+	//list, _ := service.GetAllDialysisOrder(10469)
+	//for _, item := range list {
+	//	schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
+	//	service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
+	//}
 
-	//drugList, _ := service.GetAllBaseDrugList(10571)
+	//drugList, _ := service.GetAllBaseDrugList(10653)
 	//for _, item := range drugList {
-	//	//service.UpdateDrugWarehouseInfoByDrug(item.ID, item.MinPrice, item.OrgId)
+	//	service.UpdateDrugWarehouseInfoByDrug(item.ID, item.MinPrice, item.OrgId)
 	//
-	//	service.UpdateHisDoctorAdviceOne(item.ID, item.MinPrice, item.OrgId)
+	//	//service.UpdateHisDoctorAdviceOne(item.ID, item.MinPrice, item.OrgId)
 	//}
 
 	//goodList, _ := service.GetAllGoodList(10571)
 	//for _, item := range goodList {
 	//	service.UpdasteGoodWarehouseInfoByGood(item.ID, item.PackingPrice, item.OrgId)
 	//}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",
 	})

models/inspection_models.go

@@ -237,17 +237,27 @@ func (XtPatientsTenOne) TableName() string {
 	return "xt_patients"
 }
 
+type InspectionValue struct {
+	Name  string `gorm:"-" json:"name" form:"name"`
+	Value string `gorm:"-" json:"value" form:"value"`
+}
+
 type InspectionTen struct {
-	ID        int64  `gorm:"column:id" json:"id" form:"id"`
-	PatientId int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Name      string `gorm:"-" json:"name" form:"name"`
-	Ipth      string `gorm:"-" json:"ipth" form:"ipth"`
-	Xuejia    string `gorm:"-" json:"xuejia" form:"xuejia"`
-	Xuelin    string `gorm:"-" json:"xuelin" form:"xuelin"`
-	Bdb       string `gorm:"-" json:"bdb" form:"bdb"`
-	Xhdb      string `gorm:"-" json:"xhdb" form:"xhdb"`
+	ID        int64             `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64             `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Name      string            `gorm:"-" json:"name" form:"name"`
+	Values    []InspectionValue `gorm:"-" json:"values" form:"values"`
 }
 
 func (InspectionTen) TableName() string {
 	return "xt_inspection"
 }
+
+type InspectionTenOne struct {
+	ID           int64  `gorm:"-" json:"id" form:"id"`
+	PatientId    int64  `gorm:"-" json:"patient_id" form:"patient_id"`
+	Name         string `gorm:"-" json:"name" form:"name"`
+	ItemName     string `gorm:"-" json:"item_name" form:"item_name"`
+	InspectValue string `gorm:"-" json:"inspect_value" form:"inspect_value"`
+	ItemID       string `gorm:"-" json:"item_id" form:"item_id"`
+}

service/his_service.go

@@ -3118,3 +3118,157 @@ func UpdateGood(good_id int64, user_org_id int64, packing_price float64) (models
 
 	return goodInfo, err
 }
+
+func GetHistory(id int64, user_org_id int64, tx *gorm.DB) (models.HisDoctorAdviceInfo, error) {
+
+	adviceInfo := models.HisDoctorAdviceInfo{}
+
+	err := tx.Where("id = ? and user_org_id = ? and status=1", id, user_org_id).Find(&adviceInfo).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return adviceInfo, err
+		}
+	}
+	return adviceInfo, err
+}
+
+func GetLastHisDoctorAdviceById(patient_id int64, user_org_id int64, advice_date int64, drug_id int64, tx *gorm.DB) (models.HisDoctorAdviceInfo, error) {
+
+	adviceInfo := models.HisDoctorAdviceInfo{}
+
+	err := tx.Where("patient_id = ? and user_org_id = ? and advice_date = ? and drug_id = ? and status =1", patient_id, user_org_id, advice_date, drug_id).Last(&adviceInfo).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return adviceInfo, err
+		}
+	}
+	return adviceInfo, err
+}
+
+func GetDrugWarehouseOutInfoByAdviceId(patient_id int64, user_org_id int64, sys_record_date int64, drug_id int64, tx *gorm.DB) (outInfo []*models.DrugWarehouseOutInfo, err error) {
+
+	err = tx.Where("patient_id = ? and org_id =? and sys_record_time = ? and drug_id = ? and status=1 and advice_id = 0", patient_id, user_org_id, sys_record_date, drug_id).Find(&outInfo).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return outInfo, err
+		}
+	}
+	return outInfo, err
+}
+
+func GetDrugWarehouseOutInfoByAdviceIdTwo(patient_id int64, user_org_id int64, sys_record_date int64, drug_id int64, advice_id int64, tx *gorm.DB) (models.DrugWarehouseOutInfo, error) {
+
+	outInfo := models.DrugWarehouseOutInfo{}
+	err = tx.Where("patient_id = ? and org_id =? and sys_record_time = ? and drug_id = ? and status=1 and advice_id = ?", patient_id, user_org_id, sys_record_date, drug_id, advice_id).Order("id desc").First(&outInfo).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return outInfo, err
+		}
+	}
+	return outInfo, err
+}
+
+func GetDrugAutoOutInfoByAdviceIdTwo(patient_id int64, user_org_id int64, sys_record_date int64, drug_id int64, advice_id int64, tx *gorm.DB) (models.DrugAutomaticReduceDetail, error) {
+
+	outInfo := models.DrugAutomaticReduceDetail{}
+	err = tx.Where("patient_id = ? and org_id =? and record_time = ? and drug_id = ? and status=1 and advice_id = ?", patient_id, user_org_id, sys_record_date, drug_id, advice_id).Order("id desc").First(&outInfo).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return outInfo, err
+		}
+	}
+	return outInfo, err
+}
+
+func GetDrugAutoDetail(patient_id int64, org_id int64, record_time int64, drug_id int64, tx *gorm.DB) (automaticReduceDetail []*models.DrugAutomaticReduceDetail, err error) {
+
+	err = tx.Where("patient_id = ? and org_id = ? and record_time =? and drug_id = ? and status =1 and advice_id = 0", patient_id, org_id, record_time, drug_id).Find(&automaticReduceDetail).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return automaticReduceDetail, err
+		}
+	}
+	return automaticReduceDetail, err
+}
+
+func UpdateDrugAutoDetail(id int64, advice_id int64, tx *gorm.DB) error {
+
+	drugAutomaticReduceDetail := models.DrugAutomaticReduceDetail{}
+
+	err := tx.Model(&drugAutomaticReduceDetail).Where("id = ? and status=1", id).Updates(map[string]interface{}{"advice_id": advice_id}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func UpdateDrugOutInfoByAdviceId(id int64, advice_id int64, tx *gorm.DB) (models.DrugWarehouseOutInfo, error) {
+
+	info := models.DrugWarehouseOutInfo{}
+
+	err := tx.Model(&info).Where("id = ? and status=1", id).Updates(map[string]interface{}{"advice_id": advice_id}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return info, err
+	}
+
+	return info, err
+}
+
+func ModifyDrugWarehouseOutInfoByNumber(id int64, cha_count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status =1", id).UpdateColumn("count", gorm.Expr("count - ?", cha_count)).Error
+
+	err = tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status =1", id).UpdateColumn("over_count", gorm.Expr("over_count + ?", cha_count)).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func ModifyDrugAuToWarehouseOut(id int64, cha_count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugAutomaticReduceDetail{}).Where("id = ? and status =1", id).UpdateColumn("count", gorm.Expr("count - ?", cha_count)).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func DeleteDrugWarehouseOutInfoByNumber(id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func DeleteDrugWarehouseAutoByNumber(id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugAutomaticReduceDetail{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}

service/new_warehouse_service.go

@@ -3857,12 +3857,6 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 		//扣减库存数据
 		UpDateNewDrugWarehouseInfoByStock(&warehouse, tx)
 
-		//更改字典里面的价格
-		//if advice.UserOrgId == 10265 || advice.UserOrgId == 10215 {
-		//
-		//	UpdateNewBasePrice(lastWarehouse.DrugId, lastWarehouse.RetailPrice, tx)
-		//}
-		//
 		////查询剩余库存
 		stockInfo, _ := GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId, tx)
 		var sum_count int64
@@ -3873,55 +3867,54 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 
-		if orgID != 10188 && orgID != 10217 && orgID != 3877 {
-			warehouseOutInfo := &models.DrugWarehouseOutInfo{
-				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-				WarehouseOutId:          warehouseout.ID,
-				Status:                  1,
-				Ctime:                   advice.RecordDate,
-				Mtime:                   time.Now().Unix(),
-				Remark:                  warehouse.Remark,
-				OrgId:                   orgID,
-				Type:                    1,
-				Manufacturer:            warehouse.Manufacturer,
-				Dealer:                  warehouse.Dealer,
-				IsSys:                   1,
-				SysRecordTime:           advice.RecordDate,
-				DrugId:                  advice.DrugId,
-				Number:                  warehouse.Number,
-				BatchNumber:             warehouse.BatchNumber,
-				Price:                   warehouse.RetailPrice,
-				CountUnit:               drup.MinUnit,
-				RetailPrice:             warehouse.RetailPrice,
-				ProductDate:             warehouse.ProductDate,
-				ExpiryDate:              warehouse.ExpiryDate,
-				PatientId:               advice.PatientId,
-				Count:                   deliver_number, //出最小单位
-				WarehouseInfoId:         warehouse.ID,
-				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
-				StorehouseId:            storeConfig.DrugStorehouseOut,
-				IsCheck:                 1,
-				OverCount:               sum_count,
-				AdviceId:                advice.ID,
-			}
+		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			Status:                  1,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           advice.RecordDate,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   warehouse.RetailPrice,
+			CountUnit:               drup.MinUnit,
+			RetailPrice:             warehouse.RetailPrice,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
+			Count:                   deliver_number, //出最小单位
+			WarehouseInfoId:         warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+		}
 
-			//查询今日该药品该患者是否有出库数据
-			lastDrugOutInfo, _ := GetNewNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+		//查询今日该药品该患者是否有出库数据
+		lastDrugOutInfo, _ := GetNewNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
 
-			if lastDrugOutInfo.ID == 0 {
-				//删除在新增
-				UpdateNewDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
-				AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
-			}
-			if lastDrugOutInfo.ID > 0 {
+		if lastDrugOutInfo.ID == 0 {
+			//删除在新增
+			UpdateNewDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
+			AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
+		}
+		if lastDrugOutInfo.ID > 0 {
 
-				//删除在新增
-				UpdateNewDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
+			//删除在新增
+			UpdateNewDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
 
-				AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
+			AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
 
-			}
 		}
+
 		//
 		var out_count int64
 		var cancel_count int64
@@ -3938,44 +3931,18 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 			cancel_count += item.Count
 		}
 
-		if deliver_number_one-(out_count-cancel_count) >= 0 {
-			if (deliver_number_one - out_count - cancel_count) != 0 {
+		fmt.Println("已经出库数据", out_count)
 
-				if orgID == 10217 || orgID == 10188 || orgID == 3877 {
-					warehouseOutInfo := &models.DrugWarehouseOutInfo{
-						WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-						WarehouseOutId:          warehouseout.ID,
-						Status:                  1,
-						Ctime:                   advice.RecordDate,
-						Mtime:                   time.Now().Unix(),
-						Remark:                  warehouse.Remark,
-						OrgId:                   orgID,
-						Type:                    1,
-						Manufacturer:            warehouse.Manufacturer,
-						Dealer:                  warehouse.Dealer,
-						IsSys:                   1,
-						SysRecordTime:           advice.RecordDate,
-						DrugId:                  advice.DrugId,
-						Number:                  warehouse.Number,
-						BatchNumber:             warehouse.BatchNumber,
-						Price:                   warehouse.RetailPrice,
-						CountUnit:               drup.MinUnit,
-						RetailPrice:             warehouse.RetailPrice,
-						ProductDate:             warehouse.ProductDate,
-						ExpiryDate:              warehouse.ExpiryDate,
-						PatientId:               advice.PatientId,
-						Count:                   deliver_number_one - (out_count - cancel_count), //出最小单位
-						WarehouseInfoId:         warehouse.ID,
-						SupplyWarehouseId:       warehouse.SupplyWarehouseId,
-						StorehouseId:            storeConfig.DrugStorehouseOut,
-						IsCheck:                 1,
-						OverCount:               sum_count,
-						AdviceId:                advice.ID,
-					}
+		fmt.Println("已经退库数据", cancel_count)
 
-					AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
+		fmt.Println("当前正在出库的数据", deliver_number_one)
+
+		fmt.Println("差", deliver_number_one-out_count-cancel_count)
+
+		//如果本次出库数据大于历史出库数据 新增1条退库流水
+		if deliver_number_one-(out_count-cancel_count) >= 0 {
+			if (deliver_number_one - out_count - cancel_count) != 0 {
 
-				}
 				lastDrugOutInfo, _ := GetNewNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
 
 				drugflow := models.DrugFlow{
@@ -4143,8 +4110,6 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			AdviceId:                advice.ID,
 		}
-
-		fmt.Println("天激发阿凡达阿道夫阿道夫阿道夫阿道夫阿道夫阿道夫阿道夫阿道夫阿道夫")
 		AddNewSigleDrugAutoReduceRecordInfo(details, tx)
 
 		return nil
@@ -4477,3 +4442,792 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 
 	return
 }
+
+func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, hisprescribingNumber float64, unit string, tx *gorm.DB) (err error) {
+
+	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
+	var deliver_number int64 = 0
+
+	var stock_number int64 = 0
+
+	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
+	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		deliver_number = count * drup.MinNumber
+
+	} else {
+		deliver_number = count
+
+	}
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+	storeConfig, _ := GetNewAllStoreHouseConfig(advice.UserOrgId, tx)
+	lastWarehouse, _ := FindNewLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut, tx)
+
+	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
+
+			ChangeNewMaxNumber(lastWarehouse.ID, stockMax, tx)
+			UpdateNewMinNumber(lastWarehouse.ID, stockMin, tx)
+
+		}
+	}
+
+	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+
+		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
+		ChangeNewMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber, tx)
+
+	}
+
+	warehouse, _ := FindNewLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut, tx)
+
+	// 将该批次的剩余库存数量转换为拆零数量
+	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
+
+		maxNumber = deliver_number / drup.MinNumber
+		minNumber = deliver_number % drup.MinNumber
+
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
+				return errors.New("库存数量不足")
+			}
+		}
+
+		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
+		}
+
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
+
+		if warehouse.StockMaxNumber < 0 {
+			warehouse.StockMaxNumber = 0
+		}
+		if warehouse.StockMinNumber < 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		warehouse.Mtime = time.Now().Unix()
+
+		//fmt.Println("hahhahahah", warehouse.StockMinNumber)
+		//fmt.Println("howowowoowow", minNumber)
+		if warehouse.StockMinNumber < minNumber {
+
+			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 {
+
+			if minNumber > 0 {
+				if (warehouse.StockMinNumber - minNumber) >= 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				}
+
+			}
+
+			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+
+				if warehouse.StockMinNumber > 0 {
+					if warehouse.StockMinNumber-deliver_number >= 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					}
+
+				}
+
+			}
+
+		}
+
+		//fmt.Println("maxNumber", maxNumber)
+		//fmt.Println("minNumber", maxNumber)
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
+			if (warehouse.StockMinNumber - deliver_number) >= 0 {
+
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
+
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
+				return errors.New("库存数量不足")
+			}
+		}
+		if warehouse.StockMinNumber <= 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		//fmt.Println("warehouse.StockMaxNumber-------------------", warehouse.StockMaxNumber)
+		//
+		//fmt.Println("warehouse.StockMinNumber-------------------", warehouse.StockMinNumber)
+
+		//扣减库存数据
+		UpDateNewDrugWarehouseInfoByStock(&warehouse, tx)
+
+		////查询剩余库存
+		stockInfo, _ := GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId, tx)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			Status:                  1,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           advice.RecordDate,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   warehouse.RetailPrice,
+			CountUnit:               drup.MinUnit,
+			RetailPrice:             warehouse.RetailPrice,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
+			Count:                   deliver_number, //出最小单位
+			WarehouseInfoId:         warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+		}
+
+		//查询今日该药品该患者是否有出库数据
+		lastDrugOutInfo, _ := GetNewNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+
+		if lastDrugOutInfo.ID == 0 {
+			AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
+		}
+		//如果有数量则新增数量
+		if lastDrugOutInfo.ID > 0 {
+
+			UpdateSigleDrugWarehouseOutInfoDetail(lastDrugOutInfo.ID, warehouseOutInfo.Count, tx)
+
+		}
+
+		drugflow := models.DrugFlow{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             warehouse.ProductDate,
+			ExpireDate:              warehouse.ExpiryDate,
+			Count:                   deliver_number, //按最小单位计算,
+			Price:                   warehouse.RetailPrice,
+			Status:                  1,
+			Ctime:                   advice.AdviceDate,
+			Mtime:                   time.Now().Unix(),
+			UserOrgId:               orgID,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          3,
+			IsEdit:                  1,
+			Creator:                 advice.ExecutionStaff,
+			IsSys:                   1,
+			PatientId:               advice.PatientId,
+			SystemTime:              advice.AdviceDate,
+			WarehousingDetailId:     warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			WarehouseOutDetailId:    lastDrugOutInfo.ID,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+			LastPrice:               warehouse.Price,
+		}
+
+		CreateNewDrugFlowOne(drugflow, tx)
+
+		AddNewDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count, tx)
+
+		//查询是否存在数据
+		details := &models.DrugAutomaticReduceDetail{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			PatientId:               advice.PatientId,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Status:                  1,
+			RecordTime:              advice.RecordDate,
+			OrgId:                   orgID,
+			DrugId:                  advice.DrugId,
+			Count:                   deliver_number,
+			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			AdviceId:                advice.ID,
+		}
+
+		//查找是否有数据
+		autoMaticReduceDetail, _ := GetDrugAutoMaticReduceDetail(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+
+		if autoMaticReduceDetail.ID == 0 {
+			AddNewSigleDrugAutoReduceRecordInfo(details, tx)
+		}
+
+		if autoMaticReduceDetail.ID > 0 {
+			UpdateNewSingleDrugAutoReduceRecordInfo(autoMaticReduceDetail.ID, deliver_number, tx)
+		}
+
+		return nil
+
+	} else {
+
+		info := models.XtDrugWarehouseInfo{
+			ID:                warehouse.ID,
+			WarehousingId:     warehouse.WarehousingId,
+			DrugId:            warehouse.DrugId,
+			Number:            warehouse.Number,
+			ProductDate:       warehouse.ProductDate,
+			ExpiryDate:        warehouse.ExpiryDate,
+			WarehousingCount:  warehouse.WarehousingCount,
+			Price:             warehouse.RetailPrice,
+			TotalPrice:        warehouse.TotalPrice,
+			Dealer:            warehouse.Dealer,
+			Manufacturer:      warehouse.Manufacturer,
+			Remark:            warehouse.Remark,
+			Ctime:             warehouse.Ctime,
+			Mtime:             warehouse.Mtime,
+			Status:            1,
+			OrgId:             warehouse.OrgId,
+			IsReturn:          warehouse.IsReturn,
+			WarehousingOrder:  warehouse.WarehousingOrder,
+			Type:              warehouse.Type,
+			RetailPrice:       warehouse.RetailPrice,
+			RetailTotalPrice:  warehouse.RetailPrice,
+			StockMaxNumber:    0,
+			StockMinNumber:    0,
+			BatchNumber:       warehouse.BatchNumber,
+			MaxUnit:           warehouse.MaxUnit,
+			MinUnit:           drup.MinUnit,
+			WarehousingInfoId: warehouse.WarehousingInfoId,
+			SupplyWarehouseId: warehouse.SupplyWarehouseId,
+			StorehouseId:      storeConfig.DrugStorehouseOut,
+			IsCheck:           1,
+		}
+		//扣减库存
+		UpDateNewDrugWarehouseInfoByStock(&info, tx)
+
+		//查询剩余库存
+		stockInfo, _ := GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId, tx)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			Status:                  1,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           advice.RecordDate,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   warehouse.RetailPrice,
+			CountUnit:               drup.MinUnit,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
+			Count:                   stock_number,
+			WarehouseInfoId:         warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+		}
+
+		//查询今日该药品该患者是否有出库数据
+		lastDrugOutInfo, _ := GetNewNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+
+		if lastDrugOutInfo.ID == 0 {
+			AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
+		}
+		//如果有数量则新增数量
+		if lastDrugOutInfo.ID > 0 {
+
+			UpdateSigleDrugWarehouseOutInfoDetail(lastDrugOutInfo.ID, warehouseOutInfo.Count, tx)
+
+		}
+
+		//查询是否存在数据
+		details := &models.DrugAutomaticReduceDetail{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			PatientId:               advice.PatientId,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Status:                  1,
+			RecordTime:              advice.RecordDate,
+			OrgId:                   orgID,
+			DrugId:                  advice.DrugId,
+			Count:                   stock_number,
+			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			AdviceId:                advice.ID,
+		}
+
+		//查找是否有数据
+		autoMaticReduceDetail, _ := GetDrugAutoMaticReduceDetail(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+
+		if autoMaticReduceDetail.ID == 0 {
+			AddNewSigleDrugAutoReduceRecordInfo(details, tx)
+		}
+
+		if autoMaticReduceDetail.ID > 0 {
+			UpdateNewSingleDrugAutoReduceRecordInfo(autoMaticReduceDetail.ID, deliver_number, tx)
+		}
+
+		drugflow := models.DrugFlow{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             warehouse.ProductDate,
+			ExpireDate:              warehouse.ExpiryDate,
+			Count:                   stock_number,
+			Price:                   warehouse.RetailPrice,
+			Status:                  1,
+			Ctime:                   advice.AdviceDate,
+			Mtime:                   time.Now().Unix(),
+			UserOrgId:               orgID,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          3,
+			IsEdit:                  1,
+			Creator:                 advice.ExecutionStaff,
+			IsSys:                   1,
+			PatientId:               advice.PatientId,
+			WarehousingDetailId:     warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			WarehouseOutDetailId:    lastDrugOutInfo.ID,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+			LastPrice:               warehouse.Price,
+			SystemTime:              advice.AdviceDate,
+		}
+
+		CreateNewDrugFlowOne(drugflow, tx)
+		//出库数量相加
+		AddNewDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count, tx)
+
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		prescribingNumber_two_temp := deliver_number - stock_number
+
+		overPlusNumber := float64(prescribingNumber_two_temp)
+
+		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
+		advice.PrescribingNumberUnit = drup.MinUnit
+
+		HisStoryBloodHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, hisprescribingNumber, unit, tx)
+	}
+
+	return
+}
+
+func NewHisDrugCancelInfo(orgID int64, creater int64, advice *models.HisDoctorAdviceInfo, cha_count int64, drug models.BaseDrugLibSeven, tx *gorm.DB) (err error) {
+
+	storeConfig, _ := GetNewAllStoreHouseConfig(advice.UserOrgId, tx)
+
+	//查找患者最后一条的退库数据是否满足要求
+	var out_count int64
+	drugOutInfo, _ := GetDrugWarehouseOutInfoByAdviceIdTwo(advice.PatientId, advice.UserOrgId, advice.AdviceDate, advice.DrugId, advice.ID, tx)
+
+	if drugOutInfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+		out_count = drugOutInfo.Count * drug.MinNumber
+	}
+
+	if drugOutInfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+		out_count = drugOutInfo.Count
+	}
+
+	if drugOutInfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
+
+		out_count = drugOutInfo.Count
+	}
+
+	//如果最后1条出库数量大于退库数量,则直接退库,满足退库要求
+	if out_count >= cha_count {
+		//退库 退回 cha_count 的数量
+		ModifyNewDrugWarehouseInfoStockMinNumber(cha_count, drugOutInfo.DrugId, drugOutInfo.OrgId, drugOutInfo.WarehouseInfoId, tx)
+
+		if out_count == cha_count {
+			//删除该出库单
+			DeleteDrugWarehouseOutInfoByNumber(drugOutInfo.ID, tx)
+		}
+
+		//减去出库单里面的数量
+		ModifyDrugWarehouseOutInfoByNumber(drugOutInfo.ID, cha_count, tx)
+
+		//创建退库单
+		//查询剩余库存
+		stockInfo, _ := GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId, tx)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drug.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drug.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		//创建退库单
+		operation_time := time.Now().Unix()
+		ctime := time.Now().Unix()
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
+		total = total + 1
+		orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+		cancelStock := models.DrugCancelStock{
+			OrderNumber:  orderNumber,
+			OperaTime:    operation_time,
+			OrgId:        advice.UserOrgId,
+			Creater:      advice.ExecutionStaff,
+			Ctime:        ctime,
+			Status:       1,
+			ReturnTime:   advice.AdviceDate,
+			Dealer:       0,
+			Manufacturer: 0,
+			Type:         1,
+			StorehouseId: storeConfig.DrugStorehouseOut,
+			IsCheck:      1,
+		}
+
+		_, errCode := FindNewDrugCancelStock(advice.AdviceDate, advice.UserOrgId, tx)
+		if errCode == gorm.ErrRecordNotFound {
+			AddNewSigleDrugCancelStock(&cancelStock, tx)
+		}
+		lastDrugCancelStock, _ := FindNewLastDrugCancelStock(advice.AdviceDate, advice.UserOrgId, tx)
+
+		manufactureName, _ := GetNewManufactureById(drugOutInfo.Manufacturer, tx)
+		dealer, _ := GetNewDealerById(drugOutInfo.Dealer, tx)
+		cancelInfo, _ := GetNewLastDrugCancelStockById(advice.UserOrgId, tx)
+		cancelStockInfo := models.DrugCancelStockInfo{
+			OrderNumber:      cancelInfo.OrderNumber,
+			CancelStockId:    lastDrugCancelStock.ID,
+			DrugId:           advice.DrugId,
+			Count:            cha_count,
+			Status:           1,
+			Ctime:            advice.AdviceDate,
+			Mtime:            time.Now().Unix(),
+			OrgId:            advice.UserOrgId,
+			Type:             1,
+			Manufacturer:     manufactureName.ManufacturerName,
+			Dealer:           dealer.DealerName,
+			Total:            0,
+			RetailPrice:      drugOutInfo.RetailPrice,
+			RetailTotalPrice: drugOutInfo.RetailTotalPrice,
+			Price:            drugOutInfo.Price,
+			RegisterAccount:  "",
+			Remark:           drugOutInfo.Remark,
+			BatchNumber:      drugOutInfo.BatchNumber,
+			MaxUnit:          drugOutInfo.CountUnit,
+			ProductDate:      drugOutInfo.ProductDate,
+			ExpiryDate:       drugOutInfo.ExpiryDate,
+			BatchNumberId:    drugOutInfo.WarehouseInfoId,
+			StorehouseId:     storeConfig.DrugStorehouseOut,
+			IsCheck:          1,
+		}
+		CreatedNewCancelStock(cancelStockInfo, tx)
+
+		flow := models.DrugFlow{
+			WarehousingId:           drugOutInfo.WarehouseInfoId,
+			DrugId:                  drugOutInfo.DrugId,
+			Number:                  "",
+			BatchNumber:             drugOutInfo.BatchNumber,
+			Count:                   cha_count,
+			UserOrgId:               advice.UserOrgId,
+			PatientId:               advice.PatientId,
+			SystemTime:              advice.AdviceDate,
+			ConsumableType:          7,
+			IsSys:                   0,
+			WarehousingOrder:        "",
+			WarehouseOutId:          0,
+			WarehouseOutOrderNumber: "",
+			IsEdit:                  0,
+			CancelStockId:           cancelStock.ID,
+			CancelOrderNumber:       cancelStock.OrderNumber,
+			Manufacturer:            drugOutInfo.Manufacturer,
+			Dealer:                  drugOutInfo.Dealer,
+			Creator:                 advice.ExecutionStaff,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   advice.AdviceDate,
+			Mtime:                   time.Now().Unix(),
+			Price:                   drugOutInfo.RetailPrice,
+			WarehousingDetailId:     drugOutInfo.ID,
+			WarehouseOutDetailId:    0,
+			CancelOutDetailId:       lastDrugCancelStock.ID,
+			ExpireDate:              drugOutInfo.ExpiryDate,
+			ProductDate:             drugOutInfo.ProductDate,
+			MaxUnit:                 drugOutInfo.CountUnit,
+			MinUnit:                 "",
+			AdviceId:                advice.ID,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			LastPrice:               drugOutInfo.Price,
+			OverCount:               sum_count,
+		}
+		CreateNewDrugFlowOne(flow, tx)
+
+		AddNewCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count, tx)
+
+		ReduceNewDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count, tx)
+
+	}
+
+	//如果出库的数据小于这个退库的数量差,则先该批次出库数量出完
+	if out_count < cha_count {
+
+		//把该出库单的数量退完
+		ModifyNewDrugWarehouseInfoStockMinNumber(out_count, drugOutInfo.DrugId, drugOutInfo.OrgId, drugOutInfo.WarehouseInfoId, tx)
+
+		//删除该出库单
+		DeleteDrugWarehouseOutInfoByNumber(drugOutInfo.ID, tx)
+
+		//创建退库单
+		//查询剩余库存
+		stockInfo, _ := GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId, tx)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drug.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drug.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		//创建退库单
+		operation_time := time.Now().Unix()
+		ctime := time.Now().Unix()
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
+		total = total + 1
+		orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+		cancelStock := models.DrugCancelStock{
+			OrderNumber:  orderNumber,
+			OperaTime:    operation_time,
+			OrgId:        advice.UserOrgId,
+			Creater:      advice.ExecutionStaff,
+			Ctime:        ctime,
+			Status:       1,
+			ReturnTime:   advice.AdviceDate,
+			Dealer:       0,
+			Manufacturer: 0,
+			Type:         1,
+			StorehouseId: storeConfig.DrugStorehouseOut,
+			IsCheck:      1,
+		}
+
+		_, errCode := FindNewDrugCancelStock(advice.AdviceDate, advice.UserOrgId, tx)
+		if errCode == gorm.ErrRecordNotFound {
+			AddNewSigleDrugCancelStock(&cancelStock, tx)
+		}
+		lastDrugCancelStock, _ := FindNewLastDrugCancelStock(advice.AdviceDate, advice.UserOrgId, tx)
+
+		manufactureName, _ := GetNewManufactureById(drugOutInfo.Manufacturer, tx)
+		dealer, _ := GetNewDealerById(drugOutInfo.Dealer, tx)
+		cancelInfo, _ := GetNewLastDrugCancelStockById(advice.UserOrgId, tx)
+		cancelStockInfo := models.DrugCancelStockInfo{
+			OrderNumber:      cancelInfo.OrderNumber,
+			CancelStockId:    lastDrugCancelStock.ID,
+			DrugId:           advice.DrugId,
+			Count:            out_count,
+			Status:           1,
+			Ctime:            advice.AdviceDate,
+			Mtime:            time.Now().Unix(),
+			OrgId:            advice.UserOrgId,
+			Type:             1,
+			Manufacturer:     manufactureName.ManufacturerName,
+			Dealer:           dealer.DealerName,
+			Total:            0,
+			RetailPrice:      drugOutInfo.RetailPrice,
+			RetailTotalPrice: drugOutInfo.RetailTotalPrice,
+			Price:            drugOutInfo.Price,
+			RegisterAccount:  "",
+			Remark:           drugOutInfo.Remark,
+			BatchNumber:      drugOutInfo.BatchNumber,
+			MaxUnit:          drugOutInfo.CountUnit,
+			ProductDate:      drugOutInfo.ProductDate,
+			ExpiryDate:       drugOutInfo.ExpiryDate,
+			BatchNumberId:    drugOutInfo.WarehouseInfoId,
+			StorehouseId:     storeConfig.DrugStorehouseOut,
+			IsCheck:          1,
+		}
+		CreatedNewCancelStock(cancelStockInfo, tx)
+
+		flow := models.DrugFlow{
+			WarehousingId:           drugOutInfo.WarehouseInfoId,
+			DrugId:                  drugOutInfo.DrugId,
+			Number:                  "",
+			BatchNumber:             drugOutInfo.BatchNumber,
+			Count:                   out_count,
+			UserOrgId:               advice.UserOrgId,
+			PatientId:               advice.PatientId,
+			SystemTime:              advice.AdviceDate,
+			ConsumableType:          7,
+			IsSys:                   0,
+			WarehousingOrder:        "",
+			WarehouseOutId:          0,
+			WarehouseOutOrderNumber: "",
+			IsEdit:                  0,
+			CancelStockId:           cancelStock.ID,
+			CancelOrderNumber:       cancelStock.OrderNumber,
+			Manufacturer:            drugOutInfo.Manufacturer,
+			Dealer:                  drugOutInfo.Dealer,
+			Creator:                 advice.ExecutionStaff,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   advice.AdviceDate,
+			Mtime:                   time.Now().Unix(),
+			Price:                   drugOutInfo.RetailPrice,
+			WarehousingDetailId:     drugOutInfo.ID,
+			WarehouseOutDetailId:    0,
+			CancelOutDetailId:       lastDrugCancelStock.ID,
+			ExpireDate:              drugOutInfo.ExpiryDate,
+			ProductDate:             drugOutInfo.ProductDate,
+			MaxUnit:                 drugOutInfo.CountUnit,
+			MinUnit:                 "",
+			AdviceId:                advice.ID,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			LastPrice:               drugOutInfo.Price,
+			OverCount:               sum_count,
+		}
+		CreateNewDrugFlowOne(flow, tx)
+
+		AddNewCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count, tx)
+
+		ReduceNewDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count, tx)
+
+		//计算还有多少没有退库
+		var over_count = cha_count - out_count
+
+		NewHisDrugCancelInfo(orgID, creater, advice, over_count, drug, tx)
+	}
+	return err
+
+}
+
+func NewHisDrugAutoCancelInfo(orgID int64, creater int64, advice *models.HisDoctorAdviceInfo, cha_count int64, drug models.BaseDrugLibSeven, tx *gorm.DB) error {
+
+	//查找患者最后一条的退库数据是否满足要求
+	var out_count int64
+	drugOutInfo, _ := GetDrugAutoOutInfoByAdviceIdTwo(advice.PatientId, advice.UserOrgId, advice.AdviceDate, advice.DrugId, advice.ID, tx)
+
+	if drugOutInfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+		out_count = drugOutInfo.Count * drug.MinNumber
+	}
+
+	if drugOutInfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+		out_count = drugOutInfo.Count
+	}
+
+	if drugOutInfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
+
+		out_count = drugOutInfo.Count
+	}
+
+	//fmt.Println("out_count++++==++", out_count)
+	//fmt.Println("cha_count-------", cha_count)
+
+	//如果最后1条出库数量大于退库数量,则直接退库,满足退库要求
+	if out_count >= cha_count {
+		//减去出库单里面的数量
+		ModifyDrugAuToWarehouseOut(drugOutInfo.ID, cha_count, tx)
+
+		if out_count == cha_count {
+			//删除该出库单
+			DeleteDrugWarehouseAutoByNumber(drugOutInfo.ID, tx)
+		}
+	}
+
+	//如果出库的数据小于这个退库的数量差,则先该批次出库数量出完
+	if out_count < cha_count {
+
+		//删除该出库单
+		DeleteDrugWarehouseAutoByNumber(drugOutInfo.ID, tx)
+
+		//计算还有多少没有退库
+		var over_count = cha_count - out_count
+
+		NewHisDrugAutoCancelInfo(orgID, creater, advice, over_count, drug, tx)
+	}
+	return err
+}

service/stock_service.go

@@ -3473,6 +3473,20 @@ func AddNewSigleDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo, tx *gorm
 	}
 	return err
 }
+
+func UpdateSigleDrugWarehouseOutInfoDetail(id int64, count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status=1", id).UpdateColumn("count", gorm.Expr("count + ?", count)).Error
+
+	err = tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status=1", id).UpdateColumn("over_count", gorm.Expr("over_count - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
 func AddSigleAutoReduceRecordInfo(detail *models.AutomaticReduceDetail) error {
 	ut := writeDb.Begin()
 	err := ut.Create(&detail).Error
@@ -3490,6 +3504,31 @@ func AddSigleDrugAutoReduceRecordInfo(detail *models.DrugAutomaticReduceDetail)
 
 }
 
+func GetDrugAutoMaticReduceDetail(drug_id int64, patient_id int64, record_time int64, org_id int64, adivce_id int64, warehouse_info_id int64, tx *gorm.DB) (models.DrugAutomaticReduceDetail, error) {
+
+	detail := models.DrugAutomaticReduceDetail{}
+	err := tx.Where("drug_id = ? and patient_id =? and record_time =? and org_id = ? and advice_id = ? and warehouse_info_id =?", drug_id, patient_id, record_time, org_id, adivce_id, warehouse_info_id).Find(&detail).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return detail, err
+		}
+	}
+	return detail, err
+}
+
+func UpdateNewSingleDrugAutoReduceRecordInfo(id int64, count int64, tx *gorm.DB) error {
+
+	err := tx.Model(models.DrugAutomaticReduceDetail{}).Where("id = ? and status =1", id).UpdateColumn("count", gorm.Expr("count + ?", count)).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func AddNewSigleDrugAutoReduceRecordInfo(detail *models.DrugAutomaticReduceDetail, tx *gorm.DB) error {
 
 	err := tx.Create(&detail).Error

service/warhouse_service.go

@@ -7889,8 +7889,7 @@ func NewHisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdv
 		drup, _ := FindNewBaseDrugLibRecord(orgID, advice.DrugId, tx)
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
-			fmt.Println(prescribingNumber)
-			NewBloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber, advice.PrescribingNumberUnit, tx)
+			HisStoryBloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber, advice.PrescribingNumberUnit, tx)
 
 		} else {
 			return errors.New("药品信息不存在")