Merge branch '20220812' of http://git.shengws.com/csx/XT_New into 20220812

controllers/drug_pharmacy_management_controller.go

@@ -469,8 +469,8 @@ func (this *PharmacyApiController) GetReturnPharmacyBaseDrug() {
 func (this *PharmacyApiController) SaveSetting() {
 	var err error
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
 	is_open, _ := this.GetInt64("is_open")
@@ -492,6 +492,8 @@ func (this *PharmacyApiController) SaveSetting() {
 	}
 	if is_open == 2 {
 		err = fmt.Errorf("用户关闭药房管理出库")
+	} else {
+		err = fmt.Errorf("用户开启药房管理出库")
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{

service/pharmacy_service.go

@@ -727,6 +727,9 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 	}
 	for _, v := range advice_info {
 		//扣减库存
+		if !IsPharmacyDelivery(v.DrugId, orgid) {
+			continue
+		}
 		err = DrugAutoAddCancelInfo(v, creater)
 		if err != nil {
 			err = fmt.Errorf("!:%v", err)
@@ -771,6 +774,9 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 	}
 	for _, v := range advice {
 		//扣减库存
+		if !IsPharmacyDelivery(v.DrugId, orgid) {
+			continue
+		}
 		err = DrugAutoAddCancelInfo(v, creater)
 		if err != nil {
 			err = fmt.Errorf("!:%v", err)