Browse Source

库存调拨修改

28169 2 years ago
parent
commit
b6e6ce0826

+ 4 - 0
controllers/mobile_api_controllers/patient_api_controller.go View File

@@ -546,6 +546,7 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
546 546
 }
547 547
 
548 548
 func (c *PatientApiController) ExecDoctorAdvice() {
549
+
549 550
 	execution_time := c.GetString("execution_time")
550 551
 
551 552
 	origin, _ := c.GetInt64("origin", 0)
@@ -1097,6 +1098,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
1097 1098
 
1098 1099
 			//药品管理信息
1099 1100
 			_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
1101
+
1100 1102
 			storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
1101 1103
 			if drugStockConfig.IsOpen == 1 {
1102 1104
 				for _, item := range advices {
@@ -1145,6 +1147,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
1145 1147
 					var prescribing_number_total int64
1146 1148
 
1147 1149
 					config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
1150
+
1148 1151
 					if config.IsOpen != 1 {
1149 1152
 						//查询该药品是否有库存
1150 1153
 						houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
@@ -1198,6 +1201,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
1198 1201
 
1199 1202
 						if prescribing_number_total <= total {
1200 1203
 							pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
1204
+
1201 1205
 							if medical.IsUse == 2 {
1202 1206
 
1203 1207
 								if config.IsOpen != 1 {

+ 3 - 0
service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go View File

@@ -217,6 +217,9 @@ type PrescriptionVM struct {
217 217
 	OxygenFlow                 string  `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
218 218
 	OxygenTime                 string  `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
219 219
 	DialysisRemark             string  `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
220
+	DialysisFluidFlow          string  `gorm:"column:dialysis_fluid_flow" json:"dialysis_fluid_flow" form:"dialysis_fluid_flow"`
221
+	SodiumBicarbonateFlow      string  `gorm:"column:sodium_bicarbonate_flow" json:"sodium_bicarbonate_flow" form:"sodium_bicarbonate_flow"`
222
+	DisplaceSpeed              string  `gorm:"column:displace_speed" json:"displace_speed" form:"displace_speed"`
220 223
 }
221 224
 
222 225
 func (PrescriptionVM) TableName() string {