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

controllers/sg/his_api_controller.go

@@ -70,6 +70,10 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/batchsettlelist/get", &HisApiController{}, "get:GetBatchSettleList")
 	beego.Router("/api/psn/info", &HisApiController{}, "get:GetPsnNcdsInfo")
 
+	beego.Router("/api/allopatry/get", &HisApiController{}, "get:GetAllopatry")
+	beego.Router("/api/comfirmallopatry/post", &HisApiController{}, "post:ComfirmAllopatry")
+	beego.Router("/api/allopatry/refund", &HisApiController{}, "post:RefundAllopatry")
+
 }
 func (c *HisApiController) GetPsnNcdsInfo() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -9078,142 +9082,205 @@ func (c *HisApiController) ReversalData() {
 		fmt.Println(result)
 	}
 }
-func (c *HisApiController) ReversalOtherData() {
-	var customData []*CustomData
-
-	custom := &CustomData{
-		MsgId: "H44022900158202103301714472004",
-		PsnNo: "44020000001101329945",
-		Info:  "2208",
-	}
-	customData = append(customData, custom)
-
-	custom1 := &CustomData{
-		MsgId: "H4402290015820210330172057803",
-		PsnNo: "44020000001101161813",
-		Info:  "2208",
-	}
-	customData = append(customData, custom1)
-	custom2 := &CustomData{
-		MsgId: "H44022900158202103301705198813",
-		PsnNo: "44190000133097375417",
-		Info:  "2208",
-	}
-	customData = append(customData, custom2)
-	custom3 := &CustomData{
-		MsgId: "H44022900158202103301715524756",
-		PsnNo: "44020000001100187221",
-		Info:  "2208",
-	}
-	customData = append(customData, custom3)
-	custom4 := &CustomData{
-		MsgId: "H44022900158202103301730376224",
-		PsnNo: "44020000001101959155",
-		Info:  "2208",
-	}
-	customData = append(customData, custom4)
-	custom5 := &CustomData{
-		MsgId: "H44022900158202103301748008725",
-		PsnNo: "44020000001104246641",
-		Info:  "2208",
-	}
-	customData = append(customData, custom5)
-	custom6 := &CustomData{
-		MsgId: "H44022900158202103301718096755",
-		PsnNo: "44020000001102211860",
-		Info:  "2208",
-	}
-	customData = append(customData, custom6)
-	custom7 := &CustomData{
-		MsgId: "H44022900158202103301736551640",
-		PsnNo: "44020000001102687718",
-		Info:  "2208",
-	}
-
-	customData = append(customData, custom7)
-
-	custom8 := &CustomData{
-		MsgId: "H44022900158202103301743097676",
-		PsnNo: "44020000001102127785",
-		Info:  "2208",
-	}
-	customData = append(customData, custom8)
-	custom9 := &CustomData{
-		MsgId: "H44022900158202103301712304203",
-		PsnNo: "44020000001101518097",
-		Info:  "2208",
-	}
-	customData = append(customData, custom9)
-	custom10 := &CustomData{
-		MsgId: "H44022900158202103301738448785",
-		PsnNo: "44020000001100500813",
-		Info:  "2208",
-	}
-	customData = append(customData, custom10)
-
-	custom11 := &CustomData{
-		MsgId: "H44022900158202103301732455843",
-		PsnNo: "44020000001102690557",
-		Info:  "2208",
-	}
-
-	customData = append(customData, custom11)
-
-	custom12 := &CustomData{
-		MsgId: "H44022900158202103301745421708",
-		PsnNo: "44020000001102211928",
-		Info:  "2208",
+func (c *HisApiController) GetAllopatry() {
+	year := c.GetString("year")
+	month := c.GetString("month")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	result, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
 	}
-	customData = append(customData, custom12)
-
-	custom1212 := &CustomData{
-		MsgId: "H440229001582021033017351627",
-		PsnNo: "44020000001102481733",
-		Info:  "2208",
+	userJSONBytes, _ := json.Marshal(dat)
+	var res2 models.Result3260
+	if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
 	}
-	customData = append(customData, custom1212)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"result": res2,
+	})
 
