|
@@ -504,6 +504,41 @@ func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int
|
504
|
504
|
|
505
|
505
|
}
|
506
|
506
|
|
|
507
|
+func GetNewDoctorAdviceOne(patientID int64, page int64, orgID int64) (doctoradvice []*models.DoctorAdvice, total int64, date int64, err error) {
|
|
508
|
+
|
|
509
|
+ var advicesCount models.UserDoctorAdvicesCount
|
|
510
|
+
|
|
511
|
+ err = XTReadDB().Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and status =1", patientID, orgID).Select("count(distinct record_date) as count,patient_id").Scan(&advicesCount).Error
|
|
512
|
+
|
|
513
|
+ if err != nil {
|
|
514
|
+ return
|
|
515
|
+ }
|
|
516
|
+ total = advicesCount.Count
|
|
517
|
+ if total == 0 || page > total {
|
|
518
|
+ return
|
|
519
|
+ }
|
|
520
|
+
|
|
521
|
+ var Id models.AdviceDate
|
|
522
|
+
|
|
523
|
+ err = XTReadDB().Model(models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Select("record_date").Group("record_date").Order("created_time desc").Offset(page - 1).Limit(10).Scan(&Id).Error
|
|
524
|
+ if err != nil {
|
|
525
|
+ return
|
|
526
|
+ }
|
|
527
|
+
|
|
528
|
+ if Id.RecordDate == 0 {
|
|
529
|
+ return
|
|
530
|
+ }
|
|
531
|
+
|
|
532
|
+ date = Id.RecordDate
|
|
533
|
+ fmt.Println("结构是==============", Id.RecordDate)
|
|
534
|
+ doctoradvice, err = GetAdvices(orgID, patientID, Id.RecordDate)
|
|
535
|
+ if err != nil {
|
|
536
|
+ return
|
|
537
|
+ }
|
|
538
|
+ return
|
|
539
|
+
|
|
540
|
+}
|
|
541
|
+
|
507
|
542
|
func GetDryWeight(patientid int64, startime int64, endtime int64, limit int64, page int64, orgId int64) (dryWeight []*models.XtPatientDryweight, total int64, err error) {
|
508
|
543
|
db := XTReadDB().Table("xt_patient_dryweight as x").Where("x.status = 1")
|
509
|
544
|
if orgId > 0 {
|
|
@@ -871,6 +906,12 @@ func DeleteChild(id int64) error {
|
871
|
906
|
return err
|
872
|
907
|
}
|
873
|
908
|
|
|
909
|
+func DeletePatient(id int64) error {
|
|
910
|
+
|
|
911
|
+ err = XTWriteDB().Model(models.DoctorAdvice{}).Where("id=? and parent_id = ?", id, id).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
|
|
912
|
+ return err
|
|
913
|
+}
|
|
914
|
+
|
874
|
915
|
func GetNewPatient(id int64) (models.XtPatientsNew, error) {
|
875
|
916
|
patientsNew := models.XtPatientsNew{}
|
876
|
917
|
err := XTReadDB().Model(&patientsNew).Where("id=?", id).Find(&patientsNew).Error
|
|
@@ -1014,14 +1055,16 @@ func CreatedZone(zone *models.DeviceZone) error {
|
1014
|
1055
|
return err
|
1015
|
1056
|
}
|
1016
|
1057
|
|
1017
|
|
-func GetAllZone(orgid int64, page int64, limit int64) (zone []*models.DeviceZone, total int64, err error) {
|
|
1058
|
+func GetAllZone(orgid int64, page int64, limit int64) (zone []*models.DeviceZones, total int64, err error) {
|
1018
|
1059
|
|
1019
|
1060
|
db := XTReadDB().Table("xt_device_zone as x").Where("x.status =1")
|
|
1061
|
+ table := XTReadDB().Table("xt_device_number as n")
|
|
1062
|
+ fmt.Println("table", table)
|
1020
|
1063
|
if orgid > 0 {
|
1021
|
1064
|
db = db.Where("x.org_id = ?", orgid)
|
1022
|
1065
|
}
|
1023
|
1066
|
offset := (page - 1) * limit
|
1024
|
|
- err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Select("x.id,x.org_id,x.name,x.type").Find(&zone).Error
|
|
1067
|
+ err = db.Group("x.id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Select("x.id,x.org_id,x.name,x.type,n.number").Joins("left join xt_device_number as n on n.zone_id = x.id").Scan(&zone).Error
|
1025
|
1068
|
return zone, total, err
|
1026
|
1069
|
}
|
1027
|
1070
|
|
|
@@ -1036,13 +1079,15 @@ func SaveGroup(group *models.DeviceGroup) error {
|
1036
|
1079
|
return err
|
1037
|
1080
|
}
|
1038
|
1081
|
|
1039
|
|
-func GetAllGroup(orgid int64, page int64, limit int64) (group []*models.DeviceGroup, total int64, err error) {
|
|
1082
|
+func GetAllGroup(orgid int64, page int64, limit int64) (group []*models.DeviceGroups, total int64, err error) {
|
1040
|
1083
|
db := XTReadDB().Table("xt_device_group as x").Where("x.status = 1")
|
|
1084
|
+ table := XTReadDB().Table("xt_device_number as n")
|
|
1085
|
+ fmt.Println("table", table)
|
1041
|
1086
|
if orgid > 0 {
|
1042
|
1087
|
db = db.Where("x.org_id = ?", orgid)
|
1043
|
1088
|
}
|
1044
|
1089
|
offset := (page - 1) * limit
|
1045
|
|
- err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Select("x.id,x.org_id,x.name,x.status,x.ctime,x.mtime").Find(&group).Error
|
|
1090
|
+ err = db.Group("x.id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Select("x.id,x.org_id,x.name,x.status,x.ctime,x.mtime,n.number").Joins("left join xt_device_number as n on n.group_id = x.id").Scan(&group).Error
|
1046
|
1091
|
return group, total, err
|
1047
|
1092
|
}
|
1048
|
1093
|
|
|
@@ -1103,3 +1148,25 @@ func GetBloodPatient(orgid int64) (patients []*models.XtPatientsNew, err error)
|
1103
|
1148
|
err = XTReadDB().Model(&patients).Where("user_org_id = ? AND blood_patients = ? AND status = 1", orgid, 1).Find(&patients).Error
|
1104
|
1149
|
return patients, err
|
1105
|
1150
|
}
|
|
1151
|
+
|
|
1152
|
+func SaveName(id int64, role *models.SgjUserAdminRole) error {
|
|
1153
|
+
|
|
1154
|
+ err = UserWriteDB().Model(models.SgjUserAdminRole{}).Where("id=?", id).Update(map[string]interface{}{"user_name": role.UserName, "mtime": time.Now().Unix()}).Error
|
|
1155
|
+ return err
|
|
1156
|
+}
|
|
1157
|
+
|
|
1158
|
+func GetAdminUserId(id int64) (models.SgjUserAdminRole, error) {
|
|
1159
|
+
|
|
1160
|
+ role := models.SgjUserAdminRole{}
|
|
1161
|
+ err := UserReadDB().Where("id=? and status =1", id).Find(&role).Error
|
|
1162
|
+ return role, err
|
|
1163
|
+}
|
|
1164
|
+
|
|
1165
|
+func GetMyOrganaziton(id int64) (org []*models.SgjUserOrg, err error) {
|
|
1166
|
+
|
|
1167
|
+ db := UserReadDB().Table("sgj_user_org as x").Where("x.status = 1")
|
|
1168
|
+ table := UserReadDB().Table("sgj_user_admin as a")
|
|
1169
|
+ fmt.Println("table", table)
|
|
1170
|
+ err = db.Select("x.id,x.creator,x.org_name,x.org_short_name,x.org_logo,x.org_introduction,x.illness,x.province,x.city,x.district,x.address,x.longitude,x.latitude,x.org_type,x.comments,x.evaluate,x.gallery,x.business_week,x.business_time,x.contact_name,x.telephone,x.claim,x.operating_state,x.source,x.ttype,x.ttid,x.tuid,x.reason,x.level,x.website,x.import,x.sortno,a.is_super_admin").Joins("left join sgj_user_admin as a on a.id = x.creator").Where("x.creator = ?", id).Scan(&org).Error
|
|
1171
|
+ return org, err
|
|
1172
|
+}
|