更新

controllers/ah/ahyb_controller.go

@@ -81,7 +81,52 @@ func AHybRegistRouters() {
 	beego.Router("/ahyb/2406", &AHybController{}, "post:Get2406")
 	beego.Router("/ahyb/2406", &AHybController{}, "post:Get2406")
 
+
+
+	beego.Router("/ahyb/5101", &AHybController{}, "get:Get5101")
+	beego.Router("/ahyb/5102", &AHybController{}, "get:Get5102")
+
+
+
+
+	beego.Router("/ahyb/02", &AHybController{}, "post:Get02")
+
+	beego.Router("/ahyb/03", &AHybController{}, "post:Get03")
+
+
+
 }
+func (c *AHybController) Get02() {
+	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		return
+	}
+	result, request := service.GetAHCFYLJG012(respJSON["code"].(string), respJSON["url"].(string),respJSON["encoded"].(string),respJSON["rx_encoded"].(string),"")
+	saveJsLog(result, request, "GetCFYLJG002", "GetCFYLJG002","1111")
+
+}
+
+func (c *AHybController) Get03() {
+	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		return
+	}
+	userJSONBytes, _ := json.Marshal(respJSON["13"])
+	var struct3501 models.CFYLJG003
+	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+	result, request := service.GetAHCFYLJG013(respJSON["url"].(string),struct3501)
+	saveJsLog(result, request, "GetCFYLJG013", "GetCFYLJG013","1111")
+
+}
+
+
 func (c *AHybController) Get3501() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
@@ -612,6 +657,88 @@ func (c *AHybController) Get9001() {
 
 }
 
