|
@@ -165,7 +165,7 @@ func (this *PharmacyController) IssuedDrug() {
|
165
|
165
|
etime = stime + 86399
|
166
|
166
|
}
|
167
|
167
|
|
168
|
|
- if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 {
|
|
168
|
+ if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 || orgid == 10387 {
|
169
|
169
|
|
170
|
170
|
//获取排班班次
|
171
|
171
|
schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
|
|
@@ -189,7 +189,7 @@ func (this *PharmacyController) IssuedDrug() {
|
189
|
189
|
})
|
190
|
190
|
}
|
191
|
191
|
|
192
|
|
- if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 {
|
|
192
|
+ if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 {
|
193
|
193
|
//查询表里当天的数据
|
194
|
194
|
var flist []*models.TmpPatient
|
195
|
195
|
flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
|
|
@@ -245,7 +245,7 @@ func (this *PharmacyController) WaitingDrug() {
|
245
|
245
|
etime = stime + 86399
|
246
|
246
|
}
|
247
|
247
|
|
248
|
|
- if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 {
|
|
248
|
+ if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 {
|
249
|
249
|
//查询表里当天的数据
|
250
|
250
|
var flist []*models.TmpPatient
|
251
|
251
|
flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
|
|
@@ -269,7 +269,7 @@ func (this *PharmacyController) WaitingDrug() {
|
269
|
269
|
}
|
270
|
270
|
|
271
|
271
|
//当天已发药的人数
|
272
|
|
- if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 {
|
|
272
|
+ if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10387 {
|
273
|
273
|
|
274
|
274
|
//获取排班班次
|
275
|
275
|
schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
|
|
@@ -368,35 +368,37 @@ func (this *PharmacyController) DispensingMedicine() {
|
368
|
368
|
var total int64
|
369
|
369
|
var prescribing_number_total int64
|
370
|
370
|
for _, item := range advicelist {
|
371
|
|
- houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
|
372
|
|
- //查询该药品是否有库存
|
373
|
|
- list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
|
374
|
|
-
|
375
|
371
|
//查询改药品信息
|
376
|
372
|
medical, _ := service.GetBaseDrugMedical(item.DrugId)
|
377
|
|
- //判断单位是否相等
|
378
|
|
- if medical.MaxUnit == item.PrescribingNumberUnit {
|
379
|
|
- prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
|
380
|
|
- count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
|
381
|
|
- //转化为最小单位
|
382
|
|
- total = list.Count*medical.MinNumber + list.StockMinNumber
|
383
|
|
- prescribing_number_total = count * medical.MinNumber
|
384
|
|
- }
|
385
|
|
- if medical.MinUnit == item.PrescribingNumberUnit {
|
386
|
|
- prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
|
387
|
|
- count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
|
388
|
|
- total = list.Count*medical.MinNumber + list.StockMinNumber
|
389
|
|
- prescribing_number_total = count
|
390
|
|
- }
|
|
373
|
+ if medical.IsPharmacy == 1 {
|
|
374
|
+ houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
|
|
375
|
+ //查询该药品是否有库存
|
|
376
|
+ list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
|
|
377
|
+
|
|
378
|
+ //判断单位是否相等
|
|
379
|
+ if medical.MaxUnit == item.PrescribingNumberUnit {
|
|
380
|
+ prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
|
|
381
|
+ count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
|
|
382
|
+ //转化为最小单位
|
|
383
|
+ total = list.Count*medical.MinNumber + list.StockMinNumber
|
|
384
|
+ prescribing_number_total = count * medical.MinNumber
|
|
385
|
+ }
|
|
386
|
+ if medical.MinUnit == item.PrescribingNumberUnit {
|
|
387
|
+ prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
|
|
388
|
+ count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
|
|
389
|
+ total = list.Count*medical.MinNumber + list.StockMinNumber
|
|
390
|
+ prescribing_number_total = count
|
|
391
|
+ }
|
391
|
392
|
|
392
|
|
- if medical.IsUse != 1 {
|
393
|
|
- //如果出库数量大于库存数量
|
394
|
|
- if prescribing_number_total > total {
|
395
|
|
- err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
|
396
|
|
- if err != nil {
|
397
|
|
- utils.ErrorLog(err.Error())
|
398
|
|
- this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
|
399
|
|
- return
|
|
393
|
+ if medical.IsUse != 1 {
|
|
394
|
+ //如果出库数量大于库存数量
|
|
395
|
+ if prescribing_number_total > total {
|
|
396
|
+ err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
|
|
397
|
+ if err != nil {
|
|
398
|
+ utils.ErrorLog(err.Error())
|
|
399
|
+ this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
|
|
400
|
+ return
|
|
401
|
+ }
|
400
|
402
|
}
|
401
|
403
|
}
|
402
|
404
|
}
|
|
@@ -405,11 +407,29 @@ func (this *PharmacyController) DispensingMedicine() {
|
405
|
407
|
}
|
406
|
408
|
|
407
|
409
|
err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
|
|
410
|
+
|
|
411
|
+ if orgid == 10387 || orgid == 3877 {
|
|
412
|
+ advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
|
|
413
|
+ if len(advicelist) > 0 {
|
|
414
|
+ for _, item := range advicelist {
|
|
415
|
+ //查询改药品信息
|
|
416
|
+ medical, _ := service.GetBaseDrugMedical(item.DrugId)
|
|
417
|
+ if medical.IsPharmacy == 1 {
|
|
418
|
+ flow, _ := service.GetFlow(item.DrugId, item.AdviceDate, orgid, item.PatientId)
|
|
419
|
+ if len(flow) > 0 {
|
|
420
|
+ service.UpdateAdviceFlow(item.ID)
|
|
421
|
+ }
|
|
422
|
+ }
|
|
423
|
+ }
|
|
424
|
+
|
|
425
|
+ }
|
|
426
|
+ }
|
408
|
427
|
if err != nil {
|
409
|
428
|
utils.ErrorLog(err.Error())
|
410
|
429
|
this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
|
411
|
430
|
return
|
412
|
431
|
}
|
|
432
|
+
|
413
|
433
|
this.ServeSuccessJSON(map[string]interface{}{
|
414
|
434
|
"list": "操作成功",
|
415
|
435
|
})
|