-	custom13 := &CustomData{
-		MsgId: "H44022900158202103301740327951",
-		PsnNo: "44020000001103174866",
-		Info:  "2208",
-	}
-	customData = append(customData, custom13)
-	custom14 := &CustomData{
-		MsgId: "H4402290015820210330174922668",
-		PsnNo: "44020000001102927272",
-		Info:  "2208",
-	}
-	customData = append(customData, custom14)
-	custom15 := &CustomData{
-		MsgId: "H44022900158202103301752362273",
-		PsnNo: "44020000001102942890",
-		Info:  "2208",
+}
+func (c *HisApiController) ComfirmAllopatry() {
+	year := c.GetString("year")
+	month := c.GetString("month")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	result, _ := service.Gdyb3261(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
 	}
-	customData = append(customData, custom15)
-
-	custom16 := &CustomData{
-		MsgId: "H44022900158202103301751082917",
-		PsnNo: "44020000001101662162",
-		Info:  "2208",
+	userJSONBytes, _ := json.Marshal(dat)
+	var res2 models.Result3261
+	if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
 	}
-	customData = append(customData, custom16)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"result": res2,
+	})
 
-	custom17 := &CustomData{
-		MsgId: "H44022900158202103301754147728",
-		PsnNo: "44020000000229014511",
-		Info:  "2208",
-	}
-	customData = append(customData, custom17)
+}
 
-	adminUser := c.GetAdminUserInfo()
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+//func (c *HisApiController) RefundAllopatry() {
+//	year := c.GetString("year")
+//	month := c.GetString("month")
+//	admin_user_id, _ := c.GetInt64("admin_user_id")
+//	adminUser := c.GetAdminUserInfo()
+//	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+//	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+//
+//}
 
