1

service/xcx_mobile_api_service.go

@@ -9,7 +9,6 @@ import (
 	"errors"
 	"fmt"
 	"github.com/jinzhu/gorm"
-	"net/http"
 	"time"
 )
 
@@ -131,8 +130,8 @@ func GetWeekDayOfWeek() (weekMonday string) {
 func GetMobilePatient(mobile string, idcard string) (*models.XcxPatients, error) {
 
 	patient := models.XcxPatients{}
-	err := XTReadDB().Model(&patient).Where("(phone = ? or relative_phone =?) and id_card_no = ?", mobile, mobile, idcard).Find(&patient).Error
-
+	err := XTReadDB().Model(&patient).Where("(phone = ? or relative_phone =？) and id_card_no =?", mobile, mobile, idcard).Find(&patient).Error
+	//err := XTReadDB().Model(&patient).Where("id_card_no = ? and status = 1", mobile).Find(&patient).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -154,7 +153,7 @@ func GetTemplateMode(orgid int64) (models.XcxGobalTemplate, error) {
 func GetMobilePatientOne(mobile string) (*models.XcxAdminUserRole, error) {
 
 	patient := models.XcxAdminUserRole{}
-	err := UserReadDB().Model(&patient).Where("mobile = ? and status = 1", mobile).Find(&patient).Error
+	err := XTReadDB().Model(&patient).Where("mobile = ? and status = 1", mobile).Find(&patient).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -573,101 +572,3 @@ func GetDataConfig(orgid int64) (list []*models.XcxDataConfig, err error) {
 	err = XTReadDB().Model(&list).Where("(org_id = ? or org_id = 0) and status = 1", orgid).Find(&list).Error
 	return list, err
 }
-
-func GetLastScheduleListOne(patient_id int64, schedule_date int64) (models.XcxSchedule, error) {
-
-	schedule := models.XcxSchedule{}
-	err := XTReadDB().Model(&schedule).Where("patient_id = ? and status = 1 and schedule_date <=?", patient_id, schedule_date).Order("schedule_date desc").Last(&schedule).Error
-	return schedule, err
-}
-
-func GetInspectionGroupList(patientid int64, startime int64, endtime int64) (inspection []*models.XcxInspection, err error) {
-
-	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
-	if patientid > 0 {
-		db = db.Where("x.patient_id = ?", patientid)
-	}
-	if startime > 0 {
-		db = db.Where("x.inspect_date >= ?", startime)
-	}
-	if endtime > 0 {
-		db = db.Where("x.inspect_date <= ?", endtime)
-	}
-	err = db.Group("x.inspect_date,x.project_id").Find(&inspection).Error
-	return inspection, err
-}
-
-func GetInsepctionList(patientid int64, startime int64, endtime int64) (inspection []*models.XcxInspection, err error) {
-	db := XTReadDB().Table("xt_inspection as x").Where("x.status =1")
-	table := XTReadDB().Table("xt_inspection_reference as r")
-	fmt.Print("table", table)
-	if patientid > 0 {
-		db = db.Where("x.patient_id = ?", patientid)
-	}
-	if startime > 0 {
-		db = db.Where("x.inspect_date >= ?", startime)
-	}
-	if endtime > 0 {
-		db = db.Where("x.inspect_date <= ?", endtime)
-	}
-	err = db.Group("x.id").Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on (r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0)   ").Scan(&inspection).Error
-	return inspection, err
-}
-
-func GetArticList(activityID int64, page int64, limit int64) (story []*models.SybStory, total int64, err error) {
-
-	offset := (page - 1) * limit
-	err = UserReadDB().Model(&story).Where("activity_id = ? and  audit_status = 2", activityID).Count(&total).Order("ctime desc").Offset(offset).Limit(limit).Find(&story).Error
-	return story, total, err
-}
-
-func GetArticListDetail(id int64) (models.SybStory, error) {
-
-	story := models.SybStory{}
-	err := UserReadDB().Where("id = ?", id).Find(&story).Error
-	return story, err
-}
-
-func GetStoryScoreList(activityID int64, page int64, limit int64) (score []*models.SybStoryScore, total int64, err error) {
-	offset := (page - 1) * limit
-	err = UserReadDB().Model(&score).Where("activity_id = ?", activityID).Count(&total).Offset(offset).Limit(limit).Preload("SybStory").Find(&score).Error
-	return score, total, err
-}
-
-func SendWxAuthAPI(appID string, appSecret string, grant_type string, code string) (string, error) {
-
-	var code2sessionURL = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + appID + "&secret=" + appSecret + "&code=" + code + "&grant_type=" + grant_type
-	var url = fmt.Sprintf(code2sessionURL, appID, appSecret, code)
-	fmt.Println("url233232323322323", url)
-	resp, err := http.DefaultClient.Get(url)
-	fmt.Println("resp32332232332322", resp)
-	if err != nil {
-		return "", err
-	}
-	var wxMap map[string]string
-	err = json.NewDecoder(resp.Body).Decode(&wxMap)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-
-	return wxMap["openid"], nil
-}
-
-func SendWxAuthAPIOne(appID string, appSecret string, grant_type string, code string) (string, error) {
-	var code2sessionURL = "GET https://api.weixin.qq.com/sns/jscode2session?appid=" + appID + "&secret=" + appSecret + "&js_code=" + code + "&grant_type=" + grant_type
-	var url = fmt.Sprintf(code2sessionURL, appID, appSecret, code)
-	fmt.Println("url233232323322323", url)
-	resp, err := http.DefaultClient.Get(url)
-	if err != nil {
-		return "", err
-	}
-	var wxMap map[string]string
-	err = json.NewDecoder(resp.Body).Decode(&wxMap)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-
-	return wxMap["session_key"], nil
-}