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

controllers/zh/zh_his_api_controller.go

@@ -2441,55 +2441,55 @@ func (c *ZHHisApiController) ReadCard() {
 
 	switch id_card_type {
 	case 1:
-		if initFlag == 0 {
-			c.TestGetBasBaseInit()
-		}
-		basStr := c.GetBasBaseInfo(miConfig.Code, miConfig.MdtrtareaAdmvs, roles.UserName, strconv.FormatInt(roles.ID, 64), miConfig.OrgName)
-		if len(basStr) == 0 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
-			return
-		}
-		fmt.Println(basStr)
-		bas := strings.Split(basStr, "|")
-		basNumber := bas[1]
-		fmt.Println(basNumber)
-		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{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
-
-		userJSONBytes, _ := json.Marshal(dat)
-		var res ResultTwo
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		if res.Infcode == 0 {
-			patient, err := service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
-			if err == gorm.ErrRecordNotFound {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-				return
-			} else if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-				return
-
-			} else {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"patient": patient,
-					"number":  basNumber,
-				})
-			}
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-			return
-		}
+		//if initFlag == 0 {
+		//	c.TestGetBasBaseInit()
+		//}
+		//basStr := c.GetBasBaseInfo(miConfig.Code, miConfig.MdtrtareaAdmvs, roles.UserName, strconv.FormatInt(roles.ID, 64), miConfig.OrgName)
+		//if len(basStr) == 0 {
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+		//	return
+		//}
+		//fmt.Println(basStr)
+		//bas := strings.Split(basStr, "|")
+		//basNumber := bas[1]
+		//fmt.Println(basNumber)
+		//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{}
+		//if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		//	fmt.Println(dat)
+		//} else {
+		//	fmt.Println(err)
+		//}
+		//
+		//userJSONBytes, _ := json.Marshal(dat)
+		//var res ResultTwo
+		//if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		//	utils.ErrorLog("解析失败：%v", err)
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//	return
+		//}
+		//
+		//if res.Infcode == 0 {
+		//	patient, err := service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
+		//	if err == gorm.ErrRecordNotFound {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+		//		return
+		//	} else if err != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		//		return
+		//
+		//	} else {
+		//		c.ServeSuccessJSON(map[string]interface{}{
+		//			"patient": patient,
+		//			"number":  basNumber,
+		//		})
+		//	}
+		//} else {
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+		//	return
+		//}
 		break
 	case 2:
 		SFZStr := c.GetSFZBaseInfo()