Parcourir la source

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

csx il y a 3 ans
Parent
révision
b63630a398
2 fichiers modifiés avec 7 ajouts et 15 suppressions
  1. 1 9
      controllers/sg/his_api_controller.go
  2. 6 6
      main.go

+ 1 - 9
controllers/sg/his_api_controller.go Voir le fichier

3226
 			} else if miConfig.MdtrtareaAdmvs == "320921" {
3226
 			} else if miConfig.MdtrtareaAdmvs == "320921" {
3227
 				psn_info, _ := service.GetPsnByPatientId(id)
3227
 				psn_info, _ := service.GetPsnByPatientId(id)
3228
 				bas := strings.Split(psn_info.CardInfo, "|")
3228
 				bas := strings.Split(psn_info.CardInfo, "|")
3229
-				basNumber := bas[2]
3230
-				if id_card_type == 1 {
3231
 
3229
 
3232
-					Certno = Certno
3233
-				} else {
3234
-
3235
-					Certno = basNumber
3236
-				}
3237
-
3238
-				api := "http://192.168.3.111:9532/" + "jsyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + Certno + "&ipt_otp_no=" + ipt_otp_no +
3230
+				api := "http://192.168.3.111:9532/" + "jsyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + bas[2] + "&ipt_otp_no=" + ipt_otp_no +
3239
 					"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
3231
 					"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
3240
 					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_id + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
3232
 					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_id + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
3241
 				resp, requestErr := http.Get(api)
3233
 				resp, requestErr := http.Get(api)

+ 6 - 6
main.go Voir le fichier

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
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
21
-	//CreateLog(miConfig)
22
-	//UploadLog(miConfig)
18
+	service.ConnectDB()
19
+	org_id, _ := beego.AppConfig.Int64("org_id")
20
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
21
+	CreateLog(miConfig)
22
+	UploadLog(miConfig)
23
 
23
 
24
 }
24
 }
25
 func main() {
25
 func main() {