|
@@ -1375,7 +1375,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
1375
|
1375
|
|
1376
|
1376
|
if medical.IsUse != 1 {
|
1377
|
1377
|
if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
|
1378
|
|
- if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
|
|
1378
|
+ if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && advice.UserOrgId != 10724 && advice.UserOrgId != 10571 && advice.UserOrgId != 10731 {
|
1379
|
1379
|
service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
|
1380
|
1380
|
advice.ExecutionTime = 0
|
1381
|
1381
|
advice.ExecutionState = 2
|
|
@@ -1391,7 +1391,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
1391
|
1391
|
|
1392
|
1392
|
}
|
1393
|
1393
|
if prescribing_number_total > total {
|
1394
|
|
- if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
|
|
1394
|
+ if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && advice.UserOrgId != 10724 && advice.UserOrgId != 10571 && advice.UserOrgId != 10731 {
|
1395
|
1395
|
service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
|
1396
|
1396
|
advice.ExecutionTime = 0
|
1397
|
1397
|
advice.ExecutionState = 2
|
|
@@ -1418,7 +1418,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
1418
|
1418
|
//查询今日是否出库
|
1419
|
1419
|
drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
|
1420
|
1420
|
if drugOutInfo.ID == 0 {
|
1421
|
|
- if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
|
|
1421
|
+ if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
|
1422
|
1422
|
service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
|
1423
|
1423
|
}
|
1424
|
1424
|
|
|
@@ -1428,7 +1428,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
1428
|
1428
|
if pharmacyConfig.IsOpen != 1 {
|
1429
|
1429
|
drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
|
1430
|
1430
|
if drugOutInfo.ID == 0 {
|
1431
|
|
- if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
|
|
1431
|
+ if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
|
1432
|
1432
|
service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
|
1433
|
1433
|
}
|
1434
|
1434
|
|
|
@@ -1455,7 +1455,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
1455
|
1455
|
if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
|
1456
|
1456
|
drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
|
1457
|
1457
|
if drugOutInfo.ID == 0 {
|
1458
|
|
- if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
|
|
1458
|
+ if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
|
1459
|
1459
|
service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
|
1460
|
1460
|
}
|
1461
|
1461
|
|
|
@@ -1479,7 +1479,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
1479
|
1479
|
service.CreateDrugError(drugError)
|
1480
|
1480
|
drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
|
1481
|
1481
|
if drugOutInfo.ID == 0 {
|
1482
|
|
- if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
|
|
1482
|
+ if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
|
1483
|
1483
|
service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
|
1484
|
1484
|
}
|
1485
|
1485
|
|
|
@@ -1558,7 +1558,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
1558
|
1558
|
}
|
1559
|
1559
|
if medical.IsUse != 1 {
|
1560
|
1560
|
if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
|
1561
|
|
- if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
|
|
1561
|
+ if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
|
1562
|
1562
|
service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
|
1563
|
1563
|
advice.ExecutionTime = 0
|
1564
|
1564
|
advice.ExecutionState = 2
|
|
@@ -1572,7 +1572,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
1572
|
1572
|
return
|
1573
|
1573
|
}
|
1574
|
1574
|
if prescribing_number_total > total {
|
1575
|
|
- if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
|
|
1575
|
+ if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
|
1576
|
1576
|
service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
|
1577
|
1577
|
advice.ExecutionTime = 0
|
1578
|
1578
|
advice.ExecutionState = 2
|
|
@@ -1591,7 +1591,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
1591
|
1591
|
//查询今日是否出库
|
1592
|
1592
|
drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
|
1593
|
1593
|
if drugOutInfo.ID == 0 {
|
1594
|
|
- if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
|
|
1594
|
+ if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
|
1595
|
1595
|
service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
|
1596
|
1596
|
}
|
1597
|
1597
|
|
|
@@ -1601,7 +1601,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
1601
|
1601
|
//查询今日是否出库
|
1602
|
1602
|
drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
|
1603
|
1603
|
if drugOutInfo.ID == 0 {
|
1604
|
|
- if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
|
|
1604
|
+ if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
|
1605
|
1605
|
service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
|
1606
|
1606
|
}
|
1607
|
1607
|
|