|
|
@@ -17,8 +17,8 @@ func GetPatientChartData(user_org_id int64, start_time int64, end_time int64, st
|
|
17
|
17
|
break
|
|
18
|
18
|
case 2:
|
|
19
|
19
|
//err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, weight_after as value from xt_assessment_after_dislysis Where status = 1 AND user_org_id = ? AND patient_id = ? AND assessment_date <= ? AND assessment_date >= ? ", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
|
|
20
|
|
- //err = db.Raw("select from_unixtime(lapseto_time,'%m-%d') as date, count(distinct patient_id) as value from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = 2 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ? Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
|
|
21
|
|
- err = db.Raw("select from_unixtime(created_time,'%m-%d') as date, count(distinct id) as value from xt_patients patient Where patient.user_org_id = ? AND patient.created_time >=? AND patient.created_time <=? AND patient.status = 1 AND patient.lapseto = 2 Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
|
|
|
20
|
+ err = db.Raw("select from_unixtime(lapseto_time,'%m-%d') as date, count(distinct patient_id) as value from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = 2 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ? Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
|
|
|
21
|
+ //err = db.Raw("select from_unixtime(updated_time,'%m-%d') as date, count(distinct id) as value from xt_patients patient Where patient.user_org_id = ? AND patient.updated_time >=? AND patient.updated_time <=? AND patient.status = 1 AND patient.lapseto = 2 Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
|
|
22
|
22
|
|
|
23
|
23
|
break
|
|
24
|
24
|
}
|
|
|
@@ -45,9 +45,18 @@ func GetPatientTableData(orgID int64, page, limit, start, end int64, statistics_
|
|
45
|
45
|
var err error
|
|
46
|
46
|
var patients []*PatientTableStruct
|
|
47
|
47
|
readDb := service.XTReadDB()
|
|
48
|
|
- //db := readDb.Raw("select from_unixtime(lapseto.`lapseto_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = ? AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ? ", orgID, statistics_type, start, end)
|
|
49
|
|
- db := readDb.Raw("select from_unixtime(patient.`created_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ? AND patient.created_time >= ? AND patient.created_time <= ? ", orgID, statistics_type, start, end)
|
|
50
|
|
- err = db.Order("patient.created_time desc").Scan(&patients).Error
|
|
|
48
|
+ if statistics_type == 1 {
|
|
|
49
|
+ db := readDb.Raw("select from_unixtime(patient.`created_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ? AND patient.created_time >= ? AND patient.created_time <= ? ", orgID, statistics_type, start, end)
|
|
|
50
|
+ err = db.Order("patient.created_time desc").Scan(&patients).Error
|
|
|
51
|
+
|
|
|
52
|
+ } else {
|
|
|
53
|
+
|
|
|
54
|
+ db := readDb.Raw("select from_unixtime(lapseto.`lapseto_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = ? AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ? ", orgID, statistics_type, start, end)
|
|
|
55
|
+ //db := readDb.Raw("select from_unixtime(patient.`updated_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ? AND patient.updated_time >= ? AND patient.updated_time <= ? ", orgID, statistics_type, start, end)
|
|
|
56
|
+ err = db.Group("lapseto.`patient_id`").Order("lapseto.lapseto_time desc").Scan(&patients).Error
|
|
|
57
|
+
|
|
|
58
|
+ }
|
|
|
59
|
+
|
|
51
|
60
|
return patients, total, err
|
|
52
|
61
|
}
|
|
53
|
62
|
|
csx