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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9919
+org_id = 10215
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -57,11 +57,11 @@ 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://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
-gdyb_paasid = "sg03_prd"
+# gdyb_paasid = "sg03_prd"
 # gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid="zh_prd_yrojyy"
 #gdyb_paasid = "sz_prd_yjyy"
-#gdyb_paasid = "zq_prd_yjyy"
+gdyb_paasid = "zq_prd_yjyy"
 
 
 

controllers/hb/hbyb_controller.go

@@ -26,6 +26,41 @@ func HbybRegistRouters() {
 	beego.Router("/hbyb/2207", &HBybController{}, "get:PostEight")
 	beego.Router("/hbyb/2208", &HBybController{}, "get:PostNine")
 	beego.Router("/hbyb/5203", &HBybController{}, "get:PostTen")
+	beego.Router("/hbyb/2001", &HBybController{}, "get:Post2001")
+
+}
+func (c *HBybController) Post2001() {
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	psn_no := c.GetString("psn_no")
+	insutype := c.GetString("insutype")
+	med_type := c.GetString("med_type")
+	result, inputLog := service.Hbyb2001(secret_key, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, psn_no, insutype, med_type)
+	fmt.Println(result)
+	fmt.Println(inputLog)
+
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	} else {
+
+	}
+
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
+
+	} else {
+
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+		"log": dat2,
+	})
 }
 
 func (c *HBybController) PostOne() {

controllers/sg/his_api_controller.go

@@ -7145,95 +7145,176 @@ func (c *HisApiController) CheckTreatment() {
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 
-	result := service.Gdyb1101A(id_card_no, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, patient.Name)
-	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
-	var res10265 ResultTwo10265
-	if miConfig.Code == "H15049901371" {
-		if err := json.Unmarshal(userJSONBytes, &res10265); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
+	if miConfig.MdtrtareaAdmvs == "421300" {
+		var res ResultTwo
+		api := "http://192.168.124.4:9532/" + "hbyb/1101?cert_no=" + "" +
+			"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(2, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(2, 10)
+		resp, requestErr := http.Get(api)
+		if requestErr != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-		res.ErrMsg = res10265.ErrMsg
-		infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
-		res.Infcode = infocode
-		res.Output = res10265.Output
-		res.InfRefmsgid = res10265.InfRefmsgid
-	} else {
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+
+		body, ioErr := ioutil.ReadAll(resp.Body)
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		var respJSON map[string]interface{}
+		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		result, _ := json.Marshal(respJSON)
+
+		if err := json.Unmarshal([]byte(result), &res); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-	}
 
-	var user_name string
-	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, adminUser.AdminUser.Id)
-	if role.ID == 0 {
-		user_name = "xxx"
-	} else {
-		user_name = role.UserName
-	}
+		if res.Infcode == 0 {
 
-	baseParams := models.BaseParams{
-		SecretKey:      miConfig.SecretKey,
-		FixmedinsCode:  miConfig.Code,
-		InsuplcAdmdvs:  miConfig.InsuplcAdmdvs,
-		MdtrtareaAdmvs: miConfig.MdtrtareaAdmvs,
-		OrgName:        miConfig.OrgName,
-		Doctor:         user_name,
-	}
+			api := "http://192.168.124.4:9532/" + "hbyb/2001?cert_no=" + "" +
+				"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&psn_no=" + res.Output.Baseinfo.PsnNo + "&insutype=" + insutype + "&med_type=" + med_type
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
-	if config.IsOpen == 1 {
-		if miConfig.Code == "H15049901371" {
-			if med_type == "14" {
-				if insutype == "390" {
-					med_type = "9933"
-				} else if insutype == "310" {
-					med_type = "990502"
-				}
-			} else if med_type == "11" {
-				med_type = "11"
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var res Result2001
+
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			result2, _ := json.Marshal(respJSON)
+
+			if err := json.Unmarshal([]byte(result2), &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			if res.Infcode == 0 {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": res.Output.Trtinfo,
+				})
 			}
+
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+			return
 		}
-		result := service.Gdyb2001(baseParams, res.Output.Baseinfo.PsnNo, insutype, med_type)
+
+	} else {
+
+		result := service.Gdyb1101A(id_card_no, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, patient.Name)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)
 		} else {
 			fmt.Println(err)
 		}
-		var res Result2001
-		var res10265 Result2001Org10265
+		userJSONBytes, _ := json.Marshal(dat)
+		var res ResultTwo
+		var res10265 ResultTwo10265
 		if miConfig.Code == "H15049901371" {
-			if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+			if err := json.Unmarshal(userJSONBytes, &res10265); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
 			res.ErrMsg = res10265.ErrMsg
-			res.Output = res10265.Output
-			res.InfRefmsgid = res10265.InfRefmsgid
 			infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
 			res.Infcode = infocode
+			res.Output = res10265.Output
+			res.InfRefmsgid = res10265.InfRefmsgid
 		} else {
-			if err := json.Unmarshal([]byte(result), &res); err != nil {
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
 		}
-		if res.Infcode == 0 {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": res.Output.Trtinfo,
-			})
+
+		var user_name string
+		role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, adminUser.AdminUser.Id)
+		if role.ID == 0 {
+			user_name = "xxx"
+		} else {
+			user_name = role.UserName
+		}
+
+		baseParams := models.BaseParams{
+			SecretKey:      miConfig.SecretKey,
+			FixmedinsCode:  miConfig.Code,
+			InsuplcAdmdvs:  miConfig.InsuplcAdmdvs,
+			MdtrtareaAdmvs: miConfig.MdtrtareaAdmvs,
+			OrgName:        miConfig.OrgName,
+			Doctor:         user_name,
+		}
+
+		if config.IsOpen == 1 {
+			if miConfig.Code == "H15049901371" {
+				if med_type == "14" {
+					if insutype == "390" {
+						med_type = "9933"
+					} else if insutype == "310" {
+						med_type = "990502"
+					}
+				} else if med_type == "11" {
+					med_type = "11"
+				}
+			}
+			result := service.Gdyb2001(baseParams, res.Output.Baseinfo.PsnNo, insutype, med_type)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			var res Result2001
+			var res10265 Result2001Org10265
+			if miConfig.Code == "H15049901371" {
+				if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				res.ErrMsg = res10265.ErrMsg
+				res.Output = res10265.Output
+				res.InfRefmsgid = res10265.InfRefmsgid
+				infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+				res.Infcode = infocode
+			} else {
+				if err := json.Unmarshal([]byte(result), &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+			}
+			if res.Infcode == 0 {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": res.Output.Trtinfo,
+				})
+			}
 		}
 	}
 }

