controllers/ah/ahyb_controller.go

@@ -44,6 +44,23 @@ type Response struct {
 	State     struct{} `json:"state"`
 }
 
+
+type Body3513 struct {
+	ErrMsg      string                 `json:"err_msg"`
+	InfRefMsgID string                 `json:"inf_refmsgid"`
+	InfCode     int                    `json:"infcode"`
+	Output      []map[string]interface{} `json:"output"`
+}
+
+type Response1513 struct {
+	Body3513      Body3513     `json:"body"`
+	Code      int      `json:"code"`
+	CSBCode   int      `json:"csbCode"`
+	Message   string   `json:"message"`
+	RequestID string   `json:"requestId"`
+	State     struct{} `json:"state"`
+}
+
 func AHybRegistRouters() {
 	beego.Router("/ahyb/1101", &AHybController{}, "get:PostOne")
 	beego.Router("/ahyb/2201", &AHybController{}, "get:PostTwo")
@@ -473,22 +490,34 @@ func (c *AHybController) Get3511() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
-
-	result, request_log := service.Jsyb3511(struct3511)
-	saveJsLog(result, request_log, "3511", "库存查询", struct3511.OrgName)
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
-	} else {
+	result, inputLog := service.AHyb3511(struct3511, struct3511.RequestUrl)
+	saveJsLog(result, inputLog, "3511", "3511-查询", struct3511.OrgName)
+	var response Response1513
+	if err := json.Unmarshal([]byte(result), &response); err != nil {
+		fmt.Println("Error decoding JSON:", err)
+		return
 	}
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	if response.Code == 200 {
+		var dat2 map[string]interface{}
+		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
+		} else {
+
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"pre":    response.Body3513,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
+		})
+
 	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": "0",
+			"msg":    response.Message,
+		})
 
 	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-		"request_log": dat2,
-	})
 
 }
 func (c *AHybController) Get3512() {
@@ -506,30 +535,47 @@ func (c *AHybController) Get3512() {
 		return
 	}
 
-	result, request_log := service.Jsyb3512(struct3512)
-	saveJsLog(result, request_log, "3512", "3512查询", struct3512.OrgName)
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
-	} else {
+	result, inputLog := service.AHyb3512(struct3512, struct3512.RequestUrl)
+	saveJsLog(result, inputLog, "3512", "3512-查询", struct3512.OrgName)
+	var response Response1513
+	if err := json.Unmarshal([]byte(result), &response); err != nil {
+		fmt.Println("Error decoding JSON:", err)
+		return
 	}
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	if response.Code == 200 {
+		var dat2 map[string]interface{}
+		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
+		} else {
+
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"pre":    response.Body3513,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
+		})
+
 	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": "0",
+			"msg":    response.Message,
+		})
 
 	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-		"request_log": dat2,
-	})
 
 }
 func (c *AHybController) Get3513() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+	utils.ErrorLog("解析失败：%v", body)
+	utils.ErrorLog("解析失败：%v", string(body))
+
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 		return
 	}
+	utils.ErrorLog("解析失败：%v", "3333333")
 
 	userJSONBytes, _ := json.Marshal(respJSON["struct_3513s"])
 	var struct3513 models.Struct3513
@@ -537,22 +583,37 @@ func (c *AHybController) Get3513() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
+	utils.ErrorLog("解析失败：%v", "1111122222")
 
-	result, request_log := service.Jsyb3513(struct3513)
-	saveJsLog(result, request_log, "3513", "库存盘点", struct3513.OrgName)
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
-	} else {
+	result, inputLog := service.AHyb3513(struct3513, struct3513.RequestUrl)
+	saveJsLog(result, inputLog, "3513", "3513-查询", struct3513.OrgName)
+	var response Response1513
+	if err := json.Unmarshal([]byte(result), &response); err != nil {
+		fmt.Println("Error decoding JSON:", err)
+		return
 	}
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	if response.Code == 200 {
+		var dat2 map[string]interface{}
+		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
+		} else {
+
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"pre":    response.Body3513.Output,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
+		})
+
 	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": "0",
+			"msg":    response.Message,
+		})
 
 	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-		"request_log": dat2,
-	})
+
 
 }
 func (c *AHybController) Readcardcharge() {

controllers/sg/his_api_controller.go

@@ -34,6 +34,7 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
+	"github.com/go-ole/go-ole"
 )
 
 type HisApiController struct {
@@ -871,21 +872,31 @@ func (c *HisApiController) Get3511() {
 			})
 		}
 
-	} else {
-
-		result1, result2, _ := service.FJyb3511(struct3508)
-		saveLog(result1, result2, "3511", "3511")
-
+	} else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "340") {
 		var res models.Result3511
-		var respJSON2 map[string]interface{}
-		if err := json.Unmarshal([]byte(string(result1)), &respJSON2); err != nil {
+		//安徽
+		data := make(map[string]interface{})
+		data["struct_3511s"] = struct3508
+		client := &http.Client{}
+		bytesData, _ := json.Marshal(data)
+		var req *http.Request
+		req, _ = http.NewRequest("POST", miConfig.SecretKey+"ahyb/3511", bytes.NewReader(bytesData))
+		resp, _ := client.Do(req)
+		defer resp.Body.Close()
+		body, ioErr := ioutil.ReadAll(resp.Body)
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+		}
+		var respJSON map[string]interface{}
+		if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
 			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-		userJSONBytes2, _ := json.Marshal(respJSON2)
-		if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
+		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
 		}
@@ -899,44 +910,13 @@ func (c *HisApiController) Get3511() {
 				"info": res.Output,
 			})
 		}
-	}
-
-}
-func (c *HisApiController) Get3512() {
-	admin_user_id, _ := c.GetInt64("admin_user_id")
-	drug_id, _ := c.GetInt64("id")
-	start_time := c.GetString("start_time")
-	end_time := c.GetString("end_time")
-
-	adminUser := c.GetAdminUserInfo()
-	curRoles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	drug, _ := service.GetDrugByID(drug_id)
 
-	var struct3508 models.Struct3512
-	struct3508.FixmedinsCode = miConfig.Code
+	}else {
 
-	struct3508.OrgName = miConfig.OrgName
-	struct3508.AccessKey = miConfig.AccessKey
-	struct3508.Opter = curRoles.UserName
-	struct3508.RequestUrl = miConfig.Url
-	struct3508.Url = miConfig.Url
-	struct3508.AppId = miConfig.Cainfo
-	struct3508.AppSecret = miConfig.AppSecret
-	struct3508.Enckey = miConfig.EncKey
-	struct3508.SignKey = miConfig.SignKey
-	struct3508.SecretKey = miConfig.SecretKey
-	struct3508.MedListCodg = drug.MedicalInsuranceNumber
-	struct3508.Begndate = start_time
-	struct3508.Enddate = end_time
-	struct3508.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
-	struct3508.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
-
-	if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "440") { //广东
-		result1, result2 := service.Gdyb3512(struct3508, struct3508.SecretKey)
-		saveLog(result1, result2, "3512", "3512")
+		result1, result2, _ := service.FJyb3511(struct3508)
+		saveLog(result1, result2, "3511", "3511")
 
-		var res models.Result3512
+		var res models.Result3511
 		var respJSON2 map[string]interface{}
 		if err := json.Unmarshal([]byte(string(result1)), &respJSON2); err != nil {
 			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
@@ -959,37 +939,118 @@ func (c *HisApiController) Get3512() {
 				"info": res.Output,
 			})
 		}
+	}
 
-	} else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "350") {
+}
+func (c *HisApiController) Get3512() {
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	drug_id, _ := c.GetInt64("id")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
 
-		result1, result2, _ := service.FJyb3512(struct3508)
-		saveLog(result1, result2, "3512", "3512")
+	adminUser := c.GetAdminUserInfo()
+	curRoles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	drug, _ := service.GetDrugByIDTwo(drug_id,adminUser.CurrentOrgId)
+
+	var infos models.Output2
+	for _, item := range drug{
+		var struct3508 models.Struct3512
+		struct3508.FixmedinsCode = miConfig.Code
+
+		struct3508.OrgName = miConfig.OrgName
+		struct3508.AccessKey = miConfig.AccessKey
+		struct3508.Opter = curRoles.UserName
+		struct3508.RequestUrl = miConfig.Url
+		struct3508.Url = miConfig.Url
+		struct3508.AppId = miConfig.Cainfo
+		struct3508.AppSecret = miConfig.AppSecret
+		struct3508.Enckey = miConfig.EncKey
+		struct3508.SignKey = miConfig.SignKey
+		struct3508.SecretKey = miConfig.SecretKey
+		struct3508.MedListCodg = item.MedicalInsuranceNumber
+		struct3508.Begndate = start_time
+		struct3508.Enddate = end_time
+		struct3508.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+		struct3508.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+
+		if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "440") { //广东
+			result1, result2 := service.Gdyb3512(struct3508, struct3508.SecretKey)
+			saveLog(result1, result2, "3512", "3512")
+
+			var res models.Result3512
+			var respJSON2 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(result1)), &respJSON2); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			userJSONBytes2, _ := json.Marshal(respJSON2)
+			if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
-		var res models.Result3512
-		var respJSON2 map[string]interface{}
-		if err := json.Unmarshal([]byte(string(result1)), &respJSON2); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		userJSONBytes2, _ := json.Marshal(respJSON2)
-		if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		if res.Infcode == -1 {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"failed_code": -10,
-				"msg":         res.ErrMsg,
-			})
-		} else {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"info": res.Output,
-			})
-		}
+			infos = append(infos, res.Output...)
+
+
+		} else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "350") {
 
+			result1, result2, _ := service.FJyb3512(struct3508)
+			saveLog(result1, result2, "3512", "3512")
+
+			var res models.Result3512
+			var respJSON2 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(result1)), &respJSON2); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			userJSONBytes2, _ := json.Marshal(respJSON2)
+			if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			infos = append(infos, res.Output...)
+
+		}else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "340") {
+			var res models.Result3512
+			//安徽
+			data := make(map[string]interface{})
+			data["struct_3512s"] = struct3508
+			client := &http.Client{}
+			bytesData, _ := json.Marshal(data)
+			var req *http.Request
+			req, _ = http.NewRequest("POST", miConfig.SecretKey+"ahyb/3512", bytes.NewReader(bytesData))
+			resp, _ := client.Do(req)
+			defer resp.Body.Close()
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(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
+			}
+			infos = append(infos, res.Output...)
+		}
 	}