-	for _, item := range customData {
-		result := service.Gdyb2601(item.PsnNo, item.MsgId, item.Info, miConfig.OrgName, "张俊杰", miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
-		fmt.Println(result)
-	}
-}
+//func (c *HisApiController) ReversalOtherData() {
+//	var customData []*CustomData
+//
+//	custom := &CustomData{
+//		MsgId: "H44022900158202103301714472004",
+//		PsnNo: "44020000001101329945",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom)
+//
+//	custom1 := &CustomData{
+//		MsgId: "H4402290015820210330172057803",
+//		PsnNo: "44020000001101161813",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom1)
+//	custom2 := &CustomData{
+//		MsgId: "H44022900158202103301705198813",
+//		PsnNo: "44190000133097375417",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom2)
+//	custom3 := &CustomData{
+//		MsgId: "H44022900158202103301715524756",
+//		PsnNo: "44020000001100187221",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom3)
+//	custom4 := &CustomData{
+//		MsgId: "H44022900158202103301730376224",
+//		PsnNo: "44020000001101959155",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom4)
+//	custom5 := &CustomData{
+//		MsgId: "H44022900158202103301748008725",
+//		PsnNo: "44020000001104246641",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom5)
+//	custom6 := &CustomData{
+//		MsgId: "H44022900158202103301718096755",
+//		PsnNo: "44020000001102211860",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom6)
+//	custom7 := &CustomData{
+//		MsgId: "H44022900158202103301736551640",
+//		PsnNo: "44020000001102687718",
+//		Info:  "2208",
+//	}
+//
+//	customData = append(customData, custom7)
+//
+//	custom8 := &CustomData{
+//		MsgId: "H44022900158202103301743097676",
+//		PsnNo: "44020000001102127785",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom8)
+//	custom9 := &CustomData{
+//		MsgId: "H44022900158202103301712304203",
+//		PsnNo: "44020000001101518097",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom9)
+//	custom10 := &CustomData{
+//		MsgId: "H44022900158202103301738448785",
+//		PsnNo: "44020000001100500813",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom10)
+//
+//	custom11 := &CustomData{
+//		MsgId: "H44022900158202103301732455843",
+//		PsnNo: "44020000001102690557",
+//		Info:  "2208",
+//	}
+//
+//	customData = append(customData, custom11)
+//
+//	custom12 := &CustomData{
+//		MsgId: "H44022900158202103301745421708",
+//		PsnNo: "44020000001102211928",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom12)
+//
+//	custom1212 := &CustomData{
+//		MsgId: "H440229001582021033017351627",
+//		PsnNo: "44020000001102481733",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom1212)
+//
+//	custom13 := &CustomData{
+//		MsgId: "H44022900158202103301740327951",
+//		PsnNo: "44020000001103174866",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom13)
+//	custom14 := &CustomData{
+//		MsgId: "H4402290015820210330174922668",
+//		PsnNo: "44020000001102927272",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom14)
+//	custom15 := &CustomData{
+//		MsgId: "H44022900158202103301752362273",
+//		PsnNo: "44020000001102942890",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom15)
+//
+//	custom16 := &CustomData{
+//		MsgId: "H44022900158202103301751082917",
+//		PsnNo: "44020000001101662162",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom16)
+//
+//	custom17 := &CustomData{
+//		MsgId: "H44022900158202103301754147728",
+//		PsnNo: "44020000000229014511",
+//		Info:  "2208",
+//	}
+//	customData = append(customData, custom17)
+//
+//	adminUser := c.GetAdminUserInfo()
+//	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+//
+//	for _, item := range customData {
+//		result := service.Gdyb2601(item.PsnNo, item.MsgId, item.Info, miConfig.OrgName, "张俊杰", miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+//		fmt.Println(result)
+//	}
+//}
 
 func PathExists(path string) (bool, error) {
 	_, err := os.Stat(path)
@@ -9312,59 +9379,6 @@ func ReadFile(filePath string) []byte {
 	return fd
 }
 
-func RemoveRepeatedTeam(arr []*models.HisOrderInfo) (newArr []*models.HisOrderInfo) {
-	newArr = make([]*models.HisOrderInfo, 0)
-	for i := 0; i < len(arr); i++ {
-		repeat := false
-		for j := i + 1; j < len(arr); j++ {
-			if arr[i].HisPrescriptionProject.TeamId == arr[j].HisPrescriptionProject.TeamId {
-				repeat = true
-				break
-			}
-		}
-		if !repeat {
-			newArr = append(newArr, arr[i])
-		}
-	}
-	return
-}
-
-func saveRegisterLog(result string) {
-
-	org_id, _ := beego.AppConfig.Int64("org_id")
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	dir := miConfig.OrgName + "日志"
-	utils.Mkdir(dir)
-	month := time.Unix(1557042972, 0).Format("1")
-	year := time.Now().Format("2006")
-	month = time.Now().Format("01")
-	day := time.Now().Format("02")
-	file := strconv.FormatInt(org_id, 10) + "_" + year + month + day + "_log"
-	file_name := file + ".txt"
-	file_path := miConfig.OrgName + "日志" + "/" + file_name
-	exist, _ := utils.PathExists(file_path)
-	if exist { //存在
-		fmt.Println("存在")
-		f, err := os.OpenFile(file_path, os.O_WRONLY, 0644)
-		if err != nil {
-			fmt.Println("read fail")
-		}
-		content := "\r\n" + result
-		n, _ := f.Seek(0, 2)
-		_, err = f.WriteAt([]byte(content), n)
-
-	} else { //不存在
-		fmt.Println("文件不存在，创建文件")
-		f, err := os.Create(miConfig.OrgName + "日志" + "/" + file_name)
-		defer f.Close()
-		if err != nil {
-		} else {
-			_, err = f.Write([]byte("记录日志"))
-		}
-	}
-
-}
-
 func saveLog(result string, request string, infno string, desc string) {
 
 	org_id, _ := beego.AppConfig.Int64("org_id")

models/yb_models.go

@@ -0,0 +1,27 @@
+package models
+
+type Result3260 struct {
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     int64  `json:"infcode"`
+	Output      struct {
+		Data []interface{} `json:"data"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnInfo    interface{} `json:"warn_info"`
+}
+
+type Result3261 struct {
+	Cainfo      interface{} `json:"cainfo"`
+	ErrMsg      string      `json:"err_msg"`
+	InfRefmsgid string      `json:"inf_refmsgid"`
+	Infcode     int64       `json:"infcode"`
+	Output      struct {
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}

service/gdyb_service.go

@@ -3786,3 +3786,235 @@ func Gdyb90100(psn_no string, org_name string, doctor string, fixmedins_code str
 	str := string(respBytes)
 	return str
 }
+
+func Gdyb3260(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string) (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"] = "3260" // 交易编码
+
+	inputData["trt_year"] = year   // 就诊凭证编号
+	inputData["trt_month"] = month // 开始时间
+	inputData["startrow"] = "100"  // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	var inputLog string
+	bytesData, err := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	var url string
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "3260"
+	}
+
+	if insuplc_admdvs == "421300" {
+		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())
+		}
+		fmt.Println(string(out))
+		return hex.EncodeToString(out), inputLog
+	} else {
+
+		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+		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(), ""
+		}
+		fmt.Println(string(respBytes))
+		str := string(respBytes)
+		return str, inputLog
+
+	}
+
+}
+func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string) (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"] = "3261" // 交易编码
+	inputData["trt_year"] = ""     // 就诊凭证编号
+	inputData["trt_month"] = ""    // 开始时间
+	inputData["startrow"] = "100"  // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	var inputLog string
+	bytesData, err := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	var url string
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "3261"
+	}
+
+	if insuplc_admdvs == "421300" {
+		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())
+		}
+		fmt.Println(string(out))
+		return hex.EncodeToString(out), inputLog
+	} else {
+
+		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+		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(), ""
+		}
+		fmt.Println(string(respBytes))
+		str := string(respBytes)
+		return str, inputLog
+
+	}
+
+}
+func Gdyb3262(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, otransid string) (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"] = "3262" // 交易编码
+
+	inputData["trt_year"] = year     // 就诊凭证编号
+	inputData["trt_month"] = ""      // 开始时间
+	inputData["otransid"] = otransid // 开始时间
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	var inputLog string
+	bytesData, err := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	var url string
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "3261"
+	}
+
+	if insuplc_admdvs == "421300" {
+		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())
+		}
+		fmt.Println(string(out))
+		return hex.EncodeToString(out), inputLog
+	} else {
+
+		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+		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(), ""
+		}
+		fmt.Println(string(respBytes))
+		str := string(respBytes)
+		return str, inputLog
+
+	}
+
+}

service/jsyb_service.go

@@ -201,12 +201,11 @@ func Jsyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		med_type = "11"
 	}
 
-	inputMessage["infno"] = "2203"     // 交易编码
-	inputData["mdtrt_id"] = mdtrtId    // 就诊 ID（来自2201接口返回）
-	inputData["psn_no"] = psnNo        // 人员编号 （来自1101接口返回）
-	inputData["med_type"] = med_type   // 医疗类别 16门诊特殊病
-	inputData["begntime"] = begin_time // 开始时间
-	//inputData["begntime"] =  // 开始时间
+	inputMessage["infno"] = "2203A"     // 交易编码
+	inputData["mdtrt_id"] = mdtrtId     // 就诊 ID（来自2201接口返回）
+	inputData["psn_no"] = psnNo         // 人员编号 （来自1101接口返回）
+	inputData["med_type"] = med_type    // 医疗类别 16门诊特殊病
+	inputData["begntime"] = begin_time  // 开始时间
 	inputData["main_cond_dscr"] = ""    // 主要病情描述
 	inputData["dise_codg"] = sick_code  // 病种编码
 	inputData["dise_name"] = sick_name  // 病种名称