历史排班

controllers/his_api_controller.go

@@ -4166,7 +4166,6 @@ func (c *HisApiController) CreateHisPrescription() {
 					theTime2, err := time.ParseInLocation(timeLayout+" 15:04", preTime, loc)
 					result := strings.Split(preTime, " ")
 					theTime3, _ := time.ParseInLocation(timeLayout, result[0], loc)
-					fmt.Println("theTime30000000000000000000000", theTime3.Unix())
 					if err != nil {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1271,6 +1271,16 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		return
 	} else if origin == 2 {
 
+		// 开始主事务
+		db := service.XTWriteDB()
+		tx := db.Begin()
+
+		// 在函数结束时处理事务回滚
+		defer func() {
+			if r := recover(); r != nil {
+				tx.Rollback()
+			}
+		}()
 		adminInfo := c.GetMobileAdminUserInfo()
 		creater := c.GetMobileAdminUserInfo().AdminUser.Id
 		var ids []string
@@ -1337,7 +1347,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				}
 			}
-			err = service.SaveHisDoctorAdvice(item)
+
+			//err = service.SaveHisDoctorAdvice(item)
+
+			service.SaveHisDoctorAdviceOne(item, tx)
 
 			//记录日志
 			byterequest, _ := json.Marshal(item)
@@ -1397,14 +1410,14 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		if drugStockConfig.IsOpen == 1 {
 			for _, item := range advices {
 				//查询改药品信息
-				medical, _ := service.GetBaseDrugMedical(item.DrugId)
+				medical, _ := service.GetBaseDrugMedicalOne(item.DrugId, tx)
 
 				//判断单位是否合格
 				if item.PrescribingNumberUnit != medical.MaxUnit && item.PrescribingNumberUnit != medical.MinUnit {
 					//查询该药品是否有出库记录
-					flowMap, _ := service.GetDrugFLowByAdviceById(item.DrugId, item.PatientId, item.UserOrgId, item.AdviceDate)
+					flowMap, _ := service.GetDrugFLowByAdviceByIdOne(item.DrugId, item.PatientId, item.UserOrgId, item.AdviceDate, tx)
 					if len(flowMap) == 0 {
-						errs := service.UpdateHisAdviceById(item.ID)
+						errs := service.UpdateHisAdviceByIdOne(item.ID, tx)
 						if errs != nil {
 							drugError := models.XtDrugError{
 								UserOrgId:             adminInfo.Org.Id,
@@ -1422,7 +1435,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							service.CreateDrugError(drugError)
 						}
 					}
-					advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
+					advice, _ := service.FindHisDoctorAdviceByIdTwo(adminInfo.Org.Id, item.ID, tx)
+					tx.Commit()
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg":    "7",
 						"advice": advice,
@@ -1432,8 +1446,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				//查询这个患者这个患者这个药已经出库的所有数量
-				advicelist, _ := service.GetAllHisDoctorAdviceById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
-				drugoutlist, _ := service.GetAllDrugFlowById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
+				advicelist, _ := service.GetAllHisDoctorAdviceByIdOne(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId, tx)
+				drugoutlist, _ := service.GetAllDrugFlowByIdOne(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId, tx)
 				var total_count int64
 				var drug_count int64
 				for _, it := range advicelist {
@@ -1460,8 +1474,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				if total_count == drug_count {
-
-					advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
+					advice, _ := service.FindHisDoctorAdviceByIdTwo(adminInfo.Org.Id, item.ID, tx)
+					tx.Commit()
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg":    "1",
 						"advice": advice,
@@ -1470,7 +1484,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					return
 				}
 
-				advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
+				advice, _ := service.FindHisDoctorAdviceByIdTwo(adminInfo.Org.Id, item.ID, tx)
 
 				var total int64
 				var prescribing_number_total int64
@@ -1480,7 +1494,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				if config.IsOpen != 1 {
 					//查询该药品是否有库存
 					houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
-					list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
+					list, _ := service.GetDrugTotalCountTwoTwety(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut, tx)
 
 					//判断单位是否相等
 					if medical.MaxUnit == advice.PrescribingNumberUnit {
@@ -1540,6 +1554,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								PrescribingNumberUnit: advice.PrescribingNumberUnit,
 							}
 							service.CreateDrugError(drugError)
+							tx.Commit()
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "3",
 								"advice": advice,
@@ -1562,6 +1577,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								PrescribingNumberUnit: advice.PrescribingNumberUnit,
 							}
 							service.CreateDrugError(drugError)
+							tx.Commit()
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "2",
 								"advice": advice,
@@ -1571,6 +1587,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 					}
 
+					fmt.Println("hhahhahahahhhhhha", prescribing_number_total)
+					fmt.Println("total0000000000000", total)
+					fmt.Println("medical22222222222222", medical.IsUse)
+					fmt.Println("config.isp", config.IsOpen)
 					if prescribing_number_total <= total {
 
 						pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
@@ -1579,13 +1599,15 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 							if config.IsOpen != 1 {
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-									service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+
+									//service.NewHisDrugsDelivery(adminInfo.Org.Id, creater, &advice, tx)
+									//service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
 
 									if adminInfo.Org.Id == 3877 || adminInfo.Org.Id == 10265 {
 										//查询该药品是否有出库记录
-										flowMap, _ := service.GetDrugFLowByAdviceById(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate)
+										flowMap, _ := service.GetDrugFLowByAdviceByIdOne(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate, tx)
 										if len(flowMap) == 0 {
-											errs := service.UpdateHisAdviceById(advice.ID)
+											errs := service.UpdateHisAdviceByIdOne(advice.ID, tx)
 											if errs != nil {
 												drugError := models.XtDrugError{
 													UserOrgId:             adminInfo.Org.Id,
@@ -1602,6 +1624,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 												}
 												service.CreateDrugError(drugError)
 											}
+											tx.Commit()
 											c.ServeSuccessJSON(map[string]interface{}{
 												"msg":    "6",
 												"advice": advice,
@@ -1613,14 +1636,15 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								}
 								if pharmacyConfig.IsOpen != 1 {
 
-									service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+									//service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+									service.NewHisDrugsDelivery(adminInfo.Org.Id, creater, &advice, tx)
 									if adminInfo.Org.Id == 3877 || adminInfo.Org.Id == 10265 {
 										//查询该药品是否有出库记录
-										flowMap, _ := service.GetDrugFLowByAdviceById(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate)
+										flowMap, _ := service.GetDrugFLowByAdviceByIdOne(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate, tx)
 
 										if len(flowMap) == 0 {
 
-											errs := service.UpdateHisAdviceById(advice.ID)
+											errs := service.UpdateHisAdviceByIdOne(advice.ID, tx)
 											if errs != nil {
 												drugError := models.XtDrugError{
 													UserOrgId:             adminInfo.Org.Id,
@@ -1637,18 +1661,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 												}
 												service.CreateDrugError(drugError)
 											}
+											tx.Commit()
 											c.ServeSuccessJSON(map[string]interface{}{
 												"msg":    "6",
 												"advice": advice,
 												"ids":    ids,
 											})
+
 											return
 										}
 									}
 								}
 
 								//更新字典里面的库存
-								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+								stockInfo, _ := service.GetNewDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId, tx)
 								var sum_count int64
 								for _, its := range stockInfo {
 									if its.MaxUnit == medical.MaxUnit {
@@ -1656,9 +1682,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									}
 									sum_count += its.StockMaxNumber + its.StockMinNumber
 								}
-								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+								service.UpdateNewBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId, tx)
 								//剩余库存
-								service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+								service.UpdateNewDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count, tx)
+
 							}
 
 						}
@@ -1687,8 +1714,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			}
 		}
+		tx.Commit()
 		for _, item := range advices {
 			advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
+
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":    "1",
 				"advice": advice,

controllers/self_drug_api_congtroller.go

@@ -3689,15 +3689,18 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 	}
 	var ids []int64
 	var goodIds []int64
-	infoList, _ := service.GetGoodWarehouseInfoByOrgIdTwo(orgId)
-	for _, it := range infoList {
-		goodIds = append(goodIds, it.GoodId)
-	}
+	//infoList, _ := service.GetGoodWarehouseInfoByOrgIdTwo(orgId)
+	//for _, it := range infoList {
+	//	goodIds = append(goodIds, it.GoodId)
+	//}
 
-	manufacturers, _ := service.GetManufacturerListByKeyword(orgId, keyword)
-	for _, it := range manufacturers {
-		ids = append(ids, it.ID)
+	if len(keyword) > 0 {
+		manufacturers, _ := service.GetManufacturerListByKeyword(orgId, keyword)
+		for _, it := range manufacturers {
+			ids = append(ids, it.ID)
+		}
 	}
+
 	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
 
 	if orgId == 10265 {
@@ -3909,14 +3912,18 @@ func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
 	var ids []int64
 	var infoIds []int64
 
-	manufacturers, _ := service.GetManufacturerListByKeyword(orgId, keyword)
-	for _, it := range manufacturers {
-		ids = append(ids, it.ID)
-	}
-	infoList, _ := service.GetDrugWarehouseInfoByOrgIdTwo(orgId)
-	for _, it := range infoList {
-		infoIds = append(infoIds, it.DrugId)
+	if len(keyword) > 0 {
+		manufacturers, _ := service.GetManufacturerListByKeyword(orgId, keyword)
+		for _, it := range manufacturers {
+			ids = append(ids, it.ID)
+		}
 	}
+
+	//infoList, _ := service.GetDrugWarehouseInfoByOrgIdTwo(orgId)
+	//for _, it := range infoList {
+	//	infoIds = append(infoIds, it.DrugId)
+	//}
+
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	list, total, err := service.GetDrugNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, startTime, endTime, ids, infoIds)
 
@@ -3940,7 +3947,6 @@ func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
 
 		//期中减少
 		outInfo, _ := service.FindeDrugWarehouseOutInfo(item.ID, item.OrgId, startTime, endTime)
-		fmt.Println("putInfo2o2o2oo2o2", outInfo)
 		for _, it := range outInfo {
 			item.DrugWarehouseOutInfoStartEnd = append(item.DrugWarehouseOutInfoStartEnd, it)
 		}

service/dialysis_service.go

@@ -1493,6 +1493,17 @@ func FindHisDoctorAdviceById(orgID int64, id int64) (advice models.HisDoctorAdvi
 	return
 }
 
+func FindHisDoctorAdviceByIdTwo(orgID int64, id int64, tx *gorm.DB) (advice models.HisDoctorAdviceInfo, err error) {
+	err = tx.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id=? and status=1 and id = ?", orgID, id).First(&advice).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return
+		}
+	}
+	return
+}
+
 func FindHisDoctorAdviceByIds(orgID int64, ids []string) (advice []*models.HisDoctorAdviceInfo, err error) {
 	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id=? and status=1 and id in (?)", orgID, ids).Find(&advice).Error
 	return
@@ -1503,6 +1514,16 @@ func SaveHisDoctorAdvice(advice *models.HisDoctorAdviceInfo) (err error) {
 	return
 }
 
+func SaveHisDoctorAdviceOne(advice *models.HisDoctorAdviceInfo, tx *gorm.DB) (err error) {
+	err = tx.Save(&advice).Error
+	if err != nil {
+
+		tx.Rollback()
+		return
+	}
+	return
+}
+
 func GetGoodInfoMation(orgid int64) (goodinfo []*models.GoodInfo, err error) {
 
 	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "stock_count > 0 and status = 1").Find(&goodinfo).Error

service/self_drug_service.go

@@ -137,6 +137,19 @@ func GetBaseDrugMedical(id int64) (models.XtBaseDrug, error) {
 	return drug, err
 }
 
+func GetBaseDrugMedicalOne(id int64, tx *gorm.DB) (models.XtBaseDrug, error) {
+	drug := models.XtBaseDrug{}
+	err := tx.Model(&drug).Where("id = ? and status = 1", id).Find(&drug).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return drug, err
+		}
+
+	}
+	return drug, err
+}
+
 func GetNewBaseDrugMedical(id int64, tx *gorm.DB) (models.XtBaseDrug, error) {
 	drug := models.XtBaseDrug{}
 	err := tx.Model(&drug).Where("id = ? and status = 1", id).Find(&drug).Error
@@ -2801,7 +2814,7 @@ func CreateDrugStockCount(stockCount models.XtDrugStockCount) error {
 
 func GetGoodNewPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64) (goodinfo []*models.GoodInfoTwenty, total int64, err error) {
 
-	db := XTReadDB().Model(&goodinfo).Where("status = 1 and total_count > 0")
+	db := XTReadDB().Model(&goodinfo).Where("status = 1")
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
 	if good_type > 0 {
@@ -2811,9 +2824,9 @@ func GetGoodNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
 	}
-	if len(ids) > 0 {
-		db = db.Where("id in(?)", goodIds)
-	}
+	//if len(ids) > 0 {
+	//	db = db.Where("id in(?)", goodIds)
+	//}
 	if len(keyword) > 0 {
 		db = db.Where("good_name like ? or manufacturer in(?)", likeKey, ids)
 	}
@@ -2887,9 +2900,9 @@ func GetDrugNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 	if len(keyword) > 0 {
 		db = db.Where("drug_name like ? or manufacturer in(?)", likeKey, ids)
 	}
-	if len(infos) > 0 {
-		db = db.Where("id in(?)", infos)
-	}
+	//if len(infos) > 0 {
+	//	db = db.Where("id in(?)", infos)
+	//}
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&druginfo).Error
 
 	return druginfo, total, err

service/stock_service.go

@@ -4841,6 +4841,29 @@ func GetDrugTotalCount(drugid int64, orgid int64, storehouse_id int64) (info mod
 	return info, err
 }
 
+func GetDrugTotalCountTwoTwety(drugid int64, orgid int64, storehouse_id int64, tx *gorm.DB) (info models.VmDrugWarehouseInfo, err error) {
+
+	db := tx.Table("xt_drug_warehouse_info as x").Where("x.status = 1 and x.is_check = 1")
+	if drugid > 0 {
+		db = db.Where("x.drug_id = ?", drugid)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
+	}
+	err = db.Select("x.drug_id,sum(x.stock_max_number) as count,sum(x.stock_min_number) as stock_min_number,x.max_unit,x.min_unit").Find(&info).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+
+	}
+	return info, err
+}
+
 func GetDrugTotalCountTwenty(drugid int64, orgid int64, storehouse_id int64) (info models.VmDrugWarehouseInfo, err error) {
 
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and x.is_check = 1 ")
@@ -6948,12 +6971,36 @@ func GetAllHisDoctorAdviceById(drugid int64, patient_id int64, advicedate int64,
 	return advice, err
 }
 
+func GetAllHisDoctorAdviceByIdOne(drugid int64, patient_id int64, advicedate int64, orgid int64, tx *gorm.DB) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = tx.Where("drug_id = ? and patient_id = ? and advice_date = ? and execution_state = 1 and status = 1 and user_org_id = ?", drugid, patient_id, advicedate, orgid).Find(&advice).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return advice, err
+		}
+	}
+	return advice, err
+}
+
 func GetAllDrugFlowById(drugid int64, patient_id int64, advicedate int64, orgid int64) (info []*models.DrugWarehouseOutInfo, err error) {
 
 	err = XTReadDB().Where("drug_id = ? and patient_id = ? and sys_record_time = ? and org_id = ? and status = 1", drugid, patient_id, advicedate, orgid).Find(&info).Error
 	return info, err
 }
 
