Browse Source

Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

csx 4 years ago
parent
commit
982ac4bb23
2 changed files with 16 additions and 0 deletions
  1. 2 0
      conf/app.conf
  2. 14 0
      controllers/mobile_api_controllers/check_weight_api_controller.go

+ 2 - 0
conf/app.conf View File

@@ -47,6 +47,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
47 47
 mobile_token_expiration_second = 86400
48 48
 httpdomain = https://api.xt.kuyicloud.com
49 49
 sso_domain = https://sso.kuyicloud.com
50
+call_domain = https://hf.sgjyun.com
50 51
 front_end_domain = "https://xt.kuyicloud.com/#"
51 52
 
52 53
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
@@ -143,6 +144,7 @@ aliquid = 83
143 144
 mobile_token_expiration_second = 3600
144 145
 httpdomain = http://new_mobile.xt.api.sgjyun.com
145 146
 sso_domain = https://testsso.sgjyun.com
147
+call_domain = http://hf.szjkhd.com
146 148
 front_end_domain = "http://xt.test.sgjyun.com/#"
147 149
 
148 150
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com

+ 14 - 0
controllers/mobile_api_controllers/check_weight_api_controller.go View File

@@ -4,6 +4,10 @@ import (
4 4
 	"XT_New/enums"
5 5
 	"XT_New/models"
6 6
 	"XT_New/service"
7
+	"github.com/astaxie/beego"
8
+	"net/http"
9
+	"net/url"
10
+	"strconv"
7 11
 	_ "XT_New/utils"
8 12
 	_ "encoding/json"
9 13
 	"fmt"
@@ -790,6 +794,14 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
790 794
 				sc["data"] = daySchedule
791 795
 			}
792 796
 		}
797
+
798
+		// 排队叫号的签到
799
+		ssoDomain := beego.AppConfig.String("call_domain")
800
+		api := ssoDomain + "/index/patientsign/"+strconv.FormatInt(adminUserInfo.Org.Id, 10)+"/"+strconv.FormatInt(id, 10)
801
+		values := make(url.Values)
802
+
803
+		http.PostForm(api, values)
804
+
793 805
 	} else {
794 806
 		nextSchedule, _ := service.GetNextSchedule(adminUserInfo.Org.Id, endTime, id)
795 807
 		if len(nextSchedule) <= 0 {
@@ -952,6 +964,8 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
952 964
 		}
953 965
 	}
954 966
 
967
+
968
+
955 969
 	c.ServeSuccessJSON(map[string]interface{}{
956 970
 		"dialysistype":     dialysistype,
957 971
 		"patient":          dialysisinfo,