|
|
@@ -12,12 +12,13 @@ func GetPatientChartData(user_org_id int64, start_time int64, end_time int64, st
|
|
12
|
12
|
db := service.XTReadDB()
|
|
13
|
13
|
switch statistics_type {
|
|
14
|
14
|
case 1:
|
|
15
|
|
- 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 = 1 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ? Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
|
|
|
15
|
+ 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 = 1 Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
|
|
16
|
16
|
|
|
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
|
|
|
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
|
|
21
|
22
|
|
|
22
|
23
|
break
|
|
23
|
24
|
}
|
|
|
@@ -44,14 +45,16 @@ func GetPatientTableData(orgID int64, page, limit, start, end int64, statistics_
|
|
44
|
45
|
var err error
|
|
45
|
46
|
var patients []*PatientTableStruct
|
|
46
|
47
|
readDb := service.XTReadDB()
|
|
47
|
|
- 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)
|
|
48
|
|
- err = db.Order("lapseto.lapseto_time desc").Scan(&patients).Error
|
|
49
|
|
- //.Offset(offset).Limit(limit)
|
|
|
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
|
|
50
|
51
|
return patients, total, err
|
|
51
|
52
|
}
|
|
52
|
53
|
|
|
53
|
54
|
func GetLapsetoPatientTotal(orgID int64, statistics_type int) (Total int64, err error) {
|
|
54
|
55
|
readDb := service.XTReadDB()
|
|
55
|
|
- err = readDb.Raw("select count(*) as total 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 =?", orgID, statistics_type).Count(&Total).Error
|
|
|
56
|
+ //err = readDb.Raw("select count(*) as total 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 =?", orgID, statistics_type).Count(&Total).Error
|
|
|
57
|
+ err = readDb.Raw("select count(*) as total from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ?", orgID, statistics_type).Count(&Total).Error
|
|
|
58
|
+
|
|
56
|
59
|
return Total, err
|
|
57
|
60
|
}
|
XMLWAN