|
@@ -304,8 +304,8 @@ func GetHospitalMonthHisPrescription(org_id int64, patient_id int64, start_time
|
304
|
304
|
return
|
305
|
305
|
}
|
306
|
306
|
|
307
|
|
-func GetSettleHisHospitalPrescription(org_id int64, patient_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
|
308
|
|
- err = readDb.Model(&models.HisPrescription{}).
|
|
307
|
+func GetSettleHisHospitalPrescription(org_id int64, patient_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisHospitalPrescription, err error) {
|
|
308
|
+ err = readDb.Model(&models.HisHospitalPrescription{}).
|
309
|
309
|
Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
|
310
|
310
|
return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
|
311
|
311
|
}).
|
|
@@ -320,17 +320,23 @@ func GetSettleHisHospitalPrescription(org_id int64, patient_id int64, his_patien
|
320
|
320
|
return
|
321
|
321
|
}
|
322
|
322
|
|
323
|
|
-func GetHisHospitalUnUploadPrescriptionDetailPatientList(org_id int64, record_date int64) (patients []*models.HisHospitalCheckRecord, err error) {
|
|
323
|
+func GetHisHospitalUnUploadPrescriptionDetailPatientList(org_id int64, record_date int64, sch_type int64) (patients []*models.HisHospitalCheckRecord, err error) {
|
324
|
324
|
db := readDb.Model(&models.HisHospitalCheckRecord{})
|
325
|
|
- db = db.Joins("inner join his_prescription pre On pre.patient_id = his_hospital_check_record.patient_id and pre.record_date = ? AND pre.p_type = 1 AND pre.user_org_id = ? AND pre.order_status <> 4 AND pre.order_status <> 2", record_date, org_id)
|
|
325
|
+ db = db.Joins("inner join his_prescription pre On pre.patient_id = his_hospital_check_record.patient_id and pre.record_date = ? AND pre.p_type = 1 AND pre.user_org_id = ? AND pre.status = 1 AND pre.order_status <> 4 AND pre.order_status <> 2", record_date, org_id)
|
|
326
|
+ if sch_type > 0 {
|
|
327
|
+ db = db.Joins("join xt_schedule as sch ON sch.patient_id = his_hospital_check_record.patient_id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ? AND sch.schedule_type = ? ", org_id, record_date, sch_type)
|
|
328
|
+ }
|
326
|
329
|
db = db.Where("his_hospital_check_record.user_org_id = ? AND his_hospital_check_record.status = 1 AND his_hospital_check_record.in_hospital_status = 1 AND his_hospital_check_record.out_hospital_status = 0", org_id)
|
327
|
330
|
err = db.Group("number").Find(&patients).Error
|
328
|
331
|
return
|
329
|
332
|
}
|
330
|
333
|
|
331
|
|
-func GetHisHospitalUploadPrescriptionDetailPatientList(org_id int64, record_date int64) (patients []*models.HisHospitalCheckRecord, err error) {
|
|
334
|
+func GetHisHospitalUploadPrescriptionDetailPatientList(org_id int64, record_date int64, sch_type int64) (patients []*models.HisHospitalCheckRecord, err error) {
|
332
|
335
|
db := readDb.Model(&models.HisHospitalCheckRecord{})
|
333
|
|
- db = db.Joins("inner join his_prescription pre On pre.patient_id = his_hospital_check_record.patient_id and pre.record_date = ? AND pre.p_type = 1 AND pre.user_org_id = ? AND pre.order_status = 4", record_date, org_id)
|
|
336
|
+ db = db.Joins("inner join his_prescription pre On pre.patient_id = his_hospital_check_record.patient_id and pre.record_date = ? AND pre.p_type = 1 AND pre.user_org_id = ? AND pre.order_status = 4 AND pre.status = 1 ", record_date, org_id)
|
|
337
|
+ if sch_type > 0 {
|
|
338
|
+ db = db.Joins("join xt_schedule as sch ON sch.patient_id = his_hospital_check_record.patient_id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ? AND sch.schedule_type = ? ", org_id, record_date, sch_type)
|
|
339
|
+ }
|
334
|
340
|
db = db.Where("his_hospital_check_record.user_org_id = ? AND his_hospital_check_record.status = 1 AND his_hospital_check_record.in_hospital_status = 1 AND his_hospital_check_record.out_hospital_status = 0", org_id)
|
335
|
341
|
err = db.Group("number").Find(&patients).Error
|
336
|
342
|
return
|
|
@@ -416,8 +422,8 @@ func GetAllMonthHisHospitalPrescription(org_id int64, patient_id int64, start_ti
|
416
|
422
|
return
|
417
|
423
|
}
|
418
|
424
|
|
419
|
|
-func GetSettleHisHospitalPrescriptionTwo(org_id int64, patient_id int64, number string) (prescription []*models.HisPrescription, err error) {
|
420
|
|
- err = readDb.Model(&models.HisPrescription{}).
|
|
425
|
+func GetSettleHisHospitalPrescriptionTwo(org_id int64, patient_id int64, number string) (prescription []*models.HisHospitalPrescription, err error) {
|
|
426
|
+ err = readDb.Model(&models.HisHospitalPrescription{}).
|
421
|
427
|
Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
|
422
|
428
|
return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
|
423
|
429
|
}).
|
|
@@ -474,3 +480,35 @@ func GetHisOrderInfoByNumberFour(order_number string) (order []*models.HisOrderI
|
474
|
480
|
err = db.Where("order_number = ? AND status = 1", order_number).Find(&order).Error
|
475
|
481
|
return
|
476
|
482
|
}
|
|
483
|
+
|
|
484
|
+func GetNewChargeHisHospitalPrescriptionFive(org_id int64, patient_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisHospitalPrescription, err error) {
|
|
485
|
+ err = readDb.Model(&models.HisHospitalPrescription{}).
|
|
486
|
+ Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
|
|
487
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
|
|
488
|
+ }).
|
|
489
|
+ Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
|
|
490
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
|
|
491
|
+ }).
|
|
492
|
+ Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
|
|
493
|
+ 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")
|
|
494
|
+ }).
|
|
495
|
+ Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status = 2 ", org_id, record_date, patient_id).
|
|
496
|
+ Find(&prescription).Error
|
|
497
|
+ return
|
|
498
|
+}
|
|
499
|
+
|
|
500
|
+func GetNewUnChargeHisHospitalPrescriptionFive(org_id int64, patient_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisHospitalPrescription, err error) {
|
|
501
|
+ err = readDb.Model(&models.HisHospitalPrescription{}).
|
|
502
|
+ Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
|
|
503
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
|
|
504
|
+ }).
|
|
505
|
+ Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
|
|
506
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
|
|
507
|
+ }).
|
|
508
|
+ Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
|
|
509
|
+ 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")
|
|
510
|
+ }).
|
|
511
|
+ Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3", org_id, record_date, patient_id).
|
|
512
|
+ Find(&prescription).Error
|
|
513
|
+ return
|
|
514
|
+}
|