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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10028
+org_id = 10318
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -54,11 +54,12 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
 # gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
+#gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 # gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
 #内蒙古
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
 # gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
+gdyb_url = "http://19.15.78.136:20001/ebus/gdyb_inf/poc/hsa/hgs/gzzq/"
 #韶关
 # gdyb_paasid = "sg03_prd"
 #江门
@@ -66,12 +67,12 @@ gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #珠海
 # gdyb_paasid="zh_prd_yrojyy"
 #深圳
-gdyb_paasid = "sz_prd_yjyy"
+# gdyb_paasid = "sz_prd_yjyy"
 #肇庆
 # gdyb_paasid = "zq_prd_yjyy"
-
 # gdyb_paasid = "sztest_hosp"
-
+#广州
+# gdyb_paasid = "gdyb_inf"
 
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com

controllers/nm/nm_controller.go

@@ -38,7 +38,7 @@ func NmybRegistRouters() {
 
 	beego.Router("/nmyb/5203", &NmController{}, "get:Post5203")
 
-	beego.Router("/nmyb/readcard", &NmController{}, "get:ReadCard")
+	//beego.Router("/nmyb/readcard", &NmController{}, "get:ReadCard")
 
 	beego.Router("/nmyb/3201", &NmController{}, "get:Get3201")
 	beego.Router("/nmyb/2202", &NmController{}, "get:Post2202")
@@ -540,139 +540,139 @@ func (c *NmController) Get2503() {
 
 }
 
-func (c *NmController) ReadCard() {
-	fixmedins_code := c.GetString("fixmedins_code")
-	secret_key := c.GetString("secret_key")
-	org_name := c.GetString("org_name")
-	insuplc_admdvs := c.GetString("insuplc_admdvs")
-	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-	id_card_type := c.GetString("id_card_type")
-	operator_id := c.GetString("operator_id")
-	operator := c.GetString("operator")
-
-	if initFlag == 0 {
-		c.TestGetBasBaseInit()
-	}
-	switch id_card_type {
-	case "1":
-		pBusiCardInfo := c.GetBasBaseInfo(fixmedins_code, mdtrtarea_admvs, operator, operator_id, org_name)
-		basStr := Remove0000(pBusiCardInfo)
-
-		if len(basStr) == 0 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
-			return
-		}
-
-		var dat2 map[string]interface{}
-		if err := json.Unmarshal([]byte(basStr), &dat2); err == nil {
-			fmt.Println(dat2)
-		} else {
-			fmt.Println(err)
-		}
-
-		userJSONBytes, _ := json.Marshal(dat2)
-		var res ReadCardResult
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		fmt.Println(basStr)
-		bas := strings.Split(res.Output.CardInfo, "|")
-		basNumber := bas[1]
-		fmt.Println(basNumber)
-		card_sn := bas[3]
-		fmt.Println(card_sn)
-		cardNumber := bas[2]
-		name := bas[4]
-
-		result := service.Gdyb1101G(basNumber, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, card_sn, 1, name, cardNumber)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
-
-		userJSONBytes2, _ := json.Marshal(dat)
-		var res2 ResultTwo
-		if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		infocode, _ := strconv.ParseInt(res2.Infcode, 10, 64)
-
-		if infocode == 0 {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"status":         "0",
-				"card_info":      res.Output.CardInfo,
-				"busi_card_info": pBusiCardInfo,
-				"result":         res2,
-				"type":           "1",
-			})
-
-		} else {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"status": "-1",
-			})
-		}
-
-		break
-	case "4": //电子凭证
-		_, pBusiCardInfo := c.GetELeInfo(fixmedins_code, operator_id, operator)
-
-		var ele ELeData
-		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
-		if err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-		}
-		token := ele.Data.EcToken
-		fmt.Println(token)
-		if len(token) > 0 {
-			result := service.Gdyb1101ForEleCert("", org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, token, "")
-			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
-			}
-
-			infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
-
-			if infocode == 0 {
-
-				c.ServeSuccessJSON(map[string]interface{}{
-					"status":         "0",
-					"card_info":      pBusiCardInfo,
-					"busi_card_info": pBusiCardInfo,
-					"token":          token,
-					"result":         dat,
-				})
-
-			} else {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"status": "-1",
-				})
-
-			}
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-			return
-		}
-		break
-
-	}
-
-}
+//func (c *NmController) ReadCard() {
+//	fixmedins_code := c.GetString("fixmedins_code")
+//	secret_key := c.GetString("secret_key")
+//	org_name := c.GetString("org_name")
+//	insuplc_admdvs := c.GetString("insuplc_admdvs")
+//	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+//	id_card_type := c.GetString("id_card_type")
+//	operator_id := c.GetString("operator_id")
+//	operator := c.GetString("operator")
+//
+//	if initFlag == 0 {
+//		c.TestGetBasBaseInit()
+//	}
+//	switch id_card_type {
+//	case "1":
+//		pBusiCardInfo := c.GetBasBaseInfo(fixmedins_code, mdtrtarea_admvs, operator, operator_id, org_name)
+//		basStr := Remove0000(pBusiCardInfo)
+//
+//		if len(basStr) == 0 {
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+//			return
+//		}
+//
+//		var dat2 map[string]interface{}
+//		if err := json.Unmarshal([]byte(basStr), &dat2); err == nil {
+//			fmt.Println(dat2)
+//		} else {
+//			fmt.Println(err)
+//		}
+//
+//		userJSONBytes, _ := json.Marshal(dat2)
+//		var res ReadCardResult
+//		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//			utils.ErrorLog("解析失败：%v", err)
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//			return
+//		}
+//
+//		fmt.Println(basStr)
+//		bas := strings.Split(res.Output.CardInfo, "|")
+//		basNumber := bas[1]
+//		fmt.Println(basNumber)
+//		card_sn := bas[3]
+//		fmt.Println(card_sn)
+//		cardNumber := bas[2]
+//		name := bas[4]
+//
+//		result := service.Gdyb1101G(basNumber, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, card_sn, 1, name, cardNumber)
+//		var dat map[string]interface{}
+//		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//			fmt.Println(dat)
+//		} else {
+//			fmt.Println(err)
+//		}
+//
+//		userJSONBytes2, _ := json.Marshal(dat)
+//		var res2 ResultTwo
+//		if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+//			utils.ErrorLog("解析失败：%v", err)
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//			return
+//		}
+//		infocode, _ := strconv.ParseInt(res2.Infcode, 10, 64)
+//
+//		if infocode == 0 {
+//			c.ServeSuccessJSON(map[string]interface{}{
+//				"status":         "0",
+//				"card_info":      res.Output.CardInfo,
+//				"busi_card_info": pBusiCardInfo,
+//				"result":         res2,
+//				"type":           "1",
+//			})
+//
+//		} else {
+//			c.ServeSuccessJSON(map[string]interface{}{
+//				"status": "-1",
+//			})
+//		}
+//
+//		break
+//	case "4": //电子凭证
+//		_, pBusiCardInfo := c.GetELeInfo(fixmedins_code, operator_id, operator)
+//
+//		var ele ELeData
+//		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
+//		if err != nil {
+//			utils.ErrorLog("解析失败：%v", err)
+//		}
+//		token := ele.Data.EcToken
+//		fmt.Println(token)
+//		if len(token) > 0 {
+//			result := service.Gdyb1101ForEleCert("", org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, token, "")
+//			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
+//			}
+//
+//			infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
+//
+//			if infocode == 0 {
+//
+//				c.ServeSuccessJSON(map[string]interface{}{
+//					"status":         "0",
+//					"card_info":      pBusiCardInfo,
+//					"busi_card_info": pBusiCardInfo,
+//					"token":          token,
+//					"result":         dat,
+//				})
+//
+//			} else {
+//				c.ServeSuccessJSON(map[string]interface{}{
+//					"status": "-1",
+//				})
+//
+//			}
+//		} else {
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+//			return
+//		}
+//		break
+//
+//	}
+//
+//}
 
 var initFlag int64 = 0
 

