Browse Source

11月8日库存管理

XMLWAN 2 years ago
parent
commit
ae0520af3a

+ 26 - 52
controllers/drug_pharmacy_management_controller.go View File

@@ -147,32 +147,19 @@ func (this *PharmacyApiController) UpdatePharmacyBaseDrug() {
147 147
 		for _, item := range adviceList {
148 148
 
149 149
 			pharmacy := models.Pharmacy{
150
-				UserOrgId:         item.UserOrgId,
151
-				PatientId:         item.PatientId,
152
-				HisPrescriptionId: 0,
153
-				XtAdviceId:        item.ID,
154
-				HisOrXt:           1,
155
-				Ctime:             time.Now().Unix(),
156
-				Mtime:             0,
157
-				Status:            1,
158
-				HisAdviceId:       0,
159
-				DrugId:            item.DrugId,
160
-				RecordDate:        item.AdviceDate,
161
-				OrdreNumber:       warehousing_out_order,
162
-				Creater:           admin_user_id,
163
-				UserOrgId:       item.UserOrgId,
164
-				PatientId:       item.PatientId,
165
-				HisAdviceInfoId: 0,
166
-				XtAdviceId:      item.ID,
167
-				HisOrXt:         1,
168
-				Ctime:           time.Now().Unix(),
169
-				Mtime:           0,
170
-				Status:          1,
171
-				HisAdviceId:     0,
172
-				DrugId:          item.DrugId,
173
-				RecordDate:      item.AdviceDate,
174
-				OrdreNumber:     warehousing_out_order,
175
-				Creater:         creater,
150
+				UserOrgId:      item.UserOrgId,
151
+				PatientId:      item.PatientId,
152
+				PrescriptionId: 0,
153
+				XtAdviceId:     item.ID,
154
+				HisOrXt:        1,
155
+				Ctime:          time.Now().Unix(),
156
+				Mtime:          0,
157
+				Status:         1,
158
+				HisAdviceId:    0,
159
+				DrugId:         item.DrugId,
160
+				RecordDate:     item.AdviceDate,
161
+				OrdreNumber:    warehousing_out_order,
162
+				Creater:        admin_user_id,
176 163
 			}
177 164
 
178 165
 			service.CreatePharmacy(pharmacy)
@@ -292,32 +279,19 @@ func (this *PharmacyApiController) UpdatePharmacyBaseDrug() {
292 279
 		for _, item := range hisAdviceList {
293 280
 
294 281
 			pharmacy := models.Pharmacy{
295
-				UserOrgId:         item.UserOrgId,
296
-				PatientId:         item.PatientId,
297
-				HisPrescriptionId: 0,
298
-				XtAdviceId:        0,
299
-				HisOrXt:           2,
300
-				Ctime:             time.Now().Unix(),
301
-				Mtime:             0,
302
-				Status:            1,
303
-				HisAdviceId:       item.ID,
304
-				DrugId:            item.DrugId,
305
-				RecordDate:        item.AdviceDate,
306
-				OrdreNumber:       warehousing_out_order,
307
-				Creater:           admin_user_id,
308
-				UserOrgId:       item.UserOrgId,
309
-				PatientId:       item.PatientId,
310
-				HisAdviceInfoId: 0,
311
-				XtAdviceId:      0,
312
-				HisOrXt:         2,
313
-				Ctime:           time.Now().Unix(),
314
-				Mtime:           0,
315
-				Status:          1,
316
-				HisAdviceId:     item.ID,
317
-				DrugId:          item.DrugId,
318
-				RecordDate:      item.AdviceDate,
319
-				OrdreNumber:     warehousing_out_order,
320
-				Creater:         creater,
282
+				UserOrgId:      item.UserOrgId,
283
+				PatientId:      item.PatientId,
284
+				PrescriptionId: 0,
285
+				XtAdviceId:     0,
286
+				HisOrXt:        2,
287
+				Ctime:          time.Now().Unix(),
288
+				Mtime:          0,
289
+				Status:         1,
290
+				HisAdviceId:    item.ID,
291
+				DrugId:         item.DrugId,
292
+				RecordDate:     item.AdviceDate,
293
+				OrdreNumber:    warehousing_out_order,
294
+				Creater:        admin_user_id,
321 295
 			}
322 296
 
323 297
 			service.CreatePharmacy(pharmacy)

+ 1 - 0
models/drug_pharmacy_management_models.go View File

@@ -229,6 +229,7 @@ type Pharmacy struct {
229 229
 	RecordDate      int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
230 230
 	OrdreNumber     string `gorm:"column:ordre_number" json:"ordre_number" form:"ordre_number"`
231 231
 	Creater         int64  `gorm:"column:creater" json:"creater" form:"creater"`
232
+	PrescriptionId  int64  `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
232 233
 }
233 234
 
234 235
 func (Pharmacy) TableName() string {