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

controllers/sg/his_api_controller.go

@@ -94,11 +94,15 @@ func (c *HisApiController) ReadCard() {
 	switch id_card_type {
 	case 1:
 		basStr := c.GetBasBaseInfo()
+		if len(basStr) == 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+			return
+		}
 		fmt.Println(basStr)
 		bas := strings.Split(basStr, "|")
-		basNumber := bas[3]
+		basNumber := bas[2]
 		fmt.Println(basNumber)
-		card_sn := bas[4]
+		card_sn := bas[3]
 		fmt.Println(card_sn)
 		result := service.Gdyb1101B(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
 		var dat map[string]interface{}
@@ -235,7 +239,6 @@ func (c *HisApiController) GetBasBaseInfo() string {
 	fmt.Println(string(str))
 
 	if ret2 != 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
 		return ""
 	}
 	return string(str)