+func GetAllDrugFlowByIdOne(drugid int64, patient_id int64, advicedate int64, orgid int64, tx *gorm.DB) (info []*models.DrugWarehouseOutInfo, err error) {
+
+	err = tx.Where("drug_id = ? and patient_id = ? and sys_record_time = ? and org_id = ? and status = 1", drugid, patient_id, advicedate, orgid).Find(&info).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+	return info, err
+}
+
 // 耗材加库存
 func ModifyGoodAddInformation(good_id int64, sum_count int64, orgid int64) (models.GoodInfo, error) {
 
@@ -8285,13 +8332,9 @@ func UpdateBaseDrugSumInfo(sum_count int64, drugid int64, orgid int64, sum_in_co
 }
 
 func UpdateBaseDrugSumTwo(drugid int64, sum_count int64, orgid int64) error {
-	ut := writeDb.Begin()
-	err = ut.Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drugid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+
+	err = writeDb.Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drugid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
+
 	return err
 }
 

service/warhouse_service.go

@@ -622,22 +622,6 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 
 			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber, advice.PrescribingNumberUnit)
 
-			////查询今日出库的数据
-			//if orgID == 10188 || orgID == 10217 || orgID == 10344 {
-			//	//查询这个患者今日用过的总数量
-			//	listDrugFlow, _ := GetDrugFlowByWatch(advice.PatientId, advice.DrugId, advice.AdviceDate, advice.UserOrgId)
-			//	for _, item := range listDrugFlow {
-			//
-			//		outInfor, _ := GetDrugWarehouseOutInfor(item.WarehouseOutDetailId, item.UserOrgId)
-			//		if item.MaxUnit == outInfor.CountUnit {
-			//			if item.Count != outInfor.Count {
-			//				UpdateDrugWarehouseOutInfoById(outInfor.ID, item.Count)
-			//			}
-			//		}
-			//
-			//	}
-			//}
-
 		} else {
 			return errors.New("药品信息不存在")
 		}