+
+func (c *AHybController) Get5101() {
+	url := c.GetString("url")
+	org_name := c.GetString("org_name")
+	opera_name := c.GetString("opera_name")
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	cainfo := c.GetString("cainfo")
+	fmt.Println("Error decoding JSON:", cainfo)
+	fmt.Println("Error decoding JSON:", org_name)
+	fmt.Println("Error decoding JSON:", opera_name)
+
+
+	result, inputLog := service.AHyb5101(org_name, opera_name, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, cainfo)
+	saveJsLog(result, inputLog, "5101", "科室", org_name)
+
+	var response Response
+	if err := json.Unmarshal([]byte(result), &response); err != nil {
+		fmt.Println("Error decoding JSON:", err)
+		return
+	}
+	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.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
+		})
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": "0",
+			"msg":    response.Message,
+		})
+	}
+
+}
+
+func (c *AHybController) Get5102() {
+	url := c.GetString("url")
+	org_name := c.GetString("org_name")
+	opera_name := c.GetString("opera_name")
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	cainfo := c.GetString("cainfo")
+	result, inputLog := service.AHyb5102(org_name, opera_name, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, cainfo)
+	saveJsLog(result, inputLog, "5102", "科室", org_name)
+
+	var response Response
+	if err := json.Unmarshal([]byte(result), &response); err != nil {
+		fmt.Println("Error decoding JSON:", err)
+		return
+	}
+	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.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
+		})
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": "0",
+			"msg":    response.Message,
+		})
+	}
+
+}
+
+
+
 func (c *AHybController) Get5301() {
 	psn_no := c.GetString("psn_no")
 	org_name := c.GetString("org_name")

main.go

@@ -722,13 +722,13 @@ func GetblBatchSettleList() {
 			miConfig, _ := service.FindMedicalInsuranceInfo(order.UserOrgId)
 			var configTwo []*models.HisXtDiagnoseConfig
 			diagnosis_idstwo := strings.Split(his.Diagnosis, ",")
-			curRoles, _ := service.GetAdminUserInfoByID(org_id, 5318)
+			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(10138, order.PatientId)
+			patient, _ := service.GetPatientByIDTwo(9504, order.PatientId)
 
 			sickConfig, _ := service.FindSickById(his.SickType)
 			//if order.MedType == "1111" || order.MedType == "1112" {

service/ah_dianzichufang.go

@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"os/exec"
 	"strings"
+	"os"
 )
 
 func GetAHCFYLJG001(url string, cFYLJG001 models.CFYLJG001, isu string) (string, string) {
@@ -222,6 +223,89 @@ func GetAHCFYLJG001(url string, cFYLJG001 models.CFYLJG001, isu string) (string,
 }
 
 func GetAHCFYLJG002(fixmedins_code string, url string, original_value string, original_rx_file string, extras string) (string, string) {
+	// 生成签名
+	// 生成输入报文
+	inputData := make(map[string]interface{})
+	inputData["fixmedinsCode"] = fixmedins_code
+	inputData["originalValue"] = original_value
+	inputData["originalRxFile"] = original_rx_file
+	inputData["extras"] = extras
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	// 将 inputLog 和其他参数写入文件
+	// 将 inputLog 和其他参数写入文件
+	argFileContent := inputLog // 拼接 inputLog
+	argFilePath := "a.txt"
+	os.WriteFile(argFilePath, []byte(argFileContent), 0644)
+
+
+	// 构建命令
+	//cmd := exec.Command("java", "-jar", "encrypt-utils-all.jar", )
+	cmd := exec.Command("java", "-jar", "encrypt-utils-all.jar", "encrypt", "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "Ns0K7Gsxk1WSfxYYyBcCL3J4Q/2Tvp1bMe8JbakA9Fg=")
+
+	// 捕获输出
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		fmt.Printf("Error: %v\n", err)
+	}
+
+	// 打印命令执行结果
+	fmt.Printf("Output: %s\n", string(output))
+
+	aa := strings.Split(string(output),"======")
+	fmt.Println(aa[1])
+
+	reader := bytes.NewReader([]byte(aa[1]))
+	url = url + "/fixmedins/rxFixmedinsSign"
+	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")
+	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(), ""
+	}
+	argbFileContent := string(respBytes) // 拼接 inputLog
+
+	var data2 map[string]interface{}
+
+	// 解析 JSON 字符串到 map
+	json.Unmarshal([]byte(argbFileContent), &data2)
+
+	// 检查 code 字段是否存在，并将其转换为字符串
+	if val, ok := data2["code"]; ok {
+		data2["code"] = fmt.Sprintf("%v", val) // 将 code 转换为字符串
+	}
+
+	updatedJSON2, _ := json.Marshal(data2)
+
+
+	argbFilePath := "b.txt"
+	os.WriteFile(argbFilePath, updatedJSON2, 0644)
+	cmd2 := exec.Command("java", "-jar", "encrypt-utils-all.jar", "decrypt", "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "BDoCErhDkP7KEG/BqNpjKIG5a3CapA8wbhXMNemzu+/fQD2kiW9rIDVLHxOEpAwnCuftjdZqf4Bz3x2gFShyk/8=")
+	out2, err := cmd2.Output()
+	fmt.Println(err)
+	//fmt.Println(out2)
+	bb := strings.Split(string(out2),"======")
+	fmt.Println(bb[1])
+	return bb[1], inputLog
+}
+func GetAHCFYLJG012(fixmedins_code string, url string, original_value string, original_rx_file string, extras string) (string, string) {
 	// 生成签名
 	// 生成输入报文
 	inputData := make(map[string]interface{})
@@ -265,6 +349,94 @@ func GetAHCFYLJG002(fixmedins_code string, url string, original_value string, or
 }
 
 func GetAHCFYLJG003(url string, cFYLJG003 models.CFYLJG003) (string, string) {
+	inputData := make(map[string]interface{})
+	inputData["rxTraceCode"] = cFYLJG003.RxTraceCode
+	inputData["hiRxno"] = cFYLJG003.HiRxno
+	inputData["mdtrtId"] = cFYLJG003.MdtrtID
+	inputData["patnName"] = cFYLJG003.PatnName
+	inputData["psnCertType"] = cFYLJG003.PsnCertType
+	inputData["certno"] = cFYLJG003.Certno
+	inputData["fixmedinsName"] = cFYLJG003.FixmedinsName
+	inputData["fixmedinsCode"] = cFYLJG003.FixmedinsCode
+	inputData["drCode"] = cFYLJG003.DrCode
+	inputData["prscDrName"] = cFYLJG003.PrscDrName
+	inputData["pharDeptName"] = cFYLJG003.PharDeptName
+	inputData["pharDeptCode"] = cFYLJG003.PharDeptCode
+	inputData["pharProfttlCodg"] = ""
+	inputData["pharProfttlName"] = ""
+	inputData["pharCode"] = cFYLJG003.PharCode
+	inputData["pharCertType"] = cFYLJG003.PsnCertType
+	inputData["pharCertno"] = cFYLJG003.PharCertno
+	inputData["pharName"] = cFYLJG003.PharName
+	inputData["pharPracCertNo"] = cFYLJG003.PharPracCertNo
+	inputData["pharChkTime"] = cFYLJG003.PharChkTime
+	inputData["rxFile"] = cFYLJG003.RxFile
+	inputData["signDigest"] = cFYLJG003.SignDigest
+	inputData["extras"] = ""
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+
+	argFileContent := inputLog // 拼接 inputLog
+	argFilePath := "a.txt"
+	os.WriteFile(argFilePath, []byte(argFileContent), 0644)
+
+
+
+	cmd := exec.Command("java", "-jar", "encrypt-utils-all.jar", "encrypt",  "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "Ns0K7Gsxk1WSfxYYyBcCL3J4Q/2Tvp1bMe8JbakA9Fg=")
+	out, err := cmd.Output()
+	fmt.Println(string(out))
+	aa := strings.Split(string(out),"======")
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader([]byte(aa[1]))
+	url = url + "/fixmedins/rxFileUpld"
+	//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")
+	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(), ""
+	}
+	argbFileContent := string(respBytes) // 拼接 inputLog
+
+	var data2 map[string]interface{}
+
+	// 解析 JSON 字符串到 map
+	json.Unmarshal([]byte(argbFileContent), &data2)
+	// 检查 code 字段是否存在，并将其转换为字符串
+	if val, ok := data2["code"]; ok {
+		data2["code"] = fmt.Sprintf("%v", val) // 将 code 转换为字符串
+	}
+
+	updatedJSON2, _ := json.Marshal(data2)
+	argbFilePath := "b.txt"
+	os.WriteFile(argbFilePath, updatedJSON2, 0644)
+	cmd2 := exec.Command("java", "-jar", "encrypt-utils-all.jar", "decrypt", "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "BDoCErhDkP7KEG/BqNpjKIG5a3CapA8wbhXMNemzu+/fQD2kiW9rIDVLHxOEpAwnCuftjdZqf4Bz3x2gFShyk/8=")
+	out2, err := cmd2.Output()
+	fmt.Println(err)
+	//fmt.Println(out2)
+	bb := strings.Split(string(out2),"======")
+	fmt.Println(bb[1])
+	return bb[1], inputLog
+
+}
+func GetAHCFYLJG013(url string, cFYLJG003 models.CFYLJG003) (string, string) {
 	inputData := make(map[string]interface{})
 	inputData["rxTraceCode"] = cFYLJG003.RxTraceCode
 	inputData["hiRxno"] = cFYLJG003.HiRxno
@@ -379,67 +551,88 @@ func GetAHCFYLJG004(url string, cFYLJG004 models.CFYLJG004) (string, string) {
 
 }
 
-//func GetAHCFYLJG005(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, cFYLJG005 models.CFYLJG005, cainfo 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)
-//
-//	inputData := make(map[string]interface{})
-//
-//	inputData2 := make(map[string]interface{})
-//	//inputDatas := make([]map[string]interface{}, 0)
-//	inputMessage["infno"] = "7105"
-//	inputData["fixmedinsCode"] = fixmedins_code
-//	inputData["hiRxno"] = cFYLJG005.HiRxno
-//	inputData["mdtrtId"] = cFYLJG005.MdtrtID
-//	inputData["psnName"] = cFYLJG005.PsnName
-//	inputData["psnCertType"] = cFYLJG005.PsnCertType
-//	inputData["certno"] = cFYLJG005.Certno
-//	inputData2["data"] = inputData
-//	inputMessage["input"] = inputData2
-//	argInputMessage := make(map[string]interface{})
-//	argInputMessage["arg0"] = inputMessage
-//	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)
-//
-//	var url string
-//
-//	url = url + "7105"
-//
-//	//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")
-//	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 GetAHCFYLJG005( fixmedins_code string,cFYLJG005 models.CFYLJG005) (string, string) {
+
+	// 生成签名
+	// 生成输入报文
+	inputData := make(map[string]interface{})
+	inputData["fixmedinsCode"] = fixmedins_code
+	inputData["hiRxno"] = cFYLJG005.HiRxno
+	inputData["mdtrtId"] = cFYLJG005.MdtrtID
+	inputData["psnName"] = cFYLJG005.PsnName
+	inputData["psnCertType"] = cFYLJG005.PsnCertType
+	inputData["certno"] = cFYLJG005.Certno
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	// 将 inputLog 和其他参数写入文件
+	// 将 inputLog 和其他参数写入文件
+	argFileContent := inputLog // 拼接 inputLog
+	argFilePath := "a.txt"
+	os.WriteFile(argFilePath, []byte(argFileContent), 0644)
+
+	// 构建命令
+	//cmd := exec.Command("java", "-jar", "encrypt-utils-all.jar", )
+	cmd := exec.Command("java", "-jar", "encrypt-utils-all.jar", "encrypt", "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "Ns0K7Gsxk1WSfxYYyBcCL3J4Q/2Tvp1bMe8JbakA9Fg=")
+
+	// 捕获输出
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		fmt.Printf("Error: %v\n", err)
+	}
+
+	// 打印命令执行结果
+	fmt.Printf("Output: %s\n", string(output))
+
+	aa := strings.Split(string(output),"======")
+	fmt.Println(aa[1])
+
+	reader := bytes.NewReader([]byte(aa[1]))
+	url := "http://10.66.149.64:8080/epc/api" + "/fixmedins/hospRxDetlQuery"
+	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")
+	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(), ""
+	}
+	argbFileContent := string(respBytes) // 拼接 inputLog
+	var data2 map[string]interface{}
+	// 解析 JSON 字符串到 map
+	json.Unmarshal([]byte(argbFileContent), &data2)
+	// 检查 code 字段是否存在，并将其转换为字符串
+	if val, ok := data2["code"]; ok {
+		data2["code"] = fmt.Sprintf("%v", val) // 将 code 转换为字符串
+	}
+	updatedJSON2, _ := json.Marshal(data2)
+	argbFilePath := "b.txt"
+	os.WriteFile(argbFilePath, updatedJSON2, 0644)
+	cmd2 := exec.Command("java", "-jar", "encrypt-utils-all.jar", "decrypt", "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "BDoCErhDkP7KEG/BqNpjKIG5a3CapA8wbhXMNemzu+/fQD2kiW9rIDVLHxOEpAwnCuftjdZqf4Bz3x2gFShyk/8=")
+	out2, err := cmd2.Output()
+	fmt.Println(err)
+	//fmt.Println(out2)
+	bb := strings.Split(string(out2),"======")
+	fmt.Println(bb[1])
+	return bb[1], inputLog
+
+
+
+}
 //func GetAHCFYLJG006(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, cFYLJG006 models.CFYLJG006) (string, string) {
 //	//生成签名
 //	nonce := GetRandomString(32)

service/ahyb_service.go

@@ -2449,7 +2449,7 @@ func AHyb3201(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float6
 	inputData["fund_pay_sumamt"] = fund_pay_sumamt       //基金支付总额
 	inputData["acct_pay"] = acct_pay                     //个人账户支付金额
 	inputData["fixmedins_setl_cnt"] = fixmedins_setl_cnt //定点医药机构结算笔数
-	inputData["refd_setl_flag"] = 0                      //
+	//inputData["refd_setl_flag"] = 0                      //
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -3534,3 +3534,120 @@ func AHyb3505(struct3505 models.Struct3505, secret_key string, request_url strin
 	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)
+
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetAHInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+
+	inputMessage["infno"] = "5101" // 交易编码
+	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)
+	request_url = request_url + "5101"
+	fmt.Println(request_url)
+
+	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")
+	//request.Header.Set("_api_timestamp", strconv.FormatInt(timestamp, 10))
+	//request.Header.Set("_api_name", "hssServives")
+	//request.Header.Set("_api_version", "1.0.0")
+	//request.Header.Set("_api_access_key", access_key)
+	//request.Header.Set("_api_signature", "")
+
+	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 AHyb5102(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)
+
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetAHInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	// 生成输入报文
+	inputMessage["infno"] = "5102" // 交易编码
+	inputData["prac_psn_type"] = "3"
+	inputData["psn_cert_type"] = ""
+	inputData["cert_no"] = ""
+	inputData["prac_psn_name"] = ""
+	inputData["prac_psn_code"] = ""
+	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)
+	request_url = request_url + "5102"
+	fmt.Println(request_url)
+
+	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")
+	//request.Header.Set("_api_timestamp", strconv.FormatInt(timestamp, 10))
+	//request.Header.Set("_api_name", "hssServives")
+	//request.Header.Set("_api_version", "1.0.0")
+	//request.Header.Set("_api_access_key", access_key)
+	//request.Header.Set("_api_signature", "")
+
+	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)
+
+}

service/gdyb_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"bytes"
+	"regexp"
 	//"crypto/md5"
 	"crypto/sha256"
 	"encoding/hex"
@@ -6738,8 +6739,9 @@ func Gdyb3501(struct3501 models.Struct3501, secret_key string) (string, string)
 	codes := strings.Split(struct3501.DrugTracCodg, ",")
 	for _, item := range codes {
 		if len(item) > 0 {
+
 			druginputData := make(map[string]interface{})
-			druginputData["drug_trac_codg"] = item
+			druginputData["drug_trac_codg"] =  removeNonDigits(item)
 			feedetail = append(feedetail, druginputData)
 		}
 	}
@@ -7080,8 +7082,9 @@ func Gdyb3505(struct3505 models.Struct3505, secret_key string) (string, string)
 	codes := strings.Split(struct3505.DrugTracCodg, ",")
 	for _, item := range codes {
 		if len(item) > 0 {
+
 			druginputData := make(map[string]interface{})
-			druginputData["drug_trac_codg"] = item
+			druginputData["drug_trac_codg"] = removeNonDigits(item)
 			feedetail = append(feedetail, druginputData)
 		}
 	}
@@ -7128,6 +7131,13 @@ func Gdyb3505(struct3505 models.Struct3505, secret_key string) (string, string)
 	fmt.Println(str)
 	return str, ""
 }