routers/router.go

@@ -1,12 +1,7 @@
 package routers
 
 import (
-	"gdyb/controllers/hb"
-	"gdyb/controllers/js"
-	"gdyb/controllers/nm"
 	"gdyb/controllers/sg"
-	"gdyb/controllers/zh"
-
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
 	//admin_api "XT_New/controllers/admin_api_controllers"
@@ -26,11 +21,11 @@ func init() {
 	}))
 	sg.HisManagerApiRegistRouters()
 	sg.GdybRegistRouters()
-	hb.HbybRegistRouters()
+	//hb.HbybRegistRouters()
 	//sz.SZHisManagerApiRegistRouters()
-	zh.ZHHisManagerApiRegistRouters()
-	js.JSybRegistRouters()
-	nm.NmybRegistRouters()
+	//zh.ZHHisManagerApiRegistRouters()
+	//js.JSybRegistRouters()
+	//nm.NmybRegistRouters()
 	//coordinate.CoordinateRegistRouters()
 
 }

service/gdyb_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"bytes"
+	"crypto/md5"
 	"crypto/sha256"
 	"encoding/hex"
 	"encoding/json"
@@ -4427,8 +4428,24 @@ func Gdyb9001(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "9001"        // 交易编码
 	inputData["opter_no"] = admin_user_id // 就诊凭证编号
-	inputData["mac"] = GetMac()           // 开始时间
-	inputData["ip"] = GetLocalIp()
+	inputData["mac"] = "11-11-11-11-11"   // 开始时间
+	inputData["ip"] = "11.11.11.11"
+	inputData["userid"] = "H44010400081"
+
+	month := time.Unix(1557042972, 0).Format("1")
+	year := time.Now().Format("2006")
+	month = time.Now().Format("01")
+	day := time.Now().Format("02")
+	hour := time.Now().Format("15")
+	min := time.Now().Format("04")
+	sec := time.Now().Format("05")
+
+	inputData["currenttime"] = year + month + day + hour + min + sec
+	var psd string
+	psd = year + month + day + hour + min + sec + "Gzyb$867"
+	h := md5.New()
+	h.Write([]byte(psd))
+	inputData["password"] = hex.EncodeToString(h.Sum(nil))
 	input["signIn"] = inputData
 	inputMessage["input"] = input //交易输入
 	var inputLog string