service/hbyb_service.go

@@ -1056,63 +1056,63 @@ func Hbyb3202(baseParams models.BaseParams, businessParams models.BusinessParams
 	return str
 }
 
-func Hbyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_type string) string {
-	// 生成签名
-	nonce := GetRandomString(32)
-	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce, baseParams.SecretKey)
-
-	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
-	input := make(map[string]interface{})
-	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "2001" // 交易编码
-	inputData["psn_no"] = psn_no
-	inputData["insutype"] = insutype
-	inputData["med_type"] = med_type
-	inputData["begntime"] = "2021-01-01 00:00:00"
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
-	bytesData, err := json.Marshal(inputMessage)
-	fmt.Println(string(bytesData))
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	reader := bytes.NewReader(bytesData)
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3301"
-
-	gdyb_url := beego.AppConfig.String("gdyb_url")
-	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
-
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
-	url := gdyb_url + "2001"
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3301"
-	request, err := http.NewRequest("POST", url, reader)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", gdyb_paasid)
-	request.Header.Set("x-tif-signature", signature)
-	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
-	request.Header.Set("x-tif-nonce", nonce)
-	client := http.Client{}
-	resp, err := client.Do(request)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	respBytes, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	str := string(respBytes)
-	fmt.Println(str)
-	return str
-}
+//func Hbyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_type string) string {
+//	// 生成签名
+//	nonce := GetRandomString(32)
+//	timestamp := time.Now().Unix()
+//	signature := setSignature(timestamp, nonce, baseParams.SecretKey)
+//
+//	// 生成输入报文
+//	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+//	input := make(map[string]interface{})
+//	inputData := make(map[string]interface{})
+//	inputMessage["infno"] = "2001" // 交易编码
+//	inputData["psn_no"] = psn_no
+//	inputData["insutype"] = insutype
+//	inputData["med_type"] = med_type
+//	inputData["begntime"] = "2021-01-01 00:00:00"
+//	input["data"] = inputData
+//	inputMessage["input"] = input //交易输入
+//	bytesData, err := json.Marshal(inputMessage)
+//	fmt.Println(string(bytesData))
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	reader := bytes.NewReader(bytesData)
+//	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3301"
+//
+//	gdyb_url := beego.AppConfig.String("gdyb_url")
+//	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+//
+//	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+//	url := gdyb_url + "2001"
+//	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3301"
+//	request, err := http.NewRequest("POST", url, reader)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+//	request.Header.Set("x-tif-paasid", gdyb_paasid)
+//	request.Header.Set("x-tif-signature", signature)
+//	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+//	request.Header.Set("x-tif-nonce", nonce)
+//	client := http.Client{}
+//	resp, err := client.Do(request)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	respBytes, err := ioutil.ReadAll(resp.Body)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	str := string(respBytes)
+//	fmt.Println(str)
+//	return str
+//}
 
 func Hbyb3301(baseParams *models.BaseParams, name string, codg string, list_type_code string, start_time string, ent_time string, list_type string) string {
 	// 生成签名
@@ -2263,3 +2263,42 @@ func Hbyb90100(psn_no string, org_name string, doctor string, fixmedins_code str
 //func StrPtr(s string) uintptr {
 //	return uintptr(unsafe.Pointer(syscall.StringBytePtr(s)))
 //}
+
+func Hbyb2001(secret_key string, org_name string, doctor_name string, code string, insuplcAdmdvs string, mdtrtareaAdmvs string, psn_no string, insutype string, med_type string) (string, string) {
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
+
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	//signature := setSignature(timestamp, nonce, secret_key)
+	tempTime := time.Unix(timestamp, 0)
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor_name, code, insuplcAdmdvs, mdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2001" // 交易编码
+	inputData["psn_no"] = psn_no
+	inputData["insutype"] = insutype
+	inputData["med_type"] = med_type
+	inputData["begntime"] = timeFormatOne
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+
+	return string(out), string(bytesData)
+}