+func removeNonDigits(input string) string {
+	// 使用正则表达式匹配所有非数字字符
+	re := regexp.MustCompile(`\D`)
+	// 将所有非数字字符替换为空字符串
+	return re.ReplaceAllString(input, "")
+}
+
 func Gdyb3506(struct3506 models.Struct3506, secret_key string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)

service/gdyb_zifei_service.go

@@ -480,6 +480,9 @@ func Gdyb4205(org_name string, doctor string, fixmedins_code string, insuplc_adm
 
 		inputData["medins_list_name"] = item.MedinsListName
 		inputData["medins_list_code"] = item.MedinsListCodg
+
+
+		inputData["med_list_codg"] = item.MedinsListCodg
 		inputData["med_chrgitm_type"] = item.MedChrgitmType
 		inputData["prodname"] = item.Prodname
 		inputData["bilg_dept_codg"] = item.BilgDeptCodg

service/his_service.go

@@ -1570,7 +1570,7 @@ 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 = 10138  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2024-11-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 >= '2024-10-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }

service/hn_service.go

@@ -183,13 +183,13 @@ func Hnyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, i
 }
 
 // 门诊挂号
-func Hnyb2201(psnNo string, insutype string, certNo string, org_name string, opera string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, doctor_name string, request_url string, access_key string, verify_number string, cainfo string, card_sn string) (string, string) {
+func Hnyb2201(psnNo string, insutype string, certNo string, org_name string, opera string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, doctor_name string, request_url string, access_key string, verify_number string, cainfo string, card_sn string, begin string) (string, string) {
 	fmt.Println(opera)
 
 	// 生成签名
 	timestamp := time.Now().Unix()
-	tempTime := time.Unix(timestamp, 0)
-	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	//tempTime := time.Unix(timestamp, 0)
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
 	inputMessage := SetHnInputMessage(timestamp, org_name, opera, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
@@ -198,7 +198,7 @@ func Hnyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 	inputMessage["infno"] = "2201"        // 交易编码
 	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
 	inputData["insutype"] = insutype      // 险种类型（来自1101接口返回）
-	inputData["begntime"] = timeFormatOne // 开始时间
+	inputData["begntime"] = begin // 开始时间
 
 	if id_card_type == 1 {
 		inputData["mdtrt_cert_type"] = "03"        // 就诊凭证类型
@@ -342,7 +342,7 @@ func Hnyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 }
 
 // 门诊就诊信息上传
-func Hnyb2203A(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, request_url string, access_key string, cainfo string) (string, string) {
+func Hnyb2203A(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, request_url string, access_key string, cainfo string,begin_time string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
@@ -362,7 +362,7 @@ func Hnyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
 	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
 	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
-	inputData["begntime"] = timeFormatOne // 开始时间
+	inputData["begntime"] = begin_time // 开始时间
 
 	inputData["main_cond_dscr"] = ""    // 主要病情描述
 	inputData["dise_codg"] = sick_code  // 病种编码