|
|
@@ -103,7 +103,7 @@ func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, e
|
|
103
|
103
|
|
|
104
|
104
|
db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1", orgID)
|
|
105
|
105
|
|
|
106
|
|
- err = db.Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").Count(&total).Find(&patients).Error
|
|
|
106
|
+ err = db.Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.age,p.id_card_no").Count(&total).Find(&patients).Error
|
|
107
|
107
|
return
|
|
108
|
108
|
}
|
|
109
|
109
|
|
|
|
@@ -1535,6 +1535,7 @@ func GetPatientDialysisRecord(orgID, patientID int64, page, limit, start, end, m
|
|
1535
|
1535
|
|
|
1536
|
1536
|
|
|
1537
|
1537
|
db := readDb.Table("xt_dialysis_order as do").
|
|
|
1538
|
+ Preload("DoctorAdvice", "patient_id =? and user_org_id = ? and status =1", patientID, orgID).
|
|
1538
|
1539
|
Preload("DialysisPrescription", "patient_id=? and user_org_id=? and status=1", patientID, orgID).
|
|
1539
|
1540
|
Preload("PredialysisEvaluation", "patient_id=? and user_org_id=? and status=1", patientID, orgID).
|
|
1540
|
1541
|
Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {
|
|
|
@@ -1563,7 +1564,7 @@ func GetPatientDialysisRecord(orgID, patientID int64, page, limit, start, end, m
|
|
1563
|
1564
|
db = db.Where("dp.mode_id=?", mode_id)
|
|
1564
|
1565
|
}
|
|
1565
|
1566
|
|
|
1566
|
|
- err = db.Count(&total).Offset(offset).Limit(limit).Order("do.dialysis_date desc").Select("do.bed_id, do.id, do.dialysis_date, do.user_org_id, do.patient_id, do.prescription_id, do.stage, do.remark, do.status, do.created_time, do.updated_time,do.start_nurse,do.finish_nurse ,s.schedule_type, s.partition_id, dz.name as partition_name").Find(&orders).Error
|
|
|
1567
|
+ err = db.Count(&total).Offset(offset).Limit(limit).Order("do.dialysis_date desc").Select("do.bed_id, do.id, do.dialysis_date, do.user_org_id, do.patient_id, do.prescription_id, do.stage, do.remark, do.status, do.created_time, do.updated_time,do.start_nurse,do.finish_nurse ,do.start_time,do.end_time,do.url,s.schedule_type, s.partition_id, dz.name as partition_name").Find(&orders).Error
|
|
1567
|
1568
|
|
|
1568
|
1569
|
if len(orders) > 0 {
|
|
1569
|
1570
|
ids := make([]int64, 0)
|
28169