Browse Source

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

csx 2 years ago
parent
commit
4696484564
2 changed files with 12 additions and 11 deletions
  1. 10 9
      controllers/sg/his_api_controller.go
  2. 2 2
      main.go

+ 10 - 9
controllers/sg/his_api_controller.go View File

13149
 		bp.StmtEnddate = end_time
13149
 		bp.StmtEnddate = end_time
13150
 		bps = append(bps, bp)
13150
 		bps = append(bps, bp)
13151
 
13151
 
13152
-		bp.MedfeeSumamt = medfee_sumamt_two
13153
-		bp.AcctPay = acct_pay_two
13154
-		bp.FundPaySumamt = fund_pay_sumamt_two
13155
-		bp.Insutype = "310"
13156
-		bp.StmtBegndate = start_time
13157
-		bp.StmtEnddate = end_time
13158
-		bp.ClrType = clr_type
13159
-		bp.SetlOptins = clr_org
13160
-		bps = append(bps, bp)
13152
+		var bp2 models.BusinessParams
13153
+		bp2.MedfeeSumamt = medfee_sumamt_two
13154
+		bp2.AcctPay = acct_pay_two
13155
+		bp2.FundPaySumamt = fund_pay_sumamt_two
13156
+		bp2.Insutype = "310"
13157
+		bp2.StmtBegndate = start_time
13158
+		bp2.StmtEnddate = end_time
13159
+		bp2.ClrType = clr_type
13160
+		bp2.SetlOptins = clr_org
13161
+		bps = append(bps, bp2)
13161
 
13162
 
13162
 		data := make(map[string]interface{})
13163
 		data := make(map[string]interface{})
13163
 		data["bps"] = bps
13164
 		data["bps"] = bps

+ 2 - 2
main.go View File

4
 	//"github.com/qiniu/api.v7/auth/qbox"
4
 	//"github.com/qiniu/api.v7/auth/qbox"
5
 	//"github.com/qiniu/api.v7/storage"
5
 	//"github.com/qiniu/api.v7/storage"
6
 
6
 
7
-	//"gdyb/service"
7
+	"gdyb/service"
8
 
8
 
9
 	//"gdyb/models"
9
 	//"gdyb/models"
10
 	_ "gdyb/routers"
10
 	_ "gdyb/routers"
21
 )
21
 )
22
 
22
 
23
 func init() {
23
 func init() {
24
-	//service.ConnectDB()
24
+	service.ConnectDB()
25
 	//org_id, _ := beego.AppConfig.Int64("org_id")
25
 	//org_id, _ := beego.AppConfig.Int64("org_id")
26
 	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
26
 	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
27
 	////CreateLog(miConfig)
27
 	////CreateLog(miConfig)