+	c.ServeSuccessJSON(map[string]interface{}{
+			"info": infos,
+	})
+
+
 
 }
 func (c *HisApiController) Get3513() {
@@ -1001,85 +1062,171 @@ func (c *HisApiController) Get3513() {
 	adminUser := c.GetAdminUserInfo()
 	curRoles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	drug, _ := service.GetDrugByID(drug_id)
+	//drug, _ := service.GetDrugByID(drug_id)
+	drug, _ := service.GetDrugByIDTwo(drug_id,adminUser.CurrentOrgId)
+
+	var infos models.Output3
+	for _, item := range drug {
+
+		var struct3508 models.Struct3513
+		struct3508.FixmedinsCode = miConfig.Code
+
+		struct3508.OrgName = miConfig.OrgName
+		struct3508.AccessKey = miConfig.AccessKey
+		struct3508.Opter = curRoles.UserName
+		struct3508.RequestUrl = miConfig.Url
+		struct3508.Url = miConfig.Url
+		struct3508.AppId = miConfig.Cainfo
+		struct3508.AppSecret = miConfig.AppSecret
+		struct3508.Enckey = miConfig.EncKey
+		struct3508.SignKey = miConfig.SignKey
+		struct3508.SecretKey = miConfig.SecretKey
+		struct3508.MedListCodg = item.MedicalInsuranceNumber
+		struct3508.Begndate = start_time
+		struct3508.Enddate = end_time
+		struct3508.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+		struct3508.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+		if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "440") { //广东
+			result1, result2 := service.Gdyb3513(struct3508, struct3508.SecretKey)
+			saveLog(result1, result2, "3513", "3513")
+
+			var res models.Result3513
+			var respJSON2 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(result1)), &respJSON2); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			userJSONBytes2, _ := json.Marshal(respJSON2)
+			if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			infos = append(infos, res.Output...)
 
-	var struct3508 models.Struct3513
-	struct3508.FixmedinsCode = miConfig.Code
+		} else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "350") {
 
-	struct3508.OrgName = miConfig.OrgName
-	struct3508.AccessKey = miConfig.AccessKey
-	struct3508.Opter = curRoles.UserName
-	struct3508.RequestUrl = miConfig.Url
-	struct3508.Url = miConfig.Url
-	struct3508.AppId = miConfig.Cainfo
-	struct3508.AppSecret = miConfig.AppSecret
-	struct3508.Enckey = miConfig.EncKey
-	struct3508.SignKey = miConfig.SignKey
-	struct3508.SecretKey = miConfig.SecretKey
-	struct3508.MedListCodg = drug.MedicalInsuranceNumber
-	struct3508.Begndate = start_time
-	struct3508.Enddate = end_time
-	struct3508.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
-	struct3508.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
-	if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "440") { //广东
-		result1, result2 := service.Gdyb3513(struct3508, struct3508.SecretKey)
-		saveLog(result1, result2, "3513", "3513")
+			result1, result2, _ := service.FJyb3513(struct3508)
+			saveLog(result1, result2, "3513", "3513")
 
-		var res models.Result3513
-		var respJSON2 map[string]interface{}
-		if err := json.Unmarshal([]byte(string(result1)), &respJSON2); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		userJSONBytes2, _ := json.Marshal(respJSON2)
-		if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		if res.Infcode == -1 {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"failed_code": -10,
-				"msg":         res.ErrMsg,
-			})
-		} else {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"info": res.Output,
-			})
-		}
+			var res models.Result3513
+			var respJSON2 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(result1)), &respJSON2); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			userJSONBytes2, _ := json.Marshal(respJSON2)
+			if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			infos = append(infos, res.Output...)
+		} else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "340") {
+			var res models.Result3513
+			//安徽
+			data := make(map[string]interface{})
+			data["struct_3513s"] = struct3508
+			client := &http.Client{}
+			bytesData, _ := json.Marshal(data)
+			var req *http.Request
+			req, _ = http.NewRequest("POST", miConfig.SecretKey+"ahyb/3513", bytes.NewReader(bytesData))
+			resp, _ := client.Do(req)
+			defer resp.Body.Close()
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(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
+			}
+			infos = append(infos, res.Output...)
 
-	} else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "350") {
+		}else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "361") { //
+			result1, result2 := service.JXyb3513(struct3508, struct3508.SecretKey, struct3508.AccessKey, struct3508.RequestUrl)
+			saveLog(result1, result2, "3513", "3513")
 
-		result1, result2, _ := service.FJyb3513(struct3508)
-		saveLog(result1, result2, "3513", "3513")
+			var res models.Result3513
+			var respJSON2 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(result1)), &respJSON2); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			userJSONBytes2, _ := json.Marshal(respJSON2)
+			if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			infos = append(infos, res.Output...)
 
-		var res models.Result3513
-		var respJSON2 map[string]interface{}
-		if err := json.Unmarshal([]byte(string(result1)), &respJSON2); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		userJSONBytes2, _ := json.Marshal(respJSON2)
-		if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		if res.Infcode == -1 {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"failed_code": -10,
-				"msg":         res.ErrMsg,
-			})
-		} else {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"info": res.Output,
-			})
 		}
+	}
+	type Newinfo struct {
+		FixmedinsCode  string
+		MedListCodg    string
+		MedinsListCodg string
+		MedinsListName string
+		FixmedinsBchno string
+		MdtrtId        string
+		MdtrtSetlType  string
+		BkkpSn         string
+		DrugTracCodg   string
+		PsnNo          string
+		PsnCertType    string
+		Certno         string
+		PsnName        string
+		Memo           string
+		TrdnFlag       string
+		UpdtTime       string
+		OpterName      string
+		Rid            string
+		CrteTime       string
+		OptTime        string
+		OpterId        string
+		CrterName      string
+		CrterId        string
+		OptinsNo       string
+	}
+	var Newinfos []Newinfo
+
+	for _, item := range infos {
+		var ni Newinfo
+		patient, _ := service.GetPatientByIDCard(item.Certno, c.GetAdminUserInfo().CurrentOrgId)
+
+		//patient, _ := service.GetPatientByIDCard(item.Certno, c.GetAdminUserInfo().CurrentOrgId)
 
+		numbers := strings.Split(item.FixmedinsBchno,"-")
+
+		flow := service.GetSaleDate(numbers[1])
+		ni.MdtrtId = item.MdtrtId
+		ni.UpdtTime = flow.SaleDate
+		ni.PsnName = patient.Name
+		ni.Certno = item.Certno
+		ni.MedinsListName = item.MedinsListName
+		ni.FixmedinsBchno = item.FixmedinsBchno
+		ni.DrugTracCodg = item.DrugTracCodg
+		ni.MedListCodg = patient.Name
+		Newinfos = append(Newinfos, ni)
 	}
 
+	c.ServeSuccessJSON(map[string]interface{}{
+			"info": Newinfos,
+	})
+
 }
 func (c *HisApiController) Get35081() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -1229,6 +1376,15 @@ func (c *HisApiController) FJ3501AND3502() {
 		return
 	}
 
