历史排班

controllers/dialysis_api_controller.go

@@ -2115,7 +2115,6 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.AdditionalWeight = data.AdditionalWeight
 	assessment.OtherComplication = data.OtherComplication
 	assessment.Ktv = data.Ktv
-	fmt.Println("data.wooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo", data.Urr)
 	assessment.Urr = data.Urr
 	assessment.Hypertenison = data.Hypertenison
 	assessment.Hypopiesia = data.Hypopiesia

controllers/his_api_controller.go

@@ -1828,14 +1828,16 @@ func (c *HisApiController) CreateHisPrescription() {
 										fmt.Println("prescribing_number", prescribing_number)
 										fmt.Println("all_count", all_count)
 										if drug.IsUse != 1 {
-											if all_count == 0 {
-												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-												return
-											}
+											if drug.IsProject == 0 || drug.IsProject == 2 {
+												if all_count == 0 {
+													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+													return
+												}
 
-											if prescribing_number > all_count {
-												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-												return
+												if prescribing_number > all_count {
+													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+													return
+												}
 											}
 
 										}
@@ -1844,14 +1846,17 @@ func (c *HisApiController) CreateHisPrescription() {
 									if prescribingNumberUnit == drug.MaxUnit {
 										num := prescribing_number * float64(drug.MinNumber)
 										if drug.IsUse != 1 {
-											if all_count == 0 {
-												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-												return
-											}
-											if num > all_count {
-												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-												return
+											if drug.IsProject == 0 || drug.IsProject == 2 {
+												if all_count == 0 {
+													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+													return
+												}
+												if num > all_count {
+													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+													return
+												}
 											}
+
 										}
 									}
 								}
@@ -1904,27 +1909,32 @@ func (c *HisApiController) CreateHisPrescription() {
 											all_count, _ := strconv.ParseFloat(totals, 64)
 											if prescribingNumberUnit == drug.MinUnit {
 												if drug.IsUse != 1 {
-													if all_count == 0 {
-														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-														return
-													}
-													if prescribing_number > all_count {
-														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-														return
-													}
-												}
-											} else {
-												if prescribingNumberUnit == drug.MaxUnit {
-													num := prescribing_number * float64(drug.MinNumber)
-													if drug.IsUse != 1 {
+													if drug.IsProject == 0 || drug.IsProject == 2 {
 														if all_count == 0 {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
-														if num > all_count {
+														if prescribing_number > all_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
+													}
+
+												}
+											} else {
+												if prescribingNumberUnit == drug.MaxUnit {
+													num := prescribing_number * float64(drug.MinNumber)
+													if drug.IsUse != 1 {
+														if drug.IsProject == 0 || drug.IsProject == 2 {
+															if all_count == 0 {
+																c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+																return
+															}
+															if num > all_count {
+																c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+																return
+															}
+														}
 
 													}
 
@@ -2042,13 +2052,16 @@ func (c *HisApiController) CreateHisPrescription() {
 									if prescribingNumberUnit == drug.MinUnit {
 
 										if drug.IsUse != 1 {
-											if all_count == 0 {
-												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-												return
-											}
-											if prescribing_number > all_count {
-												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-												return
+
+											if drug.IsProject == 0 || drug.IsProject == 2 {
+												if all_count == 0 {
+													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+													return
+												}
+												if prescribing_number > all_count {
+													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+													return
+												}
 											}
 
 											if adminInfo.CurrentOrgId == 10215 {
@@ -2064,14 +2077,17 @@ func (c *HisApiController) CreateHisPrescription() {
 									if prescribingNumberUnit == drug.MaxUnit {
 										num := prescribing_number * float64(drug.MinNumber)
 										if drug.IsUse != 1 {
-											if all_count == 0 {
-												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-												return
-											}
-											if num > all_count {
-												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-												return
+											if drug.IsProject == 0 || drug.IsProject == 2 {
+												if all_count == 0 {
+													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+													return
+												}
+												if num > all_count {
+													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+													return
+												}
 											}
+
 											if adminInfo.CurrentOrgId == 10215 {
 												if num > batch_number_all_count {
 													c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
@@ -2137,14 +2153,17 @@ func (c *HisApiController) CreateHisPrescription() {
 											if prescribingNumberUnit == drug.MinUnit {
 												batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 												if drug.IsUse != 1 {
-													if all_count == 0 {
-														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-														return
-													}
-													if prescribing_number > all_count {
-														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-														return
+													if drug.IsProject == 0 || drug.IsProject == 2 {
+														if all_count == 0 {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
+														if prescribing_number > all_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
 													}
+
 													if adminInfo.CurrentOrgId == 10215 {
 														if prescribing_number > batch_number_all_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
@@ -2159,14 +2178,17 @@ func (c *HisApiController) CreateHisPrescription() {
 													batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 													num := prescribing_number * float64(drug.MinNumber)
 													if drug.IsUse != 1 {
-														if all_count == 0 {
-															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-															return
-														}
-														if num > all_count {
-															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-															return
+														if drug.IsProject == 0 || drug.IsProject == 2 {
+															if all_count == 0 {
+																c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+																return
+															}
+															if num > all_count {
+																c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+																return
+															}
 														}
+
 														if adminInfo.CurrentOrgId == 10215 {
 															if prescribing_number > batch_number_all_count {
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
@@ -2214,19 +2236,22 @@ func (c *HisApiController) CreateHisPrescription() {
 											if (number_count - device_number) > 0 {
 												//如果修改的差数量 大于库存数量
 												if drug.IsUse != 1 {
-													if total_count == 0 {
-														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-														return
-													}
-													if (number_count - device_number) > total_count {
-														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-														return
-													}
+													if drug.IsProject == 0 || drug.IsProject == 2 {
+														if total_count == 0 {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
+														if (number_count - device_number) > total_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
 
-													if (number_count - device_number) > batch_number_count {
-														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-														return
+														if (number_count - device_number) > batch_number_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+															return
+														}
 													}
+
 													if adminInfo.CurrentOrgId == 10215 {
 														// 查询该药品最后一次出库记录
 														outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
@@ -2383,14 +2408,17 @@ func (c *HisApiController) CreateHisPrescription() {
 											if prescribingNumberUnit == drug.MinUnit {
 												batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 												if drug.IsUse != 1 {
-													if all_count == 0 {
-														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-														return
-													}
-													if prescribing_number > all_count {
-														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-														return
+													if drug.IsProject == 0 || drug.IsProject == 2 {
+														if all_count == 0 {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
+														if prescribing_number > all_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
 													}
+
 													if adminInfo.CurrentOrgId == 10215 {
 														if prescribing_number > batch_number_all_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
@@ -2405,14 +2433,17 @@ func (c *HisApiController) CreateHisPrescription() {
 													batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 													num := prescribing_number * float64(drug.MinNumber)
 													if drug.IsUse != 1 {
-														if all_count == 0 {
-															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-															return
-														}
-														if num > all_count {
-															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-															return
+														if drug.IsProject == 0 || drug.IsProject == 2 {
+															if all_count == 0 {
+																c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+																return
+															}
+															if num > all_count {
+																c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+																return
+															}
 														}
+
 														if adminInfo.CurrentOrgId == 10215 {
 															if prescribing_number > batch_number_all_count {
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
@@ -2458,14 +2489,17 @@ func (c *HisApiController) CreateHisPrescription() {
 											if (number_count - device_number) > 0 {
 												//如果修改的差数量 大于库存数量
 												if drug.IsUse != 1 {
-													if total_count == 0 {
-														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-														return
-													}
-													if (number_count - device_number) > total_count {
-														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-														return
+													if drug.IsProject == 0 || drug.IsProject == 2 {
+														if total_count == 0 {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
+														if (number_count - device_number) > total_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
 													}
+
 													if adminInfo.CurrentOrgId == 10215 {
 														if (number_count - device_number) > batch_number_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)

controllers/manager_center_api_controller.go

@@ -160,7 +160,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	is_pharmacy, _ := c.GetInt64("is_pharmacy")
 	bbx01 := c.GetString("bbx01")
 	bby01 := c.GetString("bby01")
-
+	is_project, _ := c.GetInt64("is_project")
 	adminInfo := c.GetAdminUserInfo()
 	drugLib := &models.BaseDrugLib{
 		DrugName:                    drug_name,
@@ -230,6 +230,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		Bby01:                       bby01,
 		ZuobiaoId:                   bbx01,
 		Bbx01:                       bbx01,
+		IsProject:                   is_project,
 	}
 
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
@@ -339,7 +340,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 
 	bbx01 := c.GetString("bbx01")
 	bby01 := c.GetString("bby01")
-
+	is_project, _ := c.GetInt64("is_project")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 	drugLib := &models.BaseDrugLib{
@@ -415,6 +416,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		ZuobiaoId:                   bbx01,
 		Bby01:                       bby01,
 		Bbx01:                       bbx01,
+		IsProject:                   is_project,
 	}
 	if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
 

controllers/pharmacy_controller.go

@@ -325,6 +325,7 @@ func (this *PharmacyController) GetPharmacyContent() {
 	}
 	var list []*models.PharmacyContent
 	list, err = service.GetPatientMedication(orgid, patient_id, stime, etime, is_medicine)
+
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -373,34 +374,37 @@ func (this *PharmacyController) DispensingMedicine() {
 		for _, item := range advicelist {
 			//查询改药品信息
 			medical, _ := service.GetBaseDrugMedical(item.DrugId)
-			if medical.IsPharmacy == 1 {
-				houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
-				//查询该药品是否有库存
-				list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
-
-				//判断单位是否相等
-				if medical.MaxUnit == item.PrescribingNumberUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					//转化为最小单位
-					total = list.Count*medical.MinNumber + list.StockMinNumber
-					prescribing_number_total = count * medical.MinNumber
-				}
-				if medical.MinUnit == item.PrescribingNumberUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					total = list.Count*medical.MinNumber + list.StockMinNumber
-					prescribing_number_total = count
-				}
+			//针对阜阳经沃
+			if orgid != 10480 {
+				if medical.IsPharmacy == 1 {
+					houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
+					//查询该药品是否有库存
+					list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
+
+					//判断单位是否相等
+					if medical.MaxUnit == item.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						//转化为最小单位
+						total = list.Count*medical.MinNumber + list.StockMinNumber
+						prescribing_number_total = count * medical.MinNumber
+					}
+					if medical.MinUnit == item.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						total = list.Count*medical.MinNumber + list.StockMinNumber
+						prescribing_number_total = count
+					}
 
-				if medical.IsUse != 1 {
-					//如果出库数量大于库存数量
-					if prescribing_number_total > total {
-						err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
-						if err != nil {
-							utils.ErrorLog(err.Error())
-							this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
-							return
+					if medical.IsUse != 1 {
+						//如果出库数量大于库存数量
+						if prescribing_number_total > total {
+							err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
+							if err != nil {
+								utils.ErrorLog(err.Error())
+								this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+								return
+							}
 						}
 					}
 				}

models/drug.go

@@ -86,6 +86,7 @@ type BaseDrugLib struct {
 	Bbx01     string `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
 
 	FirstLetter string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	IsProject   int64  `gorm:"column:is_project" json:"is_project" form:"is_project"`
 }
 
 func (BaseDrugLib) TableName() string {
@@ -102,6 +103,7 @@ type BaseDrugLibSeven struct {
 	IsUse      int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	IsPharmacy int64  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
 	OrgId      int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsProject  int64  `gorm:"column:is_project" json:"is_project" form:"is_project"`
 }
 
 func (BaseDrugLibSeven) TableName() string {

service/his_service.go

@@ -808,7 +808,7 @@ type BaseDrugLib struct {
 	SumInCount            int64   `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
 	FirstLetter           string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	Bby01                 string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
-
+	IsProject             int64   `gorm:"column:is_project" json:"is_project" form:"is_project"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
 	VMDrugSalesReturnInfo  []*VMDrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"sales_return"`

service/pharmacy_service.go

@@ -675,29 +675,33 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 	if err != nil {
 		return
 	}
-	for _, v := range advice_info {
-		tmp_bool := IsPharmacyConfig(orgid)
-		if tmp_bool {
-			if PettyCash(v.DrugId) {
-				continue
-			}
-			if orgid != 10217 && orgid != 10188 && orgid != 9671 && orgid != 10164 && orgid != 10387 && orgid != 10375 {
-				////判断药品库存是否充足
-				kou := FenDrugInventory(v, orgid)
-				if !kou {
-					err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
-					return
+
+	if orgid != 10480 {
+		for _, v := range advice_info {
+			tmp_bool := IsPharmacyConfig(orgid)
+			if tmp_bool {
+				if PettyCash(v.DrugId) {
+					continue
+				}
+				if orgid != 10217 && orgid != 10188 && orgid != 9671 && orgid != 10164 && orgid != 10387 && orgid != 10375 && orgid != 10480 {
+					////判断药品库存是否充足
+					kou := FenDrugInventory(v, orgid)
+					if !kou {
+						err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
+						return
+					}
 				}
-			}
 
-			//扣减库存
-			err = FenStock(orgid, creater, v)
-			if err != nil {
-				err = fmt.Errorf("!:%v", err)
-				return
+				//扣减库存
+				err = FenStock(orgid, creater, v)
+				if err != nil {
+					err = fmt.Errorf("!:%v", err)
+					return
+				}
 			}
 		}
 	}
+
 	//修改状态
 	errs := XTWriteDB().Model(&models.HisDoctorAdviceInfoL{}).Where("id in (?)", hid).Updates(map[string]interface{}{
 		"is_medicine":     1,
@@ -714,7 +718,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 	}
 
 	//针对大丰响水
-	if orgid != 10217 && orgid != 10188 && orgid != 9671 && orgid != 10164 && orgid != 10387 && orgid != 10375 {
+	if orgid != 10217 && orgid != 10188 && orgid != 9671 && orgid != 10164 && orgid != 10387 && orgid != 10375 && orgid != 10480 {
 		err = tx.Raw("select id from xt_doctor_advice where status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and "+
 			"user_org_id = ? and patient_id = ? and is_medicine = 0 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, orgid).Scan(&xids).Error
 		if err != nil {
@@ -820,34 +824,38 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 	if err != nil {
 		return
 	}
-	for _, v := range advice_info {
-		//扣减库存
-		if !IsPharmacyDelivery(v.DrugId, orgid) {
-			continue
-		}
-		err = DrugAutoAddCancelInfo(v, creater)
-		if err != nil {
-			err = fmt.Errorf("!:%v", err)
-			return
-		}
-		//drug, _ := FindBaseDrugLibRecordSeven(orgid, v.DrugId)
-		//查询默认仓库
-		storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
-		//查询默认仓库剩余多少库存
-		var sum_count int64
-		stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, v.DrugId)
-		for _, its := range stockInfo {
-			baseDrug, _ := GetBaseDrugMedical(its.DrugId)
-			if its.MaxUnit == baseDrug.MaxUnit {
-				its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+
+	//针对阜阳经沃
+	if orgid != 10480 {
+		for _, v := range advice_info {
+			//扣减库存
+			if !IsPharmacyDelivery(v.DrugId, orgid) {
+				continue
+			}
+			err = DrugAutoAddCancelInfo(v, creater)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+			//drug, _ := FindBaseDrugLibRecordSeven(orgid, v.DrugId)
+			//查询默认仓库
+			storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
+			//查询默认仓库剩余多少库存
+			var sum_count int64
+			stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, v.DrugId)
+			for _, its := range stockInfo {
+				baseDrug, _ := GetBaseDrugMedical(its.DrugId)
+				if its.MaxUnit == baseDrug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
 			}
-			sum_count += its.StockMaxNumber + its.StockMinNumber
-		}
 
-		UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
-		//扣减库存
-		UpdateDrugStockCount(v.DrugId, v.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+			UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
+			//扣减库存
+			UpdateDrugStockCount(v.DrugId, v.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 
+		}
 	}
 
 	err = tx.Raw("select id,dispensing_time from xt_doctor_advice where status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and "+
@@ -875,32 +883,34 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 	if err != nil {
 		return
 	}
-	for _, v := range advice {
-		//扣减库存
-		if !IsPharmacyDelivery(v.DrugId, orgid) {
-			continue
-		}
-		err = DrugAutoAddCancelInfo(v, creater)
-		if err != nil {
-			err = fmt.Errorf("!:%v", err)
-			return
-		}
-		//drug, _ := FindBaseDrugLibRecordSeven(orgid, v.DrugId)
-		//查询默认仓库
-		storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
-		//查询默认仓库剩余多少库存
-		var sum_count int64
-		stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, v.DrugId)
-		for _, its := range stockInfo {
-			baseDrug, _ := GetBaseDrugMedical(its.DrugId)
-			if its.MaxUnit == baseDrug.MaxUnit {
-				its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+	if orgid != 10480 {
+		for _, v := range advice {
+			//扣减库存
+			if !IsPharmacyDelivery(v.DrugId, orgid) {
+				continue
+			}
+			err = DrugAutoAddCancelInfo(v, creater)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+			//drug, _ := FindBaseDrugLibRecordSeven(orgid, v.DrugId)
+			//查询默认仓库
+			storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
+			//查询默认仓库剩余多少库存
+			var sum_count int64
+			stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, v.DrugId)
+			for _, its := range stockInfo {
+				baseDrug, _ := GetBaseDrugMedical(its.DrugId)
+				if its.MaxUnit == baseDrug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
 			}
-			sum_count += its.StockMaxNumber + its.StockMinNumber
+			UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
+			//扣减库存
+			UpdateDrugStockCount(v.DrugId, v.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 		}
-		UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
-		//扣减库存
-		UpdateDrugStockCount(v.DrugId, v.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 	}
 
 	//删除掉发药明细