Merge remote-tracking branch 'origin/20220812' into 20220812

controllers/mobile_api_controllers/patient_api_controller.go

@@ -759,8 +759,13 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
 									pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
 									if prescriptionConfig.IsOpen == 1 {
-										if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
-											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										if medical.IsUse == 2 {
+											if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 2 {
+												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+											}
+											if pharmacyConfig.IsOpen != 1 {
+												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+											}
 
 											//更新字典里面的库存
 											stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
@@ -773,8 +778,13 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									}
 								} else {
 									pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
-									if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
-										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+									if medical.IsUse == 2 {
+										if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 2 {
+											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										}
+										if pharmacyConfig.IsOpen != 1 {
+											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										}
 
 										stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 										var sum_count int64
@@ -864,8 +874,13 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 							if prescribing_number_total <= total {
 								pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
-								if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
-									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+								if medical.IsUse == 2 {
+									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 2 {
+										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+									}
+									if pharmacyConfig.IsOpen != 1 {
+										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+									}
 
 									//更新字典里面的库存
 									stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
@@ -1169,10 +1184,16 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 						if prescribing_number_total <= total {
 							pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
-							if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
+							if medical.IsUse == 2 {
 
 								if config.IsOpen != 1 {
-									service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 2 {
+										service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+									}
+									if pharmacyConfig.IsOpen != 1 {
+										service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+									}
+
 									//更新字典里面的库存
 									stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 									var sum_count int64

controllers/patient_api_controller.go

@@ -1711,8 +1711,14 @@ func (c *PatientApiController) ExecGroupAdvice() {
 			}
 			if prescribing_number_total <= total {
 				pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
-				if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
-					service.DrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+				if medical.IsUse == 2 {
+					if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 2 {
+						service.DrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+					}
+					if pharmacyConfig.IsOpen != 1 {
+						service.DrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+					}
+
 					//查询默认仓库
 					storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
 					//查询默认仓库剩余多少库存
@@ -1936,8 +1942,17 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
 						pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
 						if prescriptionConfig.IsOpen == 1 {
-							if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
-								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+
+							if medical.IsUse == 2 {
+								//是通过药房发药
+								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 2 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+								}
+								//不通过药房发药
+								if pharmacyConfig.IsOpen != 1 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+								}
+
 								//查询默认仓库
 								storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
 								//查询默认仓库剩余多少库存
@@ -1974,8 +1989,15 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 					} else {
 						pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
-						if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
-							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+						if medical.IsUse == 2 {
+							//是通过药房发药
+							if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 2 {
+								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+							}
+							//不通过药房发药
+							if pharmacyConfig.IsOpen != 1 {
+								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+							}
 							//更新字典里面的库存
 							var sum_count int64
 							stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
@@ -2255,11 +2277,16 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 					if prescribing_number_total <= total {
 						pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
-						if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
 
+						if medical.IsUse == 2 {
 							if config.IsOpen != 1 {
-
-								service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 2 {
+									service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+								}
+								//不通过药房发药
+								if pharmacyConfig.IsOpen != 1 {
+									service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+								}
 								//查询默认仓库
 								storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
 								//查询默认仓库剩余多少库存