Browse Source

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

csx 2 years ago
parent
commit
97e2ca11db
4 changed files with 11 additions and 9 deletions
  1. 1 1
      conf/app.conf
  2. 2 0
      controllers/nm/nm_controller.go
  3. 7 7
      main.go
  4. 1 1
      service/jsyb_service.go

+ 1 - 1
conf/app.conf View File

45
 
45
 
46
 
46
 
47
 [prod]
47
 [prod]
48
-org_id = 10265
48
+org_id = 10217
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

+ 2 - 0
controllers/nm/nm_controller.go View File

41
 	beego.Router("/nmyb/readcard", &NmController{}, "get:ReadCard")
41
 	beego.Router("/nmyb/readcard", &NmController{}, "get:ReadCard")
42
 
42
 
43
 	beego.Router("/nmyb/3201", &NmController{}, "get:Get3201")
43
 	beego.Router("/nmyb/3201", &NmController{}, "get:Get3201")
44
+	//beego.Router("/nmyb/3202", &NmController{}, "get:Get3202")
45
+
44
 	//beego.Router("/nmyb/3202", &NmController{}, "post:Get3102")
46
 	//beego.Router("/nmyb/3202", &NmController{}, "post:Get3102")
45
 
47
 
46
 }
48
 }

+ 7 - 7
main.go View File

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
 }

+ 1 - 1
service/jsyb_service.go View File

245
 
245
 
246
 	inputData["mdtrt_cert_no"] = Token // 就诊凭证编号
246
 	inputData["mdtrt_cert_no"] = Token // 就诊凭证编号
247
 	inputData["begntime"] = ""         // 开始时间
247
 	inputData["begntime"] = ""         // 开始时间
248
-	inputData["psn_name"] = name       // 人员姓名
248
+	inputData["psn_name"] = "晁海燕"      // 人员姓名
249
 	input["data"] = inputData
249
 	input["data"] = inputData
250
 	inputMessage["input"] = input //交易输入
250
 	inputMessage["input"] = input //交易输入
251
 
251