@@ -7811,12 +7795,34 @@ func GetDrugFLowByAdviceById(drug_id int64, patient_id int64, user_org_id int64,
 	return outInfo, err
 }
 
+func GetDrugFLowByAdviceByIdOne(drug_id int64, patient_id int64, user_org_id int64, advice_date int64, tx *gorm.DB) (outInfo []*models.DrugWarehouseOutInfo, err error) {
+
+	err = tx.Where("drug_id = ? and patient_id = ? and org_id = ? and sys_record_time = ? and status= 1", drug_id, patient_id, user_org_id, advice_date).Find(&outInfo).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return outInfo, err
+		}
+	}
+	return outInfo, err
+}
+
 func UpdateHisAdviceById(id int64) error {
 
 	err := XTWriteDB().Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", id).Updates(map[string]interface{}{"execution_time": "", "execution_staff": "", "execution_state": 2}).Error
 	return err
 }
 
+func UpdateHisAdviceByIdOne(id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", id).Updates(map[string]interface{}{"execution_time": "", "execution_staff": "", "execution_state": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func GetAdviceIsOut(advice_id int64, user_org_id int64, patient_id int64, advice_date int64, drug_id int64) (models.DrugWarehouseOutInfo, error) {
 
 	advice := models.DrugWarehouseOutInfo{}
@@ -7884,7 +7890,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)
 
 		} else {