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

controllers/his_api_controller.go

@@ -354,7 +354,7 @@ func (c *HisApiController) CreateHisPrescription() {
 							s.Status = 1
 							s.UserOrgId = adminInfo.CurrentOrgId
 							s.RecordDate = recordDateTime
-							s.StartTime = recordDateTime
+							s.StartTime = time.Now().Unix()
 							s.Groupno = groupNo
 							s.CreatedTime = ctime
 							s.UpdatedTime = mtime

service/gdyb_service.go

@@ -729,6 +729,63 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	return str
 }
 
+//  门诊结算撤销
+func Gdyb3201(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2208" // 交易编码
+
+	inputData["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
+	inputData["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
+	inputData["setl_id"] = setlId   // 结算 ID
+
+	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_inf/poc/hsa/hgs/2208"
+	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
+}
+
 //  门诊结算撤销
 //func Gdyb4101(psnNo string, mdtrtId string, setlId string) string {
 //	// 生成签名