Pārlūkot izejas kodu

Merge branch 'master' of http://git.shengws.com/csx/gdyb

csx 2 gadus atpakaļ
vecāks
revīzija
154a700f99
3 mainītis faili ar 9 papildinājumiem un 9 dzēšanām
  1. 1 1
      conf/app.conf
  2. 1 1
      controllers/zh/zh_his_api_controller.go
  3. 7 7
      main.go

+ 1 - 1
conf/app.conf Parādīt failu

45
 
45
 
46
 
46
 
47
 [prod]
47
 [prod]
48
-org_id = 10217
48
+org_id = 10265
49
 mobile_token_expiration_second = 86400
49
 mobile_token_expiration_second = 86400
50
 httpdomain = https://api.xt.kuyicloud.com
50
 httpdomain = https://api.xt.kuyicloud.com
51
 sso_domain = https://sso.kuyicloud.com
51
 sso_domain = https://sso.kuyicloud.com

+ 1 - 1
controllers/zh/zh_his_api_controller.go Parādīt failu

1950
 				data["chrg_bchno"] = chrg_bchno
1950
 				data["chrg_bchno"] = chrg_bchno
1951
 				data["dept"] = strconv.FormatInt(department.ID, 10)
1951
 				data["dept"] = strconv.FormatInt(department.ID, 10)
1952
 				data["dept_code"] = department.Number
1952
 				data["dept_code"] = department.Number
1953
-				data["doctor_code"] = doctor_info.ID
1953
+				data["doctor_code"] = strconv.FormatInt(doctor_info.ID, 10)
1954
 				data["doctor_name"] = doctor_info.UserName
1954
 				data["doctor_name"] = doctor_info.UserName
1955
 				data["org_name"] = miConfig.OrgName
1955
 				data["org_name"] = miConfig.OrgName
1956
 				data["opertor"] = roles.UserName
1956
 				data["opertor"] = roles.UserName

+ 7 - 7
main.go Parādīt failu

5
 	"fmt"
5
 	"fmt"
6
 	"gdyb/models"
6
 	"gdyb/models"
7
 	_ "gdyb/routers"
7
 	_ "gdyb/routers"
8
-	"gdyb/service"
8
+	//"gdyb/service"
9
 	"github.com/astaxie/beego"
9
 	"github.com/astaxie/beego"
10
 	"github.com/qiniu/api.v7/auth/qbox"
10
 	"github.com/qiniu/api.v7/auth/qbox"
11
 	"github.com/qiniu/api.v7/storage"
11
 	"github.com/qiniu/api.v7/storage"
15
 )
15
 )
16
 
16
 
17
 func init() {
17
 func init() {
18
-	service.ConnectDB()
19
-	org_id, _ := beego.AppConfig.Int64("org_id")
20
-
21
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
22
-	CreateLog(miConfig)
23
-	UploadLog(miConfig)
18
+	//service.ConnectDB()
19
+	//org_id, _ := beego.AppConfig.Int64("org_id")
20
+	//
21
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
22
+	//CreateLog(miConfig)
23
+	//UploadLog(miConfig)
24
 
24
 
25
 	//UploadSettleList(org_id)
25
 	//UploadSettleList(org_id)
26
 }
26
 }