|
@@ -446,7 +446,7 @@ func GetNewHisPrescription(org_id int64, patient_id int64, his_patient_id int64,
|
446
|
446
|
return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
|
447
|
447
|
}).
|
448
|
448
|
Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
|
449
|
|
- return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
|
|
449
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
|
450
|
450
|
}).
|
451
|
451
|
Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND his_patient_id = ? AND p_type = ? ", org_id, record_date, patient_id, his_patient_id, p_type).
|
452
|
452
|
Find(&prescription).Error
|
|
@@ -478,7 +478,7 @@ func GetUnChargeHisPrescriptionFive(org_id int64, patient_id int64, his_patient_
|
478
|
478
|
return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
|
479
|
479
|
}).
|
480
|
480
|
Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
|
481
|
|
- return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
|
|
481
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
|
482
|
482
|
}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
|
483
|
483
|
return db.Where("status = 1 AND user_org_id = ? AND order_status <> 3 AND order_status <> 2 ", org_id)
|
484
|
484
|
}).
|
|
@@ -496,7 +496,7 @@ func GetSettleHisPrescription(org_id int64, patient_id int64, his_patient_id int
|
496
|
496
|
return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
|
497
|
497
|
}).
|
498
|
498
|
Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
|
499
|
|
- return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
|
|
499
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
|
500
|
500
|
}).
|
501
|
501
|
Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND his_patient_id = ? AND p_type <> 1 AND med_type = ?", org_id, record_date, patient_id, his_patient_id, med_type).
|
502
|
502
|
Find(&prescription).Error
|
|
@@ -512,7 +512,7 @@ func GetMonthHisPrescription(org_id int64, patient_id int64, start_date int64, e
|
512
|
512
|
return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
|
513
|
513
|
}).
|
514
|
514
|
Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
|
515
|
|
- return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
|
|
515
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
|
516
|
516
|
}).
|
517
|
517
|
Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND p_type <> 1 AND med_type = ?", org_id, start_date, end_date, patient_id, med_type).
|
518
|
518
|
Find(&prescription).Error
|
|
@@ -528,7 +528,7 @@ func GetMonthHisPrescriptionTwo(org_id int64, patient_id int64, start_date int64
|
528
|
528
|
return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
|
529
|
529
|
}).
|
530
|
530
|
Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
|
531
|
|
- return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
|
|
531
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
|
532
|
532
|
}).
|
533
|
533
|
Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND p_type = ?", org_id, start_date, end_date, patient_id, p_type).
|
534
|
534
|
Find(&prescription).Error
|
|
@@ -544,7 +544,7 @@ func GetMonthHisPrescriptionThree(org_id int64, patient_id int64, start_date int
|
544
|
544
|
return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
|
545
|
545
|
}).
|
546
|
546
|
Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
|
547
|
|
- return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
|
|
547
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
|
548
|
548
|
}).
|
549
|
549
|
Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND p_type = ? ", org_id, start_date, end_date, patient_id, p_type).
|
550
|
550
|
Find(&prescription).Error
|
|
@@ -561,7 +561,7 @@ func GetUnChargeMonthHisPrescriptionThree(org_id int64, patient_id int64, start_
|
561
|
561
|
return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
|
562
|
562
|
}).
|
563
|
563
|
Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
|
564
|
|
- return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
|
|
564
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
|
565
|
565
|
}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
|
566
|
566
|
return db.Where("status = 1 AND user_org_id = ?", org_id)
|
567
|
567
|
}).
|
|
@@ -580,7 +580,7 @@ func GetChargeMonthHisPrescriptionFour(org_id int64, patient_id int64, start_dat
|
580
|
580
|
return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
|
581
|
581
|
}).
|
582
|
582
|
Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
|
583
|
|
- return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
|
|
583
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
|
584
|
584
|
}).
|
585
|
585
|
Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status = 2 AND p_type = ?", org_id, start_date, end_date, patient_id, p_type).
|
586
|
586
|
Find(&prescription).Error
|
|
@@ -1026,7 +1026,7 @@ func GetHisPrescriptionFour(org_id int64, patient_id int64, record_date int64, n
|
1026
|
1026
|
err = readDb.Model(&models.HisPrescription{}).
|
1027
|
1027
|
Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
|
1028
|
1028
|
Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
|
1029
|
|
- return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
|
|
1029
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
|
1030
|
1030
|
}).
|
1031
|
1031
|
Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND prescription_number=?", org_id, record_date, patient_id, number).
|
1032
|
1032
|
Find(&prescription).Error
|
|
@@ -1769,7 +1769,7 @@ type CustomAccountFormData struct {
|
1769
|
1769
|
}
|
1770
|
1770
|
|
1771
|
1771
|
func GetCheckAccountFormData(start_time int64, end_time int64, org_id int64, insutype string) (cus []*CustomAccountFormData, err error) {
|
1772
|
|
- err = readDb.Raw("select o.setl_detail as setl_detail, o.maf_pay as maf_pay, o.hifmi_pay as hifmi_pay, o.hifob_pay as hifob_pay, o.cvlserv_pay as cvlserv_pay, o.hifes_pay as hifes_pay, o.patient_id as patient_id, p.diagnosis as diagnosis_id, p.iinfo as iinfo, o.medfee_sumamt as medfee_sumamt ,o.psn_name as psn_name ,p.id_card_no as id_card_no ,o.psn_no as psn_no, o.mdtrt_id as mdtrt_id, o.settle_accounts_date as settle_accounts_date,o.act_pay_dedc as act_pay_dedc,O.fund_pay_sumamt as fund_pay_sumamt,o.psn_cash_pay as psn_cash_pay ,o.acct_pay as acct_pay,o.psn_cash_pay as cash_pay,o.medfee_sumamt as sumamt from his_order o Join his_patient p On o.patient_id = p.patient_id AND o.settle_accounts_date = p.record_date where o.user_org_id = ? AND o.status = 1 AND o.order_status = 2 AND o.settle_accounts_date >= ? AND o.settle_accounts_date <= ? AND insutype = ? Group by o.id", org_id, start_time, end_time, insutype).Scan(&cus).Error
|
|
1772
|
+ err = readDb.Raw("select o.setl_detail as setl_detail, o.maf_pay as maf_pay, o.hifmi_pay as hifmi_pay, o.hifob_pay as hifob_pay, o.cvlserv_pay as cvlserv_pay, o.hifes_pay as hifes_pay, o.patient_id as patient_id, p.diagnosis as diagnosis_id, p.iinfo as iinfo, o.medfee_sumamt as medfee_sumamt ,o.psn_name as psn_name ,p.id_card_no as id_card_no ,o.psn_no as psn_no, o.mdtrt_id as mdtrt_id, o.settle_accounts_date as settle_accounts_date,o.act_pay_dedc as act_pay_dedc,O.fund_pay_sumamt as fund_pay_sumamt,o.psn_cash_pay as psn_cash_pay ,o.acct_pay as acct_pay,o.psn_cash_pay as cash_pay,o.medfee_sumamt as sumamt from his_order o Join his_patient p On o.patient_id = p.patient_id AND o.settle_accounts_date = p.record_date where o.user_org_id = ? AND o.status = 1 AND o.order_status = 2 AND o.settle_accounts_date >= ? AND o.settle_accounts_date <= ? AND o.insutype = ? Group by o.id", org_id, start_time, end_time, insutype).Scan(&cus).Error
|
1773
|
1773
|
|
1774
|
1774
|
for _, item := range cus {
|
1775
|
1775
|
var total int64
|