Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/gdyb_controller.go

@@ -24,6 +24,9 @@ func GdybRegistRouters() {
 	beego.Router("/gdyb/seven", &GdybController{}, "get:PostSeven")
 	beego.Router("/gdyb/eight", &GdybController{}, "get:PostEight")
 	beego.Router("/gdyb/nine", &GdybController{}, "get:PostNine")
+
+	beego.Router("/gdyb/tem", &GdybController{}, "get:PostTen")
+
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -229,3 +232,11 @@ func (c *GdybController) PostNine() {
 		"pre": result,
 	})
 }
+
+func (c *GdybController) PostTen() {
+	fixmedins_type := c.GetString("fixmedins_type")
+	result := service.Gdyb1201(fixmedins_type)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": result,
+	})
+}

controllers/his_api_controller.go

@@ -893,6 +893,8 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 	if json["project_id"] != nil || reflect.TypeOf(json["project_id"]).String() == "float64" {
 		project_id := int64(json["project_id"].(float64))
 		project.ProjectId = project_id
+		fmt.Println(project_id)
+		fmt.Println(project.ProjectId)
 	}
 
 	if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {

service/gdyb_service.go

@@ -17,7 +17,7 @@ import (
 
 const (
 	SceretKey     = "RhaDw4H0RUbWYyTxmRKM1eSeN0qyGLds" //     secretKey 私钥
-	FixmedinsCOde = "H44022900158"                     // 定点医药机构编号
+	FixmedinsCOde = "H44020500197"                     // 定点医药机构编号
 )
 
 // 人员基本信息
@@ -768,7 +768,7 @@ func SetInputMessage(nonce string, timestamp int64) map[string]interface{} {
 	inputMessage["opter_name"] = "测试用户"                                                        // 经办人姓名
 	inputMessage["inf_time"] = timeFormatOne                                                   // 交易时间
 	inputMessage["fixmedins_code"] = FixmedinsCOde                                             // 定点医药机构编号
-	inputMessage["fixmedins_name"] = "翁源沅胜血液透析中心"                                              //定点医药机构名称
+	inputMessage["fixmedins_name"] = "韶关市曲江区小坑镇卫生院"                                            //定点医药机构名称
 	inputMessage["sign_no"] = ""                                                               //交易签到流水号
 	return inputMessage
 }
@@ -779,3 +779,58 @@ func FindHisRegisterRecord(record_time int64, patient_id int64, org_id int64) (t
 
 	return
 }
+
+func Gdyb1201(psnNo string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce)
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "1201"      // 交易编码
+	inputData["fixmedins_type"] = psnNo // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_name"] = "韶关"  // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_code"] = ""    // 人员编号 （来自1101接口返回）
+
+	input["medinsinfo"] = 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_inf/poc/hsa/hgs/1201"
+	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", "test_hosp")
+	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
+}