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

controllers/js/jsyb_controller.go

@@ -777,6 +777,8 @@ func (c *JSybController) ReadCard() {
 		}
 		break
 	case "4": //电子凭证
+		fmt.Println(operator_id)
+		fmt.Println(operator)
 		pCardInfo, pBusiCardInfo := c.GetELeCertInfo(fixmedins_code, operator_id, operator)
 		fmt.Println(pCardInfo)
 		fmt.Println(pBusiCardInfo)
@@ -926,8 +928,8 @@ func (c *JSybController) GetELeCertInfo(code string, operator_id string, operato
 	inputData := make(map[string]interface{})
 	inputData["orgId"] = code
 	inputData["businessType"] = "01101"
-	inputData["operatorId"] = operator_id
-	inputData["operatorName"] = operator_name
+	inputData["operatorId"] = "1"
+	inputData["operatorName"] = "admin"
 	inputData["officeId"] = "001"
 	inputData["officeName"] = "血透室"
 	//