称重接口

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -13,11 +13,10 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
-	_ "strings"
+	_"strings"
 
 	// "fmt"
 	_ "reflect"
-	_ "strconv"
 	"time"
 )
 
@@ -696,11 +695,44 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 	}
 }
+
+func (c *CheckWeightApiController) SetSyncTime(){
+	sn := c.GetString("sn")
+	if len(sn)  > 0 {
+		redis := service.RedisClient()
+		defer redis.Close()
+		redis.Set(sn, 0,0)
+	}
+	serviceTime := time.Now().Unix()
+	c.ServeSuccessJSON(map[string]interface{}{
+		"status": 	1,
+		"servicetime": serviceTime,
+	})
+}
+
 func (c *CheckWeightApiController) GetPatientList() {
-	syncTime, _ := c.GetInt64("synctime", 0)
-	force, _ := c.GetInt64("force", 0)
+	ftype,_ := c.GetInt64("type",0)
+	sn := c.GetString("sn")
+	syncTime := int64(0)
+
+	redis := service.RedisClient()
+	defer redis.Close()
+	if len(sn)  > 0 {
+		syncTimeStr, _ := redis.Get(sn).Result()
+		syncTime,_ = strconv.ParseInt(syncTimeStr, 10, 64)
+	}
+
+	if ftype == 1 {
+		timeNow := time.Now().Unix()
+		redis.Set(sn, timeNow,0)
+	}
+
 	adminUserInfo := c.GetMobileAdminUserInfo()
-	patientList, total, error := service.GetPatientListByUpdateTime(adminUserInfo.Org.Id, syncTime, force)
+	need_update := 0
+	patientList, total, error := service.GetPatientListByUpdateTime(adminUserInfo.Org.Id, int64(syncTime))
+	if len(patientList)  > 0 {
+		need_update = 1
+	}
 	if error != nil {
 		c.ErrorLog("获取病人列表失败:%v", error)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -708,6 +740,7 @@ func (c *CheckWeightApiController) GetPatientList() {
 	}
 	serviceTime := time.Now().Unix()
 	c.ServeSuccessJSON(map[string]interface{}{
+		"need_update" : need_update,
 		"patientlist": patientList,
 		"total":       total,
 		"servicetime": serviceTime,

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -12,6 +12,7 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/savebloodpressure", &CheckWeightApiController{}, "Post:SaveBloodPressure")
 	beego.Router("/m/api/checkbeforedialysis", &CheckWeightApiController{}, "get:GetPatientInfoBeforeDialysis")
 	beego.Router("/m/api/getpatientlist", &CheckWeightApiController{}, "get:GetPatientList")
+	beego.Router("/m/api/setsynctime", &CheckWeightApiController{}, "get:SetSyncTime")
 	beego.Router("/m/api/getschedulepatient", &CheckWeightApiController{}, "get:GetPatientListForSchedules")
 	beego.Router("/m/api/getschedulepatientfind", &CheckWeightApiController{}, "get:GetPatientListForSchedulesFind")
 	beego.Router("/m/api/getpatientinfo", &CheckWeightApiController{}, "get:GetPatientListById")

service/patient_service.go

@@ -80,11 +80,11 @@ func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, e
 	return
 }
 
-func GetPatientListByUpdateTime(orgID int64, syncTime int64, force int64) (patients []*models.PatientListForFaceList, total int64, err error) {
+func GetPatientListByUpdateTime(orgID int64, syncTime int64) (patients []*models.PatientListForFaceList, total int64, err error) {
 	db := readDb.Model(&models.PatientListForFaceList{}).Where("user_org_id=?  AND  status=1  AND  avatar <> 'https://images.shengws.com/201809182128222.png' AND avatar <> 'https://images.shengws.com/201809182128111.png' AND avatar <> ''", orgID)
-	if force == 0 {
+	
 		db = db.Where("updated_time >= ?", syncTime)
-	}
+	
 	err = db.Count(&total).Find(&patients).Error
 	return
 }