+
+
+
+
+
+
+
+
+
 	//库盘
 
 	for _, drug := range drugs {
@@ -5215,7 +5371,7 @@ func (c *HisApiController) ChangeDrugTen() {
 						return
 					}
 					userJSONBytes3, _ := json.Marshal(respJSON3)
-					if c.GetAdminUserInfo().CurrentOrgId == 10265 || c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
+					if c.GetAdminUserInfo().CurrentOrgId == 10265 || c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 || c.GetAdminUserInfo().CurrentOrgId == 10633 {
 						if err := json.Unmarshal(userJSONBytes3, &res3507for10188); err != nil {
 							utils.ErrorLog("解析失败：%v", err)
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -5872,6 +6028,11 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 		struct3505.PharName = "易圣"
 		struct3505.PharPracCertNo = "D430726002209"
 	}
+
+	if org_id == 10633 {
+		struct3505.PharName = "王敏"
+		struct3505.PharPracCertNo = "342222199107214042"
+	}
 	order := service.GetHisOrderByNumber(pre.BatchNumber)
 	struct3505.SetlId = order.SetlId
 	struct3505.MdtrtSn = order.MdtrtId
@@ -5895,7 +6056,7 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 
 	}
 
-	if org_id == 10610 || org_id == 10278 || org_id == 10138 || org_id == 10537 || org_id == 10028 {
+	if org_id == 10610 || org_id == 10278 || org_id == 10138 || org_id == 10537 || org_id == 10028 || org_id == 10191 {
 
 		if drug.HisDoctorAdviceInfo.BaseDrugLib.IsZeroFlag == 1 {
 			struct3505.TrdnFlag = "1"
@@ -13462,7 +13623,7 @@ func Checkgd3101(c *HisApiController, patient_id int64, his_patient_id int64, ad
 		for _, item := range prescriptions {
 			for _, subItem := range item.HisDoctorAdviceInfo {
 				if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 {
-					spec := (subItem.BaseDrugLib.Dose + subItem.BaseDrugLib.DoseUnit) + "*" + strconv.FormatInt(subItem.BaseDrugLib.MinNumber, 10) + subItem.BaseDrugLib.MinUnit + "/" + subItem.BaseDrugLib.MaxUnit
+					spec := (subItem.BaseDrugLib.Dose + subItem.BaseDrugLib.DoseUnit) + "/" + strconv.FormatInt(subItem.BaseDrugLib.MinNumber, 10) + subItem.BaseDrugLib.MinUnit
 
 					var order models.FsiOrderDtos
 					order.RxID = strconv.FormatInt(item.ID, 10)
@@ -13498,8 +13659,8 @@ func Checkgd3101(c *HisApiController, patient_id int64, his_patient_id int64, ad
 			for _, subItem := range item.HisPrescriptionProject {
 				if subItem.Type == 2 && len(subItem.HisProject.MedicalCode) > 0 {
 					var order models.FsiOrderDtos
-					order.RxID = strconv.FormatInt(item.ID, 10)
-					order.Rxno = strconv.FormatInt(item.ID, 10)
+					order.RxID = strconv.FormatInt(subItem.ID, 10)
+					order.Rxno = strconv.FormatInt(subItem.ID, 10)
 					order.LongDrordFlag = "0"
 					order.HilistType = "201"
 					order.ChrgType = "1"
@@ -21480,8 +21641,12 @@ type CustomFundPay struct {
 func (c *HisApiController) GetbatchSettleList() {
 	//order_id, _ := c.GetInt64("order_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+	start_date := c.GetString("start_date")
+	end_date := c.GetString("end_date")
 
-	orders, _ := service.GetAllHisOrderTwo10485()
+
+
+	orders, _ := service.GetAllHisOrderTwo10485(start_date,end_date)
 
 	for _, item := range orders {
 
@@ -28559,7 +28724,7 @@ func (c *HisApiController) GetRegisterInfo() {
 					}
 					var result string
 					var requestLog string
-					if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" || miConfig.Code == "H44082500483" || miConfig.Code == "H44030702287" || miConfig.Code == "H44030304882" {
+					if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" || miConfig.Code == "H44082500483" || miConfig.Code == "H44030702287" || miConfig.Code == "H44030304882"  || miConfig.Code == "H44090200998"{
 						var hisPrescription []*models.HisPrescription
 						res3101 := Checkgd3101ForOne(c, patient.ID, his, admin_user_id, "1", record_time, hisPrescription, department)
 						if res3101.Infcode == 0 {
@@ -32220,7 +32385,7 @@ func (c *HisApiController) GetUploadInfo() {
 					}
 					result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "", admin_user_id)
 				} else {
-					if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" || miConfig.Code == "H44082500483" || miConfig.Code == "H44030702287" || miConfig.Code == "H44030304882" {
+					if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" || miConfig.Code == "H44082500483" || miConfig.Code == "H44030702287" || miConfig.Code == "H44030304882" ||  miConfig.Code == "H44090200998"{
 						result3101 := Checkgd3102(c, id, his_patient_id, admin_user_id, "7", tempOrder.ID)
 						if result3101.Infcode == 0 {
 							if len(result3101.Output.Result) > 0 {
@@ -34245,7 +34410,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 						res.Infcode = infocode
 
 					} else {
-						if miConfig.Code == "H44030903432" || miConfig.Code == "H44030501364" || miConfig.Code == "H44030500255" || miConfig.Code == "H44082500483" || miConfig.Code == "H44030702287" || miConfig.Code == "H44030304882" {
+						if miConfig.Code == "H44030903432" || miConfig.Code == "H44030501364" || miConfig.Code == "H44030500255" || miConfig.Code == "H44082500483" || miConfig.Code == "H44030702287" || miConfig.Code == "H44030304882" || miConfig.Code == "H44090200998" {
 							result3101 := Checkgd3101(c, id, his_patient_id, admin_user_id, "2", record_time, prescriptions)
 							if result3101.Infcode == 0 {
 								if len(result3101.Output.Result) > 0 {
@@ -34421,7 +34586,8 @@ func (c *HisApiController) GetPreUploadInfo() {
 				for _, item := range prescriptions {
 					if item.Type == 1 { //药品
 						for _, subItem := range item.HisDoctorAdviceInfo {
-							price, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", subItem.Price), 64)
+							price, _ := strconv.ParseFloat(fmt.Sprintf("%.4f", subItem.Price), 64)
+
 							total_one := price * subItem.PrescribingNumber
 							fmt.Println("subItem")
 							fmt.Println(subItem.Price)
@@ -34438,7 +34604,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 						for _, subItem := range item.HisPrescriptionProject {
 							cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-							price, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", subItem.Price), 64)
+							price, _ := strconv.ParseFloat(fmt.Sprintf("%.4f", subItem.Price), 64)
 							total_one := price * cnt
 							total = total + total_one
 						}
@@ -35947,7 +36113,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 							allTotal = fmt.Sprintf("%.2f", total_two)
-							if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" || miConfig.Code == "H44082500483" || miConfig.Code == "H44030702287" || miConfig.Code == "H44030304882" {
+							if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" || miConfig.Code == "H44082500483" || miConfig.Code == "H44030702287" || miConfig.Code == "H44030304882" || miConfig.Code == "H44090200998" {
 
 								result3101 := Checkgd3102(c, id, his_patient_id, admin_user_id, "6", order.ID)
 								if result3101.Infcode == 0 {
@@ -38997,7 +39163,7 @@ func (c *HisApiController) GetCheckAccount() {
 	var res10188 ResultEightFor10188
 	if config.IsOpen == 1 {
 		if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" || miConfig.MdtrtareaAdmvs == "320830" {
-			api := "http://192.168.2.3:9532/" + "jsyb/3201?" +
+			api :=  miConfig.AppSecret + "jsyb/3201?" +
 				"insutype=" + insutype +
 				"&clr_type=" + clr_type +
 				"&setl_optins=" + clr_org +
@@ -39286,7 +39452,7 @@ func (c *HisApiController) GetCheckAccount() {
 				return
 			}
 
-		} else if miConfig.MdtrtareaAdmvs == "360302" {
+		} else if miConfig.MdtrtareaAdmvs == "360100" {
 
 			//orders_two, _ := service.GetOrderByTimeFive(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, "", clr_type, miConfig.MdtrtareaAdmvs)
 			//fixmedins_setl_cnt := int64(len(orders_two))
@@ -39312,14 +39478,12 @@ func (c *HisApiController) GetCheckAccount() {
 			baseParams.Doctor = role.UserName
 			baseParams.RequestUrl = miConfig.Url
 
-			if clr_type == "9903" {
-				clr_type = "9901"
-			}
+
 
 			businessParams := models.BusinessParams{
 				Insutype:         insutype,
 				ClrType:          clr_type,
-				SetlOptins:       "360302",
+				SetlOptins:       "360102",
 				StmtBegndate:     start_time,
 				StmtEnddate:      end_time,
 				MedfeeSumamt:     0,
@@ -39400,7 +39564,7 @@ func (c *HisApiController) GetCheckAccount() {
 				return
 			}
 
-		} else if miConfig.MdtrtareaAdmvs == "360100" {
+		} else if miConfig.MdtrtareaAdmvs == "360106" {
 
 			//orders_two, _ := service.GetOrderByTimeFive(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, "", clr_type, miConfig.MdtrtareaAdmvs)
 			//fixmedins_setl_cnt := int64(len(orders_two))
@@ -39433,7 +39597,7 @@ func (c *HisApiController) GetCheckAccount() {
 			businessParams := models.BusinessParams{
 				Insutype:         insutype,
 				ClrType:          clr_type,
-				SetlOptins:       "360100",
+				SetlOptins:       "360102",
 				StmtBegndate:     start_time,
 				StmtEnddate:      end_time,
 				MedfeeSumamt:     0,

main.go

@@ -77,6 +77,8 @@ func main() {
 
 	//深圳百霖
 	//GetblBatchSettleList()
+	//GetblpgBatchSettleList()
+
 	//GetblbrBatchSettleList()
 	//深圳百霖贝尔
 	//GetblbrBatchSettleList()
@@ -707,10 +709,231 @@ type ResultSeventeen struct {
 //
 func GetblBatchSettleList() {
 	org_id, _ := beego.AppConfig.Int64("org_id")
-	org_id = 10610
+	org_id = 9504
 	var orders []*models.HisOrder
 	//var orders []*models.HisOrderError
 	orders, _ = service.GetAllHisOrder10138()
+	for _, item := range orders {
+		order_id := item.ID
+		order, _ := service.GetHisOrderByIDTwo(order_id)
+		if order.MedType == "14" {
+			his, _ := service.GetHisPatientByNumber(order.MdtrtId)
+			var patientPrescription models.HisPrescriptionInfo
+			patientPrescription, _ = service.FindLastPatientPrescriptionInfo(order.UserOrgId, order.PatientId, order.SettleAccountsDate)
+			doctor_info, _ := service.GetAdminUserInfoByID(order.UserOrgId, patientPrescription.DoctorId)
+			department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+			miConfig, _ := service.FindMedicalInsuranceInfo(order.UserOrgId)
+			var configTwo []*models.HisXtDiagnoseConfig
+			diagnosis_idstwo := strings.Split(his.Diagnosis, ",")
+			curRoles, _ := service.GetAdminUserInfoByID(org_id, 5488)
+			for _, item := range diagnosis_idstwo {
+				id, _ := strconv.ParseInt(item, 10, 64)
+				diagnosisConfig, _ := service.FindDiagnoseById(id)
+				configTwo = append(configTwo, &diagnosisConfig)
+			}
+			patient, _ := service.GetPatientByIDTwo(9504, order.PatientId)
+
+			sickConfig, _ := service.FindSickById(his.SickType)
+			//if order.MedType == "1111" || order.MedType == "1112" {
+			//	order.MedType = "11"
+			//}
+			service.Gdyb2203d(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, "14", doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, curRoles.UserName, configTwo, time.Unix(his.RecordDate, 0).Format("2006-01-02 15:04:05"))
+
+			depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
+			pre, _ := service.GetNewHisPrescriptionByNumber(order.Number)
+			doctor, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
+			if order.ID == 0 {
+				return
+			}
+			if his.BalanceAccountsType == 2 {
+				continue
+			}
+
+			ID := strconv.FormatInt(int64(order.ID), 10)
+
+			struct4101 := service.Struct4101{
+				PsnNo:          order.PsnNo,
+				MdtrtId:        order.MdtrtId,
+				SetlId:         order.SetlId,
+				PsnName:        order.PsnName,
+				Gend:           order.Gend,
+				Brdy:           his.Brdy,
+				Age:            his.Age,
+				Naty:           order.Naty,
+				PatnCertType:   order.PsnCertType,
+				Certno:         order.Certno,
+				Prfs:           "90",
+				ConerName:      "",
+				PatnRlts:       "",
+				ConerAddr:      "",
+				ConerTel:       "",
+				HiType:         order.Insutype,
+				Insuplc:        his.InsuplcAdmdvs,
+				MaindiagFlag:   "1",
+				BillCode:       "000"+ID,
+				BillNo:         "000"+ID,
+				BizSn:          order.Number,
+				PsnSelfPay:     order.PsnPartAmt,
+				PsnOwnPay:      order.PsnPartAmt,
+				AcctPay:        order.AcctPay,
+				PsnCashpay:     order.PsnCashPay,
+				HiPaymtd:       "1",
+				Hsorg:          his.InsuplcAdmdvs,
+				HsorgOpter:     his.InsuplcAdmdvs,
+				MedinsFillPsn:  curRoles.UserName,
+				MedinsFillDept: depart.Name,
+				IptMedType:     "2",
+				CurAddr:        patient.HomeAddress,
+			}
+
+			struct4101.SetlBegnDate = order.SetlTime
+			struct4101.SetlEndDate = order.SetlTime
+
+			var rf []CustomFundPay
+			json.Unmarshal([]byte(order.SetlDetail), &rf)
+
+			//var tempFunPays []service.CustomStruct
+			//var tempFunPay610100 service.CustomStruct
+
+			//for _, item := range rf {
+			//	if item.FundPayType == "610100" {
+			//		tempFunPay610100.FundPayamt, _ = decimal.NewFromFloat(tempFunPay610100.FundPayamt).Add(decimal.NewFromFloat(item.FundPayamt)).Float64()
+			//		tempFunPay610100.FundPayType = item.FundPayType
+			//	} else {
+			//		var tempFunPay service.CustomStruct
+			//		tempFunPay.FundPayamt = item.FundPayamt
+			//		tempFunPay.FundPayType = item.FundPayType
+			//		tempFunPays = append(tempFunPays, tempFunPay)
+			//	}
+			//}
+			//tempFunPays = append(tempFunPays, tempFunPay610100)
+			//struct4101.CustomStruct = tempFunPays
+
+			var tempDiaginfos []service.DiaginfoStructTwo
+			var tempOpspdiseinfo2 service.OpspdiseinfoStruct
+			var tempOpspdiseinfos []service.OpspdiseinfoStruct
+
+			diagnosis_ids := strings.Split(his.Diagnosis, ",")
+			var config []*models.HisXtDiagnoseConfig
+			for _, item := range diagnosis_ids {
+				id, _ := strconv.ParseInt(item, 10, 64)
+				if id == 24 {
+
+					diagnosisConfig, _ := service.FindDiagnoseById(id)
+					config = append(config, &diagnosisConfig)
+				}
+
+			}
+
+			for _, item := range diagnosis_ids {
+
+				id, _ := strconv.ParseInt(item, 10, 64)
+				if id != 24 {
+					diagnosisConfig, _ := service.FindDiagnoseById(id)
+					config = append(config, &diagnosisConfig)
+				}
+
+			}
+
+			for index, item := range config {
+				if index == 0 {
+					var tempDiaginfo service.DiaginfoStructTwo
+					tempDiaginfo.DiagCode = item.CountryCode
+					tempDiaginfo.DiagName = item.CountryContentName
+					tempDiaginfo.DiagType = "1"
+					tempDiaginfo.MaindiagFlag = "1"
+					tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+				} else {
+
+					var tempDiaginfo service.DiaginfoStructTwo
+					tempDiaginfo.DiagCode = item.CountryCode
+					tempDiaginfo.DiagName = item.CountryContentName
+					tempDiaginfo.DiagType = "1"
+					tempDiaginfo.MaindiagFlag = "0"
+					tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+				}
+			}
+			struct4101.Diseinfo = tempDiaginfos
+			sickConfigTwo, _ := service.FindSickById(his.SickType)
+			tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
+			tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
+			tempOpspdiseinfo2.OprnOprtCode = ""
+			tempOpspdiseinfo2.OprnOprtName = ""
+			tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)
+			struct4101.OpspdiseinfoStruct = tempOpspdiseinfos
+			time_arr := strings.Split(order.SetlTime, " ")
+			struct4101.AdmTime = time_arr[0]
+			struct4101.AdmEndTime = time_arr[0]
+			struct4101.DoctorName = doctor.UserName
+			struct4101.DoctorCode = doctor.DoctorNumber
+
+			struct4101.Ntly = "CHN"
+			struct4101.AdmCaty = "A03.06"
+			var res ResultSeventeen
+
+			result, request := service.Gdyb4101For10138(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, org_id)
+			fmt.Println(result)
+			saveLog(result, request, "4101A", "清单上传")
+			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)
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				//utils.ErrorLog("解析失败：%v", err)
+				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				//adminUser := c.GetAdminUserInfo()
+				errlog := &models.HisOrderError{
+					UserOrgId: org_id,
+					Ctime:     time.Now().Unix(),
+					Mtime:     time.Now().Unix(),
+					ErrMsg:    res.ErrMsg + "解析失败",
+					Status:    1,
+					PatientId: order_id,
+					Stage:     10138600,
+				}
+				service.CreateErrMsgLog(errlog)
+				continue
+			}
+
+			if res.Infcode != 0 {
+				//adminUser := c.GetAdminUserInfo()
+				errlog := &models.HisOrderError{
+					UserOrgId: org_id,
+					Ctime:     time.Now().Unix(),
+					Mtime:     time.Now().Unix(),
+					ErrMsg:    res.ErrMsg,
+					Status:    1,
+					PatientId: order_id,
+					Stage:     10138600,
+				}
+				service.CreateErrMsgLog(errlog)
+				continue
+			} else {
+				hisFundSettleListResult := &models.HisFundSettleListResult{
+					Number:    res.Output.SetlListId,
+					Status:    1,
+					Ctime:     time.Now().Unix(),
+					Mtime:     time.Now().Unix(),
+					UserOrgId: org_id,
+					IsUpload:  1,
+					OrderId:   order_id,
+				}
+				service.CreateUploadRecord(hisFundSettleListResult)
+				continue
+			}
+		}
+	}
+}
+
+func GetblpgBatchSettleList() {
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	org_id = 10610
+	var orders []*models.HisOrder
+	//var orders []*models.HisOrderError
+	orders, _ = service.GetAllHisOrder10610()
 	for _, item := range orders {
 		order_id := item.ID
 		order, _ := service.GetHisOrderByIDTwo(order_id)
@@ -746,6 +969,8 @@ func GetblBatchSettleList() {
 			if his.BalanceAccountsType == 2 {
 				continue
 			}
+			ID := strconv.FormatInt(int64(order.ID), 10)
+
 			struct4101 := service.Struct4101{
 				PsnNo:          order.PsnNo,
 				MdtrtId:        order.MdtrtId,
@@ -765,8 +990,8 @@ func GetblBatchSettleList() {
 				HiType:         order.Insutype,
 				Insuplc:        his.InsuplcAdmdvs,
 				MaindiagFlag:   "1",
-				BillCode:       order.SetlId,
-				BillNo:         order.SetlId,
+				BillCode:      "000" +ID,
+				BillNo:        "000" +ID,
 				BizSn:          order.Number,
 				PsnSelfPay:     order.PsnPartAmt,
 				PsnOwnPay:      order.PsnPartAmt,
@@ -963,7 +1188,10 @@ func GetblbrBatchSettleList() {
 			}
 			if his.BalanceAccountsType == 2 {
 				continue
+
 			}
+			ID := strconv.FormatInt(int64(order.ID), 10)
+
 			struct4101 := service.Struct4101{
 				PsnNo:          order.PsnNo,
 				MdtrtId:        order.MdtrtId,
@@ -983,8 +1211,8 @@ func GetblbrBatchSettleList() {
 				HiType:         order.Insutype,
 				Insuplc:        his.InsuplcAdmdvs,
 				MaindiagFlag:   "1",
-				BillCode:       order.SetlId,
-				BillNo:         order.SetlId,
+				BillCode:      "000" +ID,
+				BillNo:        "000" +ID,
 				BizSn:          order.Number,
 				PsnSelfPay:     order.PsnPartAmt,
 				PsnOwnPay:      order.PsnPartAmt,

models/models_3501.go

@@ -673,57 +673,61 @@ type Struct3511 struct {
 	Enckey         string
 }
 
+
+type Output     []struct {
+	ExpyEnd          string  `json:"expy_end,omitempty"`                    // 有效期止
+	PharCertType     string  `json:"phar_cert_type" validate:"required"`    // 药师证件类型
+	SelRetnOpterName string  `json:"sel_retn_opter_name,omitempty"`         // 销售/退货经办人姓名
+	MedListCodg      string  `json:"med_list_codg,omitempty"`               // 医疗目录编码
+	PoolareaNo       string  `json:"poolarea_no,omitempty"`                 // 统筹区编号
+	SetlId           string  `json:"setl_id,omitempty"`                     // 结算ID
+	CrteOptinsNo     string  `json:"crte_optins_no,omitempty"`              // 创建机构编号
+	MedinsListCodg   string  `json:"medins_list_codg,omitempty"`            // 医药机构目录编码
+	Memo             string  `json:"memo,omitempty"`                        // 备注
+	UpdtTime         string  `json:"updt_time,omitempty"`                   // 数据更新时间
+	HiFeesetlType    string  `json:"hi_feesetl_type" validate:"required"`   // 医保费用结算类型
+	ManuDate         string  `json:"manu_date,omitempty"`                   // 生产日期
+	OpterName        string  `json:"opter_name,omitempty"`                  // 经办人姓名
+	PsnNo            string  `json:"psn_no,omitempty"`                      // 人员编号
+	Rid              string  `json:"rid,omitempty"`                         // 数据唯一记录号
+	CrteTime         string  `json:"crte_time,omitempty"`                   // 数据创建时间
+	PharCertno       string  `json:"phar_certno,omitempty"`                 // 药师证件号码
+	ValiFlag         string  `json:"vali_flag" validate:"required"`         // 有效标志
+	Certno           string  `json:"certno,omitempty"`                      // 证件号码
+	FixmedinsCode    string  `json:"fixmedins_code" validate:"required"`    // 定点医药机构编号
+	RxFlag           string  `json:"rx_flag" validate:"required"`           // 处方药标志
+	PharPracCertNo   string  `json:"phar_prac_cert_no,omitempty"`           // 药师执业资格证号
+	ListSpItemFlag   string  `json:"list_sp_item_flag" validate:"required"` // 目录特项标志
+	FixmedinsBchno   string  `json:"fixmedins_bchno,omitempty"`             // 定点医药机构批次流水号
+	OptTime          string  `json:"opt_time,omitempty"`                    // 经办时间
+	PsnName          string  `json:"psn_name,omitempty"`                    // 人员姓名
+	ElecSupnCodg     string  `json:"elec_supn_codg,omitempty"`              // 电子监管编码
+	BilgDrName       string  `json:"bilg_dr_name,omitempty"`                // 开单医师姓名
+	OpterId          string  `json:"opter_id,omitempty"`                    // 经办人ID
+	ManuLotnum       string  `json:"manu_lotnum,omitempty"`                 // 生产批号
+	MedinsListName   string  `json:"medins_list_name,omitempty"`            // 医药机构目录名称
+	PsnCertType      string  `json:"psn_cert_type" validate:"required"`     // 人员证件类型
+	SelRetnTime      string  `json:"sel_retn_time,omitempty"`               // 销售/退货时间
+	SelRetnCnt       float64 `json:"sel_retn_cnt,omitempty"`                // 销售/退货数量
+	CrterName        string  `json:"crter_name,omitempty"`                  // 创建人姓名
+	PharName         string  `json:"phar_name,omitempty"`                   // 药师姓名
+	PrscDrCertType   string  `json:"prsc_dr_cert_type" validate:"required"` // 开单医师证件类型
+	CrterId          string  `json:"crter_id,omitempty"`                    // 创建人ID
+	PrscDrCertno     string  `json:"prsc_dr_certno,omitempty"`              // 开单医师证件号码
+	OptinsNo         string  `json:"optins_no,omitempty"`                   // 经办机构编号
+	TrdnFlag         string  `json:"trdn_flag" validate:"required"`         // 拆零标志
+	FinlTrnsPric     float64 `json:"finl_trns_pric,omitempty"`              // 最终成交单价
+	MedinsProdSelNo  string  `json:"medins_prod_sel_no,omitempty"`          // 定点医药机构商品销售流水号
+
+}
+
+
 type Result3511 struct {
 	Cainfo      interface{} `json:"cainfo"`
 	ErrMsg      string      `json:"err_msg"`
 	InfRefmsgid string      `json:"inf_refmsgid"`
 	Infcode     int64       `json:"infcode"`
-	Output      []struct {
-		ExpyEnd          string  `json:"expy_end,omitempty"`                    // 有效期止
-		PharCertType     string  `json:"phar_cert_type" validate:"required"`    // 药师证件类型
-		SelRetnOpterName string  `json:"sel_retn_opter_name,omitempty"`         // 销售/退货经办人姓名
-		MedListCodg      string  `json:"med_list_codg,omitempty"`               // 医疗目录编码
-		PoolareaNo       string  `json:"poolarea_no,omitempty"`                 // 统筹区编号
-		SetlId           string  `json:"setl_id,omitempty"`                     // 结算ID
-		CrteOptinsNo     string  `json:"crte_optins_no,omitempty"`              // 创建机构编号
-		MedinsListCodg   string  `json:"medins_list_codg,omitempty"`            // 医药机构目录编码
-		Memo             string  `json:"memo,omitempty"`                        // 备注
-		UpdtTime         string  `json:"updt_time,omitempty"`                   // 数据更新时间
-		HiFeesetlType    string  `json:"hi_feesetl_type" validate:"required"`   // 医保费用结算类型
-		ManuDate         string  `json:"manu_date,omitempty"`                   // 生产日期
-		OpterName        string  `json:"opter_name,omitempty"`                  // 经办人姓名
-		PsnNo            string  `json:"psn_no,omitempty"`                      // 人员编号
-		Rid              string  `json:"rid,omitempty"`                         // 数据唯一记录号
-		CrteTime         string  `json:"crte_time,omitempty"`                   // 数据创建时间
-		PharCertno       string  `json:"phar_certno,omitempty"`                 // 药师证件号码
-		ValiFlag         string  `json:"vali_flag" validate:"required"`         // 有效标志
-		Certno           string  `json:"certno,omitempty"`                      // 证件号码
-		FixmedinsCode    string  `json:"fixmedins_code" validate:"required"`    // 定点医药机构编号
-		RxFlag           string  `json:"rx_flag" validate:"required"`           // 处方药标志
-		PharPracCertNo   string  `json:"phar_prac_cert_no,omitempty"`           // 药师执业资格证号
-		ListSpItemFlag   string  `json:"list_sp_item_flag" validate:"required"` // 目录特项标志
-		FixmedinsBchno   string  `json:"fixmedins_bchno,omitempty"`             // 定点医药机构批次流水号
-		OptTime          string  `json:"opt_time,omitempty"`                    // 经办时间
-		PsnName          string  `json:"psn_name,omitempty"`                    // 人员姓名
-		ElecSupnCodg     string  `json:"elec_supn_codg,omitempty"`              // 电子监管编码
-		BilgDrName       string  `json:"bilg_dr_name,omitempty"`                // 开单医师姓名
-		OpterId          string  `json:"opter_id,omitempty"`                    // 经办人ID
-		ManuLotnum       string  `json:"manu_lotnum,omitempty"`                 // 生产批号
-		MedinsListName   string  `json:"medins_list_name,omitempty"`            // 医药机构目录名称
-		PsnCertType      string  `json:"psn_cert_type" validate:"required"`     // 人员证件类型
-		SelRetnTime      string  `json:"sel_retn_time,omitempty"`               // 销售/退货时间
-		SelRetnCnt       float64 `json:"sel_retn_cnt,omitempty"`                // 销售/退货数量
-		CrterName        string  `json:"crter_name,omitempty"`                  // 创建人姓名
-		PharName         string  `json:"phar_name,omitempty"`                   // 药师姓名
-		PrscDrCertType   string  `json:"prsc_dr_cert_type" validate:"required"` // 开单医师证件类型
-		CrterId          string  `json:"crter_id,omitempty"`                    // 创建人ID
-		PrscDrCertno     string  `json:"prsc_dr_certno,omitempty"`              // 开单医师证件号码
-		OptinsNo         string  `json:"optins_no,omitempty"`                   // 经办机构编号
-		TrdnFlag         string  `json:"trdn_flag" validate:"required"`         // 拆零标志
-		FinlTrnsPric     float64 `json:"finl_trns_pric,omitempty"`              // 最终成交单价
-		MedinsProdSelNo  string  `json:"medins_prod_sel_no,omitempty"`          // 定点医药机构商品销售流水号
-
-	} `json:"output"`
+	Output     Output	`json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`
 	RespondTime string      `json:"respond_time"`
 	Signtype    interface{} `json:"signtype"`
@@ -754,24 +758,27 @@ type Struct3512 struct {
 	Enckey     string
 }
 
+type Output2      []struct {
+	FixmedinsCode  string
+	MedinsListCodg string
+	FixmedinsBchno string
+	MedListCodg    string
+	MedinsListName string
+	DrugTracCodg   string
+	ValiFlag       string
+	OpterId        string
+	CrterName      string
+	CrterId        string
+	OptinsNo       string
+}
+
+
 type Result3512 struct {
 	Cainfo      interface{} `json:"cainfo"`
 	ErrMsg      string      `json:"err_msg"`
 	InfRefmsgid string      `json:"inf_refmsgid"`
 	Infcode     int64       `json:"infcode"`
-	Output      []struct {
-		FixmedinsCode  string
-		MedinsListCodg string
-		FixmedinsBchno string
-		MedListCodg    string
-		MedinsListName string
-		DrugTracCodg   string
-		ValiFlag       string
-		OpterId        string
-		CrterName      string
-		CrterId        string
-		OptinsNo       string
-	} `json:"output"`
+	Output    Output2 `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`
 	RespondTime string      `json:"respond_time"`
 	Signtype    interface{} `json:"signtype"`
@@ -779,19 +786,18 @@ type Result3512 struct {
 }
 
 type Struct3513 struct {
-	FixmedinsCode  string `json:"fixmedins_code" validate:"required"` // 定点医药机构编号
-	MedinsListCodg string `json:"medins_list_codg,omitempty"`         // 医药机构目录编码
-	FixmedinsBchno string `json:"fixmedins_bchno,omitempty"`          // 定点医药机构批次流水号
-	Begndate       string `json:"begndate,omitempty"`                 // 开始日期
-	Enddate        string `json:"enddate,omitempty"`                  // 结束日期
-	MedListCodg    string `json:"med_list_codg,omitempty"`            // 医疗目录编码
-	MdtrtID        string `json:"mdtrt_id,omitempty"`                 // 就诊ID
-	PsnNo          string `json:"psn_no,omitempty"`                   // 人员编号
-	PsnCertType    string `json:"psn_cert_type" validate:"required"`  // 人员证件类型
-	Certno         string `json:"certno,omitempty"`                   // 证件号码
-	PsnName        string `json:"psn_name,omitempty"`                 // 人员姓名
-	DrugTracCodg   string `json:"drug_trac_codg,omitempty"`           // 药品追溯码
-
+	FixmedinsCode  string
+	MedinsListCodg string
+	FixmedinsBchno string
+	Begndate       string
+	Enddate        string
+	MedListCodg    string
+	MdtrtID        string
+	PsnNo          string
+	PsnCertType    string
+	Certno         string
+	PsnName        string
+	DrugTracCodg   string
 	OrgName        string
 	Opter          string
 	SecretKey      string
@@ -806,37 +812,39 @@ type Struct3513 struct {
 	SignKey        string
 	Enckey         string
 }
+type Output3     []struct {
+FixmedinsCode  string
+MedListCodg    string
+MedinsListCodg string
+MedinsListName string
+FixmedinsBchno string
+MdtrtId        string
+MdtrtSetlType  string
+BkkpSn         string
+DrugTracCodg   string
+PsnNo          string
+PsnCertType    string
+Certno         string
+PsnName        string
+Memo           string
+TrdnFlag       string
+UpdtTime       string
+OpterName      string
+Rid            string
+CrteTime       string
+OptTime        string
+OpterId        string
+CrterName      string
+CrterId        string
+OptinsNo       string
+}
+
 type Result3513 struct {
 	Cainfo      interface{} `json:"cainfo"`
 	ErrMsg      string      `json:"err_msg"`
 	InfRefmsgid string      `json:"inf_refmsgid"`
 	Infcode     int64       `json:"infcode"`
-	Output      []struct {
-		FixmedinsCode  string `json:"fixmedins_code,omitempty"`            // 定点医药机构编号
-		MedListCodg    string `json:"med_list_codg,omitempty"`             // 医疗目录编码
-		MedinsListCodg string `json:"medins_list_codg,omitempty"`          // 医药机构目录编码
-		MedinsListName string `json:"medins_list_name,omitempty"`          // 医药机构目录名称
-		FixmedinsBchno string `json:"fixmedins_bchno,omitempty"`           // 定点医药机构批次流水号
-		MdtrtId        string `json:"mdtrt_id,omitempty"`                  // 就诊ID
-		MdtrtSetlType  string `json:"mdtrt_setl_type" validate:"required"` // 就诊结算类型
-		BkkpSn         string `json:"bkkp_sn,omitempty"`                   // 记账流水号
-		DrugTracCodg   string `json:"drug_trac_codg,omitempty"`            // 药品追溯码
-		PsnNo          string `json:"psn_no,omitempty"`                    // 人员编号
-		PsnCertType    string `json:"psn_cert_type" validate:"required"`   // 人员证件类型
-		Certno         string `json:"certno,omitempty"`                    // 证件号码
-		PsnName        string `json:"psn_name,omitempty"`                  // 人员姓名
-		Memo           string `json:"memo,omitempty"`                      // 备注
-		TrdnFlag       string `json:"trdn_flag,omitempty"`                 // 拆零标志
-		UpdtTime       string `json:"updt_time,omitempty"`                 // 数据更新时间
-		OpterName      string `json:"opter_name,omitempty"`                // 经办人姓名
-		Rid            string `json:"rid,omitempty"`                       // 数据唯一记录号
-		CrteTime       string `json:"crte_time,omitempty"`                 // 数据创建时间
-		OptTime        string `json:"opt_time,omitempty"`                  // 经办时间
-		OpterId        string `json:"opter_id,omitempty"`                  // 经办人ID
-		CrterName      string `json:"crter_name,omitempty"`                // 创建人姓名
-		CrterId        string `json:"crter_id,omitempty"`                  // 创建人ID
-		OptinsNo       string `json:"optins_no,omitempty"`                 // 经办机构编号
-	} `json:"output"`
+	Output     Output3 `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`
 	RespondTime string      `json:"respond_time"`
 	Signtype    interface{} `json:"signtype"`

service/ahyb_service.go

@@ -3377,7 +3377,7 @@ func AHyb3507(struct3507 models.Struct3507) (string, string) {
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3507"                          // 交易编码
-	inputData["fixmedins_bchno"] = struct3507.FixmedinsCode // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_bchno"] = struct3507.FixmedinsBchno // 人员编号 （来自1101接口返回）
 	inputData["inv_data_type"] = struct3507.InvDataType     // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
@@ -3535,6 +3535,253 @@ func AHyb3505(struct3505 models.Struct3505, secret_key string, request_url strin
 	return str, string(bytesData)
 }
 
+
+func AHyb3511(struct3511 models.Struct3511, request_url string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	inputMessage := SetAHInputMessage(timestamp, struct3511.OrgName, struct3511.Opter, struct3511.FixmedinsCode, struct3511.InsuplcAdmdvs, struct3511.MdtrtareaAdmvs, struct3511.Cainfo)
+	// 生成输入报文
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3511"
+	inputData["fixmedins_code"] = struct3511.FixmedinsCode
+	inputData["medins_list_codg"] = struct3511.MedListCodg
+	inputData["fixmedins_bchno"] = ""
+	inputData["begndate"] = struct3511.Begndate
+	inputData["enddate"] = struct3511.Enddate
+	inputData["medins_prod_inv_no"] = ""
+	inputData["medins_list_name"] = ""
+	inputData["rx_flag"] = ""
+	inputData["list_sp_item_flag"] = ""
+	inputData["trdn_flag"] = ""
+	inputData["invdate"] = ""
+	inputData["manu_lotnum"] = ""
+	inputData["manu_date"] = ""
+	inputData["expy_end"] = ""
+	inputData["memo"] = ""
+	inputData["vali_flag"] = ""
+	inputData["rid"] = ""
+
+	inputData["crter_id"] = ""
+	inputData["crter_name"] = ""
+	inputData["crte_optins_no"] = ""
+	inputData["opter_id"] = ""
+	inputData["opter_name"] = ""
+	inputData["optins_no"] = ""
+	inputData["poolarea_no"] = ""
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["inv_data_type"] = ""
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	argInputMessage := make(map[string]interface{})
+	argInputMessage["arg0"] = inputMessage
+
+	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/5301"
+	request_url = request_url + "3511"
+
+	request, err := http.NewRequest("POST", request_url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+
+	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, string(bytesData)
+}
+func AHyb3512(struct3512 models.Struct3512, request_url string) (string, string) {
+	// 生成签名
+	//nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	//signature := setSignature(timestamp, nonce, secret_key)
+	inputMessage := SetAHInputMessage(timestamp, struct3512.OrgName, struct3512.Opter, struct3512.FixmedinsCode, struct3512.InsuplcAdmdvs, struct3512.MdtrtareaAdmvs, struct3512.Cainfo)
+
+	// 生成输入报文
+	//inputMessage := SetGdInputMessage(timestamp, struct3512.OrgName, struct3512.Opter, struct3512.FixmedinsCode, struct3512.InsuplcAdmdvs, struct3512.MdtrtareaAdmvs, struct3512.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3512"
+	inputData["fixmedins_code"] = struct3512.FixmedinsCode
+	//inputData["medins_list_codg"] = struct3512.MedinsListCodg
+	inputData["medins_list_codg"] = struct3512.MedListCodg
+	inputData["fixmedins_bchno"] = ""
+	inputData["begndate"] = struct3512.Begndate
+	inputData["enddate"] = struct3512.Enddate
+	inputData["medins_prod_inv_no"] = ""
+	inputData["medins_list_name"] = ""
+	inputData["rx_flag"] = ""
+	inputData["list_sp_item_flag"] = ""
+	inputData["trdn_flag"] = ""
+	inputData["invdate"] = ""
+	inputData["manu_lotnum"] = ""
+	inputData["manu_date"] = ""
+	inputData["expy_end"] = ""
+	inputData["memo"] = ""
+	inputData["vali_flag"] = ""
+	inputData["rid"] = ""
+
+	inputData["crter_id"] = ""
+	inputData["crter_name"] = ""
+	inputData["crte_optins_no"] = ""
+	inputData["opter_id"] = ""
+	inputData["opter_name"] = ""
+	inputData["optins_no"] = ""
+	inputData["poolarea_no"] = ""
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["inv_data_type"] = ""
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	argInputMessage := make(map[string]interface{})
+	argInputMessage["arg0"] = inputMessage
+
+	bytesData, err := json.Marshal(argInputMessage)
+	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/5301"
+	//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 + "3505"
+	request_url = request_url + "3512"
+
+	request, err := http.NewRequest("POST", request_url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+
+	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, string(bytesData)
+}
+
+func AHyb3513(struct3513 models.Struct3513, request_url string) (string, string) {
+	// 生成签名
+	//nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	//signature := setSignature(timestamp, nonce, secret_key)
+	inputMessage := SetAHInputMessage(timestamp, struct3513.OrgName, struct3513.Opter, struct3513.FixmedinsCode, struct3513.InsuplcAdmdvs, struct3513.MdtrtareaAdmvs, struct3513.Cainfo)
+
+	// 生成输入报文
+	//inputMessage := SetGdInputMessage(timestamp, struct3512.OrgName, struct3512.Opter, struct3512.FixmedinsCode, struct3512.InsuplcAdmdvs, struct3512.MdtrtareaAdmvs, struct3512.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3513"
+	inputData["fixmedins_code"] = struct3513.FixmedinsCode
+	//inputData["medins_list_codg"] = struct3512.MedinsListCodg
+	inputData["medins_list_codg"] = struct3513.MedListCodg
+	inputData["fixmedins_bchno"] = ""
+	inputData["begndate"] = struct3513.Begndate
+	inputData["enddate"] = struct3513.Enddate
+	inputData["medins_prod_inv_no"] = ""
+	inputData["medins_list_name"] = ""
+	inputData["rx_flag"] = ""
+	inputData["list_sp_item_flag"] = ""
+	inputData["trdn_flag"] = ""
+	inputData["invdate"] = ""
+	inputData["manu_lotnum"] = ""
+	inputData["manu_date"] = ""
+	inputData["expy_end"] = ""
+	inputData["memo"] = ""
+	inputData["vali_flag"] = ""
+	inputData["rid"] = ""
+
+	inputData["crter_id"] = ""
+	inputData["crter_name"] = ""
+	inputData["crte_optins_no"] = ""
+	inputData["opter_id"] = ""
+	inputData["opter_name"] = ""
+	inputData["optins_no"] = ""
+	inputData["poolarea_no"] = ""
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["inv_data_type"] = ""
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	argInputMessage := make(map[string]interface{})
+	argInputMessage["arg0"] = inputMessage
+
+	bytesData, err := json.Marshal(argInputMessage)
+	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/5301"
+	//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 + "3505"
+	request_url = request_url + "3513"
+
+	request, err := http.NewRequest("POST", request_url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+
+	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, string(bytesData)
+}
+
+
 func AHyb5101(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string,  request_url string, cainfo string) (string, string) {
 	fmt.Println(request_url)
 

service/fj_service.go

@@ -3019,27 +3019,37 @@ func FJyb3501(struct3501 models.Struct3501) (string, string, string) {
 
 	// 生成输入报文
 	//SetFjInputMessage
-	inputMessage := SetFjInputMessage(nonce, timestamp, struct3501.OrgName, struct3501.Opter, struct3501.FixmedinsHilistId, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Url, struct3501.AppId, struct3501.AppSecret, struct3501.SignKey, struct3501.Enckey)
+	inputMessage := SetFjInputMessage(nonce, timestamp, struct3501.OrgName, struct3501.Opter, struct3501.Code, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Url, struct3501.AppId, struct3501.AppSecret, struct3501.SignKey, struct3501.Enckey)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	druginputData := make(map[string]interface{})
+	//druginputData := make(map[string]interface{})
 	//druginputData2 := make(map[string]interface{})
 
 	inputMessage["infno"] = "3501"                                  // 交易编码
-	inputData["med_list_codg"] = struct3501.MedListCodg             // 定点医药机构目录编号
-	inputData["fixmedins_hilist_id"] = struct3501.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3501.OrgName         // 定点医药机构目录名称
-	inputData["rx_flag"] = struct3501.RxFlag                        //
-	inputData["invdate"] = struct3501.Invdate                       // 人员编号 （来自1101接口返回）
-	inputData["inv_cnt"] = struct3501.InvCnt                        // 人员编号 （来自1101接口返回）
-	inputData["manu_lotnum"] = struct3501.ManuLotnum                // 人员编号 （来自1101接口返回）
-	inputData["fixmedins_bchno"] = struct3501.FixmedinsBchno        // 人员编号 （来自1101接口返回）
-	inputData["manu_date"] = struct3501.ManuDate                    // 人员编号 （来自1101接口返回）
-	inputData["expy_end"] = struct3501.ExpyEnd                      // 人员编号 （来自1101接口返回）
-	inputData["memo"] = struct3501.Memo                             // 人员编号 （来自1101接口返回）
-	druginputData["drug_trac_codg"] = struct3501.DrugTracCodg
-	//druginputData2["drugtracinfo"] = druginputData
-	inputData["drug_trac_info"] = druginputData
+	inputData["med_list_codg"] = struct3501.MedListCodg                 // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3501.FixmedinsHilistId     // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3501.FixmedinsHilistName // 定点医药机构目录名称
+	inputData["rx_flag"] = struct3501.RxFlag                            //
+	inputData["invdate"] = struct3501.Invdate                           // 人员编号 （来自1101接口返回）
+	inputData["inv_cnt"] = struct3501.InvCnt                            // 人员编号 （来自1101接口返回）
+	inputData["manu_lotnum"] = struct3501.ManuLotnum                    // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_bchno"] = struct3501.FixmedinsBchno            // 人员编号 （来自1101接口返回）
+	inputData["manu_date"] = struct3501.ManuDate                        // 人员编号 （来自1101接口返回）
+	inputData["expy_end"] = struct3501.ExpyEnd                          // 人员编号 （来自1101接口返回）
+	inputData["memo"] = ""                              // 人员编号 （来自1101接口返回）
+
+	feedetail := make([]map[string]interface{}, 0)
+
+	codes := strings.Split(struct3501.DrugTracCodg, ",")
+	for _, item := range codes {
+		if len(item) > 0 {
+
+			druginputData := make(map[string]interface{})
+			druginputData["drug_trac_codg"] =  removeNonDigits(item)
+			feedetail = append(feedetail, druginputData)
+		}
+	}
+	inputData["drugtracinfo"] = feedetail
 	input["invinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)

service/gdyb_zifei_service.go

@@ -502,7 +502,7 @@ func Gdyb4205(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		inputData["prd_days"] = ""
 		inputData["medc_way_dscr"] = ""
 		inputData["memo"] = item.Memo
-		inputData["fulamt_ownpay_amt"] = ""
+		inputData["fulamt_ownpay_amt"] =  item.DetItemFeeSumamt
 		inputData["overlmt_selfpay"] = ""
 		inputData["preselfpay_amt"] = ""
 		inputData["inscp_amt"] = ""

service/his_service.go

@@ -1570,7 +1570,12 @@ func GetAllHisOrder10106(org_id int64) (his []*models.HisOrder, err error) {
 	return
 }
 func GetAllHisOrder10138() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10610  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2024-12-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 9504  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-02-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	fmt.Println(err)
+	return
+}
+func GetAllHisOrder10610() (his []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10610  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-01-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1581,7 +1586,7 @@ func GetOrderError10138() (order []*models.HisOrderError, err error) {
 
 func GetAllHisOrder10278() (his []*models.HisOrder, err error) {
 
-	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2024-12-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2025-01-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1735,8 +1740,11 @@ func UpDatePrescriptionNumber222(user_org_id int64, id int64, number string, pat
 	return
 }
 
-func GetAllHisOrderTwo10485() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10485  AND status = 1  AND  order_status = 2 AND setl_id <> '' AND  setl_time >= '2024-01-01 00:00:00' ").Order("setl_time asc").Find(&his).Error
+func GetAllHisOrderTwo10485(start, end string) (his []*models.HisOrder, err error) {
+	start = start + " 00:00:00"
+	end = end + " 23:00:00"
+
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10633  AND status = 1  AND  order_status = 2 AND setl_id <> '' AND  setl_time >= ? and setl_time <= ? ",start,end).Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1806,7 +1814,12 @@ func GetNewDrugFlowInforTenone(start_system_time int64, end_system_time int64, o
 	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
 	return
 }
-
+func GetNewDrugFlowInforTentwo(start_system_time int64, end_system_time int64, org_id int64) (flows []*models.DrugFlow, err error) {
+	err = readDb.Model(&models.DrugFlow{}).Joins("join his_doctor_advice_info info on info.patient_id = xt_drug_flow.patient_id and info.drug_id = xt_drug_flow.drug_id and info.record_date = xt_drug_flow.system_time").Where("xt_drug_flow.user_org_id = ? and xt_drug_flow.status = 1 and xt_drug_flow.sale_date = ?", org_id,"2025-03-02").Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 and drug_code <> ''").Preload("BaseDrugLib", "status=1")
+	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
+	return
+}
 func GetHisPrescriptionByID(id int64) (pre models.HisPrescription) {
 	err = readDb.Model(&models.HisPrescription{}).Where("id = ? and status = 1", id).Find(&pre).Error
 	return
@@ -1838,7 +1851,26 @@ func SaveDF2(df *models.DrugFlow) (err error) {
 	return
 }
 func GetDrugByID(drug_id int64) (drug models.BaseDrugLib, err error) {
-	err = readDb.Model(&models.BaseDrugLib{}).Where("id = ?", drug_id).First(&drug).Error
+
+		err = readDb.Model(&models.BaseDrugLib{}).Where("id = ?", drug_id).Find(&drug).Error
+
+
+	return
+}
+
+func GetDrugByIDTwo(drug_id int64,org_id int64) (drug []models.BaseDrugLib, err error) {
+	if drug_id == 0{
+		err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ?", org_id).Find(&drug).Error
+
+	}else{
+		err = readDb.Model(&models.BaseDrugLib{}).Where("id = ?", drug_id).Find(&drug).Error
+
+
+	}
+	return
+}
+func GetSaleDate(id string) (flow models.DrugFlow) {
+	 readDb.Model(&models.DrugFlow{}).Where("id = ?",id).First(&flow)
 	return
 }
 

service/hn_service.go

@@ -1984,8 +1984,10 @@ func Hnyb3505(struct3505 models.Struct3505) (string, string) {
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
 	struct3505.RequestUrl = struct3505.RequestUrl + "3505"
-	return HNHttpRequest(struct3505.RequestUrl, struct3505.AccessKey, struct3505.SecretKey, timestamp, string(bytesData), "3505"), string(bytesData)
+	return HNHttpRequest(struct3505.RequestUrl, struct3505.AccessKey, struct3505.SecretKey, timestamp2, string(bytesData), "3505"), string(bytesData)
 
 }
 

service/jsyb_service.go

@@ -1710,7 +1710,7 @@ func Jsyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 	// 生成输入报文
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "4101A" // 交易编码
+	inputMessage["infno"] = "4101" // 交易编码
 	year := time.Now().Format("2006")
 	month := time.Now().Format("01")
 	day := time.Now().Format("02")

service/jx_service.go

@@ -1962,6 +1962,62 @@ func JXyb3505(struct3505 models.Struct3505, secret_key string, ak string,request
 }
 
 
+func JXyb3513(struct3513 models.Struct3513, secret_key string, ak string,request_url string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetGdInputMessage(timestamp, struct3513.OrgName, struct3513.Opter, struct3513.FixmedinsCode, struct3513.InsuplcAdmdvs, struct3513.MdtrtareaAdmvs, struct3513.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3513"
+	inputData["fixmedins_code"] = struct3513.FixmedinsCode
+	//inputData["medins_list_codg"] = struct3513.MedinsListCodg
+	inputData["medins_list_codg"] = struct3513.MedListCodg
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["begndate"] = struct3513.Begndate
+	inputData["enddate"] = struct3513.Enddate
+	inputData["medins_prod_inv_no"] = ""
+	inputData["med_list_codg"] = ""
+	inputData["medins_list_name"] = ""
+	inputData["rx_flag"] = ""
+	inputData["list_sp_item_flag"] = ""
+	inputData["trdn_flag"] = ""
+	inputData["invdate"] = ""
+	inputData["manu_lotnum"] = ""
+	inputData["manu_date"] = ""
+	inputData["expy_end"] = ""
+	inputData["memo"] = ""
+	inputData["vali_flag"] = ""
+	inputData["rid"] = ""
+
+	inputData["crter_id"] = ""
+	inputData["crter_name"] = ""
+	inputData["crte_optins_no"] = ""
+	inputData["opter_id"] = ""
+	inputData["opter_name"] = ""
+	inputData["optins_no"] = ""
+	inputData["poolarea_no"] = ""
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["inv_data_type"] = ""
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	requestLog := string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "3513"
+	return JXHttpRequest(request_url, ak, secret_key, timestamp, string(bytesData), "3513"), requestLog
+
+}
+
+
 //CBS总线
 func JXHttpRequest(url string, ak string, sk string, timestamp int64, json string, infno string) string {
 	fmt.Println(url)
@@ -2124,7 +2180,7 @@ func Jxyb3201(fixmedins_setl_cnt int64,  stmt_begndate string, stmt_enddate stri
 	inputMessage["infno"] = "3201"                       // 交易编码
 	inputData["insutype"] = insutype                     // 险种
 	inputData["clr_type"] = clr_type                     // 就诊 ID（来自2201接口返回）
-	inputData["setl_optins"] = "360302"               // 结算经办机构
+	inputData["setl_optins"] = "360102"               // 结算经办机构
 	inputData["stmt_begndate"] = stmt_begndate           // 对帐开始时间
 	inputData["stmt_enddate"] = stmt_enddate             //对帐结束时间
 	inputData["medfee_sumamt"] = medfee_sumamt           //医疗费总额
@@ -2932,68 +2988,7 @@ func Jxyb3504(struct3504 models.Struct3504) (string, string) {
 
 }
 
-func Jxyb3505(struct3505 models.Struct3505) (string, string) {
-	timestamp := time.Now().Unix()
-	// 生成输入报文
-	inputMessage := SetJXInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsCode, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
-	input := make(map[string]interface{})
-	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3505"                              // 交易编码
-	inputData["med_list_codg"] = struct3505.MedListCodg         // 定点医药机构目录编号
-	inputData["fixmedins_hilist_id"] = struct3505.FixmedinsCode // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3505.OrgName     // 定点医药机构目录名称
-	inputData["fixmedins_bchno"] = struct3505.FixmedinsCode     // 人员编号 （来自1101接口返回）
-
-	inputData["prsc_dr_cert_type"] = struct3505.PrscDrCertType // 人员编号 （来自1101接口返回）
-	inputData["prsc_dr_certno"] = struct3505.PrscDrCertno      // 人员编号 （来自1101接口返回）
-	inputData["prsc_dr_name"] = struct3505.PrscDrName          // 人员编号 （来自1101接口返回）
-	inputData["phar_cert_type"] = struct3505.PharCertType      // 人员编号 （来自1101接口返回）
-	inputData["phar_certno"] = struct3505.PharCertno           // 人员编号 （来自1101接口返回）
-
-	inputData["phar_name"] = struct3505.PharName               // 人员编号 （来自1101接口返回）
-	inputData["phar_prac_cert_no"] = struct3505.PharPracCertNo // 人员编号 （来自1101接口返回）
-	inputData["hi_feesetl_type"] = struct3505.HiFeesetlType    // 人员编号 （来自1101接口返回）
-	inputData["setl_id"] = struct3505.SetlId                   // 人员编号 （来自1101接口返回）
-	inputData["mdtrt_sn"] = struct3505.MdtrtSn                 // 人员编号 （来自1101接口返回）
-	inputData["psn_no"] = struct3505.PsnNo                     // 人员编号 （来自1101接口返回）
-	inputData["psn_cert_type"] = struct3505.PsnCertType        // 人员编号 （来自1101接口返回）
-	inputData["certno"] = struct3505.CertNo                    // 人员编号 （来自1101接口返回）
-	inputData["psn_name"] = struct3505.PsnName                 // 人员编号 （来自1101接口返回）
-	inputData["manu_lotnum"] = struct3505.ManuLotnum           // 人员编号 （来自1101接口返回）
-	inputData["manu_date"] = struct3505.ManuDate               // 人员编号 （来自1101接口返回）
-	inputData["expy_end"] = struct3505.ExpyEnd                 // 人员编号 （来自1101接口返回）
-
-	inputData["rx_flag"] = struct3505.RxFlag     // 人员编号 （来自1101接口返回）
-	inputData["trdn_flag"] = struct3505.TrdnFlag // 人员编号 （来自1101接口返回）
-
-	inputData["finl_trns_pric"] = struct3505.FinlTrnsPric // 人员编号 （来自1101接口返回）
-	inputData["rxno"] = struct3505.Rxno                   // 人员编号 （来自1101接口返回）
-	inputData["rx_circ_flag"] = struct3505.RxCircFlag     // 人员编号 （来自1101接口返回）
-
-	inputData["rtal_docno"] = struct3505.RtalDocno // 人员编号 （来自1101接口返回）
-	inputData["stoout_no"] = struct3505.StooutNo   // 人员编号 （来自1101接口返回）
 
-	inputData["bchno"] = struct3505.Bchno                          // 人员编号 （来自1101接口返回）
-	inputData["drug_trac_codg"] = struct3505.DrugTracCodg          // 人员编号 （来自1101接口返回）
-	inputData["drug_prod_barc"] = struct3505.DrugProdBarc          // 人员编号 （来自1101接口返回）
-	inputData["shelf_posi"] = struct3505.ShelfPosi                 // 人员编号 （来自1101接口返回）
-	inputData["sel_retn_cnt"] = struct3505.SelRetnCnt              // 人员编号 （来自1101接口返回）
-	inputData["sel_retn_time"] = struct3505.SelRetnTime            // 人员编号 （来自1101接口返回）
-	inputData["sel_retn_opter_name"] = struct3505.SelRetnOpterName // 人员编号 （来自1101接口返回）
-	inputData["memo"] = struct3505.Memo                            // 人员编号 （来自1101接口返回）
-	input["selinfo"] = inputData
-	inputMessage["input"] = input //交易输入
-
-	bytesData, err := json.Marshal(inputMessage)
-	fmt.Println(string(bytesData))
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error(), ""
-	}
-	struct3505.RequestUrl = struct3505.RequestUrl + "3505"
-	return JXHttpRequest(struct3505.RequestUrl, struct3505.AccessKey, struct3505.SecretKey, timestamp, string(bytesData), "3505"), string(bytesData)
-
-}
 func Jxyb3506(struct3506 models.Struct3506) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
@@ -3044,7 +3039,7 @@ func Jxyb3507(struct3507 models.Struct3507) (string, string) {
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3507"                          // 交易编码
-	inputData["fixmedins_bchno"] = struct3507.FixmedinsCode // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_bchno"] = struct3507.FixmedinsBchno // 人员编号 （来自1101接口返回）
 	inputData["inv_data_type"] = struct3507.InvDataType     // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData