更新

controllers/hb/hbyb_controller.go

@@ -30,7 +30,85 @@ func HbybRegistRouters() {
 	beego.Router("/hbyb/3202", &HBybController{}, "post:Post3202a")
 	beego.Router("/hbyb/4101", &HBybController{}, "post:Post4101")
 
+	beego.Router("/hbyb/5262", &HBybController{}, "post:Post5262")
+	beego.Router("/hbyb/5267", &HBybController{}, "post:Post5267")
+
+
+}
+func (c *HBybController)Post5262(){
+	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["bps"])
+	var bps models.BusinessParams5262
+	if err := json.Unmarshal(userJSONBytes, &bps); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	var baseParams models.BaseParams
+	baseParams.InsuplcAdmdvs = respJSON["insuplc_admdvs"].(string)
+	baseParams.MdtrtareaAdmvs = respJSON["mdtrtarea_admvs"].(string)
+	baseParams.OrgName = respJSON["org_name"].(string)
+	baseParams.Doctor = respJSON["doctor"].(string)
+	baseParams.FixmedinsCode = respJSON["fixmedins_code"].(string)
+	page := respJSON["page"].(string)
+	limit := respJSON["limit"].(string)
+
+
+	result := service.Hbyb5262(baseParams, bps,page,limit)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+
+
 }
+func (c *HBybController)Post5267(){
+	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["bps"])
+	var bps models.BusinessParams5262
+	if err := json.Unmarshal(userJSONBytes, &bps); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	var baseParams models.BaseParams
+	baseParams.InsuplcAdmdvs = respJSON["insuplc_admdvs"].(string)
+	baseParams.MdtrtareaAdmvs = respJSON["mdtrtarea_admvs"].(string)
+	baseParams.OrgName = respJSON["org_name"].(string)
+	baseParams.Doctor = respJSON["doctor"].(string)
+	baseParams.FixmedinsCode = respJSON["fixmedins_code"].(string)
+	page := respJSON["page"].(string)
+	limit := respJSON["limit"].(string)
+
+	result := service.Hbyb5267(baseParams, bps,page,limit)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+
+}
+
+
 func (c *HBybController) Post3202a() {
 
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)

controllers/js/jsyb_controller.go

@@ -53,6 +53,10 @@ func JSybRegistRouters() {
 	beego.Router("/jsyb/4101", &JSybController{}, "post:Get4101")
 	beego.Router("/jsyb/readcard", &JSybController{}, "get:ReadCard")
 
+
+	beego.Router("/jsyb/readcardcharge", &JSybController{}, "get:Readcardcharge")
+	beego.Router("/jsyb/readcardchargeother", &JSybController{}, "get:Readcardchargeother")
+
 	beego.Router("/jsyb/3260", &JSybController{}, "get:Get3260")
 	beego.Router("/jsyb/3261", &JSybController{}, "get:Get3261")
 	beego.Router("/jsyb/3262", &JSybController{}, "post:Get3262")
@@ -1685,6 +1689,281 @@ type ELeCertData struct {
 	Message string `json:"message"`
 }
 
+func (c *JSybController) Readcardcharge() {
+	fixmedins_code := c.GetString("fixmedins_code")
+	secret_key := c.GetString("secret_key")
+	ak := c.GetString("ak")
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	url := c.GetString("url")
+	cainfo := c.GetString("cainfo")
+	id_card_type := c.GetString("id_card_type")
+	operator_id := c.GetString("operator_id")
+	operator := c.GetString("operator")
+
+	//result, request := service.Jsyb9001(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, url, cainfo, ak)
+	//fmt.Println(request)
+	//fmt.Println(result)
+
+	c.TestGetBasBaseInit(fixmedins_code, secret_key, ak)
+	switch id_card_type {
+	case "1":
+		pCardInfo, pBusiCardInfo := c.GetBasBaseInfo()
+		pBusiCardInfo = Remove0000(pBusiCardInfo)
+		pCardInfo = Remove0000(pCardInfo)
+		fmt.Println(":", ConvertToString(pCardInfo, "gbk", "utf-8"))
+
+		fmt.Println(pBusiCardInfo)
+		fmt.Println(pCardInfo)
+		bas := strings.Split(pCardInfo, "|")
+		basNumber := bas[2]
+		id_card_no := bas[1]
+		card_sn := bas[3]
+
+		id_card_type_int, _ := strconv.ParseInt(id_card_type, 10, 64)
+
+		if len(pCardInfo) > 0 && len(pBusiCardInfo) > 0 {
+			result, _ := service.Jsyb1101A(basNumber, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type_int, card_sn, "1", url, ak, pBusiCardInfo, id_card_no, cainfo)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":         "0",
+				"card_info":      pCardInfo,
+				"busi_card_info": pBusiCardInfo,
+				"result":         dat,
+				"type":           "1",
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": "-1",
+			})
+
+		}
+		break
+	case "3": //电子社保卡
+		_, pBusiCardInfo := c.GetELeInfo(fixmedins_code, operator_id, operator)
+		//fmt.Println(pCardInfo)
+		fmt.Println(pBusiCardInfo)
+		pBusiCardInfo = Remove0000(pBusiCardInfo)
+		//pCardInfo = Remove0000(pCardInfo)
+		var ele ELeData
+		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
+		if err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+		}
+		token := ele.Data.EcCardToken
+		if len(token) > 0 {
+			result, _ := service.Jsyb1101B(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IdNo)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": "0",
+				//"card_info":      pCardInfo,
+				"busi_card_info": pBusiCardInfo,
+				"token":          token,
+				"result":         dat,
+				"type":           "2",
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": "-1",
+			})
+
+		}
+		break
+	case "4": //电子凭证
+		fmt.Println(operator_id)
+		fmt.Println(operator)
+		_, pBusiCardInfo := c.GetELeCertInfoThree(fixmedins_code, operator_id, operator)
+		fmt.Println(pBusiCardInfo)
+		pBusiCardInfo = Remove0000(pBusiCardInfo)
+		var ele ELeCertData
+		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
+		if err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+		}
+		token := ele.Data.EcToken
+		fmt.Println(token)
+		if len(token) > 0 {
+			userName := ele.Data.UserName
+			fmt.Println(userName)
+			userName = Remove0000(userName)
+			userName = DeleteExtraSpace(userName)
+			fmt.Println(userName)
+			enc := mahonia.NewEncoder("gbk")
+			fmt.Println(enc.ConvertString(userName))
+			result, _ := service.Jsyb1101ForEleCert(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, userName)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":         "0",
+				"card_info":      "",
+				"busi_card_info": pBusiCardInfo,
+				"token":          token,
+				"result":         dat,
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": "-1",
+			})
+
+		}
+		break
+	}
+
+}
+func (c *JSybController) Readcardchargeother() {
+	fixmedins_code := c.GetString("fixmedins_code")
+	secret_key := c.GetString("secret_key")
+	ak := c.GetString("ak")
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	url := c.GetString("url")
+	cainfo := c.GetString("cainfo")
+	id_card_type := c.GetString("id_card_type")
+	operator_id := c.GetString("operator_id")
+	operator := c.GetString("operator")
+
+	//result, request := service.Jsyb9001(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, url, cainfo, ak)
+	//fmt.Println(request)
+	//fmt.Println(result)
+
+	c.TestGetBasBaseInit(fixmedins_code, secret_key, ak)
+	switch id_card_type {
+	case "1":
+		pCardInfo, pBusiCardInfo := c.GetBasBaseInfo()
+		pBusiCardInfo = Remove0000(pBusiCardInfo)
+		pCardInfo = Remove0000(pCardInfo)
+		fmt.Println(":", ConvertToString(pCardInfo, "gbk", "utf-8"))
+
+		fmt.Println(pBusiCardInfo)
+		fmt.Println(pCardInfo)
+		bas := strings.Split(pCardInfo, "|")
+		basNumber := bas[2]
+		id_card_no := bas[1]
+		card_sn := bas[3]
+
+		id_card_type_int, _ := strconv.ParseInt(id_card_type, 10, 64)
+
+		if len(pCardInfo) > 0 && len(pBusiCardInfo) > 0 {
+			result, _ := service.Jsyb1101A(basNumber, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type_int, card_sn, "1", url, ak, pBusiCardInfo, id_card_no, cainfo)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":         "0",
+				"card_info":      pCardInfo,
+				"busi_card_info": pBusiCardInfo,
+				"result":         dat,
+				"type":           "1",
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": "-1",
+			})
+
+		}
+		break
+	case "3": //电子社保卡
+		_, pBusiCardInfo := c.GetELeInfo(fixmedins_code, operator_id, operator)
+		//fmt.Println(pCardInfo)
+		fmt.Println(pBusiCardInfo)
+		pBusiCardInfo = Remove0000(pBusiCardInfo)
+		//pCardInfo = Remove0000(pCardInfo)
+		var ele ELeData
+		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
+		if err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+		}
+		token := ele.Data.EcCardToken
+		if len(token) > 0 {
+			result, _ := service.Jsyb1101B(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IdNo)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": "0",
+				//"card_info":      pCardInfo,
+				"busi_card_info": pBusiCardInfo,
+				"token":          token,
+				"result":         dat,
+				"type":           "2",
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": "-1",
+			})
+
+		}
+		break
+	case "4": //电子凭证
+		fmt.Println(operator_id)
+		fmt.Println(operator)
+		_, pBusiCardInfo := c.GetELeCertInfoFour(fixmedins_code, operator_id, operator)
+		fmt.Println(pBusiCardInfo)
+		pBusiCardInfo = Remove0000(pBusiCardInfo)
+		var ele ELeCertData
+		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
+		if err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+		}
+		token := ele.Data.EcToken
+		fmt.Println(token)
+		if len(token) > 0 {
+			userName := ele.Data.UserName
+			fmt.Println(userName)
+			userName = Remove0000(userName)
+			userName = DeleteExtraSpace(userName)
+			fmt.Println(userName)
+			enc := mahonia.NewEncoder("gbk")
+			fmt.Println(enc.ConvertString(userName))
+			result, _ := service.Jsyb1101ForEleCert(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, userName)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":         "0",
+				"card_info":      "",
+				"busi_card_info": pBusiCardInfo,
+				"token":          token,
+				"result":         dat,
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": "-1",
+			})
+
+		}
+		break
+	}
+
+}
+
 func (c *JSybController) ReadCard() {
 	fixmedins_code := c.GetString("fixmedins_code")
 	secret_key := c.GetString("secret_key")
@@ -1919,8 +2198,70 @@ func (c *JSybController) GetELeInfo(code string, operator_id string, operator_na
 	}
 	return DeleteExtraSpace(""), DeleteExtraSpace(string(pBusiCardInfo))
 }
+func (c *JSybController) GetELeCertInfoFour1(code string, operator_id string, operator_name string) (string, string) {
+	DllDef := syscall.MustLoadDLL("NationEcCode.dll")
+	readCard := DllDef.MustFindProc("EcQuery")
+
+	pCardInfo := make([]byte, 8192)
+	pBusiCardInfo := make([]byte, 8192)
+	data := make(map[string]interface{})
+
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["businessType"] = "01301"
+	inputData["operatorId"] = operator_id
+	inputData["operatorName"] = operator_name
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "xuetou"
+	data["data"] = inputData
+	data["transType"] = "ec.query"
+	data["orgId"] = code
+	bytesData, _ := json.Marshal(data)
+	pCardInfo = bytesData
+	pCardInfo = []byte(ConvertByte2String(pCardInfo, GB18030))
+
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
+	fmt.Println(ret2)
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
+	if ret2 != 0 {
+		return "", ""
+	}
+	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
+}
 
-func (c *JSybController) GetELeCertInfo(code string, operator_id string, operator_name string) (string, string) {
+func (c *JSybController) GetELeCertInfoFour(code string, operator_id string, operator_name string) (string, string) {
+	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
+	readCard := DllDef.MustFindProc("GetPersonInfo")
+
+	pCardInfo := make([]byte, 8192)
+	pBusiCardInfo := make([]byte, 8192)
+	data := make(map[string]interface{})
+
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["businessType"] = "01301"
+	inputData["operatorId"] = operator_id
+	inputData["operatorName"] = operator_name
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "xuetou"
+	data["data"] = inputData
+	data["transType"] = "ec.query"
+	data["orgId"] = code
+	bytesData, _ := json.Marshal(data)
+	pCardInfo = bytesData
+	pCardInfo = []byte(ConvertByte2String(pCardInfo, GB18030))
+
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
+	fmt.Println(ret2)
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
+	if ret2 != 0 {
+		return "", ""
+	}
+	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
+}
+func (c *JSybController) GetELeCertInfoFour2223(code string, operator_id string, operator_name string) (string, string) {
 	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
 	readCard := DllDef.MustFindProc("GetPersonInfo")
 
@@ -1999,6 +2340,53 @@ func (c *JSybController) GetELeCertInfoTwo(code string, operator_id string, oper
 
 	return "", string(receivedMessage)
 }
+func (c *JSybController) GetELeCertInfoThree(code string, operator_id string, operator_name string) (string, string) {
+	// WebSocket服务器地址
+	serverURL := "ws://127.0.0.1:8899"
+
+	// 解析WebSocket服务器地址
+	u, err := url.Parse(serverURL)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// 建立WebSocket连接
+	conn, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer conn.Close()
+	input2 := make(map[string]interface{})
+
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["businessType"] = "01301"
+	inputData["operatorId"] = operator_id
+	inputData["operatorName"] = operator_name
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "血透室"
+	inputData["deviceType"] = ""
+	input["data"] = inputData
+	input["orgId"] = code
+	input["transType"] = "ec.query"
+	input2["url"] = "http://10.58.33.207:10086/localcfc/api/hsecfc/localQrCodeQuery"
+	input2["indata"] = input
+
+	bytesData, _ := json.Marshal(input2)
+	err = conn.WriteMessage(websocket.TextMessage, bytesData)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	// 接收消息
+	_, receivedMessage, err := conn.ReadMessage()
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	return "", string(receivedMessage)
+}
 
 func GetELeCertInfoSettle(code string, operator_id string, operator_name string) (string, string) {
 	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")

controllers/nm/nm_controller.go

@@ -846,7 +846,11 @@ func (c *NmController) Post4103() {
 		SetlId:  setl_id,
 	}
 	result := service.ZHyb4103(bp, bps)
+	result2 := service.ZHyb4104(bp, bps)
+
 	saveJsLog(result, "", "4103", "查询结算清单", org_name)
+	saveJsLog(result2, "", "4104", "指控结算清单", org_name)
+
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 
@@ -857,6 +861,42 @@ func (c *NmController) Post4103() {
 		"pre": dat,
 	})
 }
+func (c *NmController) Post4104() {
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	psn_no := c.GetString("psn_no")
+	mdtrt_id := c.GetString("mdtrt_id")
+	setl_id := c.GetString("setl_id")
+	bp := models.BaseParams{
+		SecretKey:      secret_key,
+		FixmedinsCode:  fixmedins_code,
+		InsuplcAdmdvs:  insuplc_admdvs,
+		MdtrtareaAdmvs: mdtrtarea_admvs,
+		OrgName:        org_name,
+		Doctor:         doctor,
+	}
+	bps := models.BusinessParams{
+		PsnNo:   psn_no,
+		MdtrtId: mdtrt_id,
+		SetlId:  setl_id,
+	}
+	result := service.ZHyb4104(bp, bps)
+	saveJsLog(result, "", "4104", "质控结算清单结果", org_name)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+}
+
 
 func (c *NmController) Post1101() {
 	certNo := c.GetString("cert_no")

models/cfyljg.go

@@ -163,6 +163,8 @@ type CFYLJG003 struct {
 	PharChkTime     string `json:"phar_chk_time"`
 	RxFile          string `json:"rx_file"`
 	SignDigest      string `json:"sign_digest"`
+	EcToken      string `json:"ec_token"`
+
 }
 
 type CFYLJG004 struct {
@@ -202,8 +204,28 @@ type CFYLJG007 struct {
 	PsnNo         string `json:"psn_no"`
 	PsnCertType   string `json:"psn_cert_type"`
 	Certno        string `json:"certno"`
+	PsnName       string `json:"psn_name"`
+
+
+}
+
+type MedinsProdInvChgDDTO struct {
+	MedListCodg  string  `json:"medListCodg"`
+	Cnt          float64 `json:"cnt"`
 }
 
+type CFYLJG008 struct {
+	PageNum      int                  `json:"pageNum"`
+	PageSize     int                  `json:"pageSize"`
+	OrderType    string               `json:"orderType"`
+	PoolareaNo   string               `json:"poolareaNo"`
+	FixmedinsName string              `json:"fixmedinsName"`
+	Lng          string               `json:"lng"`
+	Lat          string               `json:"lat"`
+	MedList      []MedinsProdInvChgDDTO `json:"medinsProdInvChgDDTOList"`
+}
+
+
 type HisPrescriptionFlow struct {
 	ID             int64  `gorm:"column:id" json:"id" form:"id"`
 	RxTraceCode    string `gorm:"column:rx_trace_code" json:"rx_trace_code" form:"rx_trace_code"`
@@ -221,6 +243,10 @@ type HisPrescriptionFlow struct {
 	SignCertSn     string `gorm:"column:sign_cert_sn" json:"sign_cert_sn" form:"sign_cert_sn"`
 	SignCertDn     string `gorm:"column:sign_cert_dn" json:"sign_cert_dn" form:"sign_cert_dn"`
 	MID            string `gorm:"column:m_id" json:"m_id" form:"m_id"`
+	DCode            string `gorm:"column:m_id" json:"m_id" form:"m_id"`
+	DID           int64 `gorm:"column:d_id" json:"d_id" form:"d_id"`
+
+
 }
 
 func (HisPrescriptionFlow) TableName() string {

models/drug.go

@@ -69,6 +69,11 @@ type BaseDrugLib struct {
 	DrugDay   string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	MinPrice  float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
 	IsUser    int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	ZuobiaoId             string    `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
+	Bck01b             string    `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
+	Bby01             string    `gorm:"column:bby01" json:"bby01" form:"bby01"`
+
+
 
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }

models/good_models.go

@@ -73,6 +73,14 @@ type GoodInfo struct {
 	IsUser             int64     `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	PackingUnit        string    `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	Number             string    `gorm:"column:number" json:"number" form:"number"`
+	ZuobiaoId             string    `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
+	Bck01b             string    `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
+	Bby01             string    `gorm:"column:bby01" json:"bby01" form:"bby01"`
+
+
+
+
+
 }
 
 func (GoodInfo) TableName() string {

models/his_models.go

@@ -1,6 +1,10 @@
 package models
 
-import "time"
+import (
+	"encoding/xml"
+	"fmt"
+	"time"
+)
 
 type XtHisProject struct {
 	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
@@ -333,6 +337,11 @@ type HisPrescription struct {
 	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
 	VMHisPrescriptionInfo  HisPrescriptionInfo       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
 	MedType                string                    `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	Cbm01                string                    `gorm:"column:cbm01" json:"cbm01" form:"cbm01"`
+	Cbm07                string                    `gorm:"column:cbm07" json:"cbm07" form:"cbm07"`
+
+
+
 }
 
 func (HisPrescription) TableName() string {
@@ -368,6 +377,10 @@ type HisProject struct {
 	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
 	CreatedTime               int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime               int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ZuobiaoId             string    `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
+	Bck01b	 string    `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
+	Bby01             string    `gorm:"column:bby01" json:"bby01" form:"bby01"`
+
 }
 
 func (HisProject) TableName() string {
@@ -507,6 +520,9 @@ type HisPrescriptionProject struct {
 	DeliveryWay        string           `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
 	ExecutionFrequency string           `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
 	Day                string           `gorm:"column:day" json:"day" form:"day"`
+	StartTime                int64           `gorm:"column:start_time" json:"start_time" form:"start_time"`
+
+
 	HisProject         HisProject       `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
 	GoodInfo           GoodInfo         `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
 	Type               int64            `gorm:"column:type" json:"type" form:"type"`
@@ -877,7 +893,7 @@ type MedicalInsuranceOrgConfig struct {
 	MdtrtareaAdmvs string `gorm:"column:mdtrtarea_admvs" json:"mdtrtarea_admvs" form:"mdtrtarea_admvs"`
 	InsuplcAdmdvs  string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 	SecretKey      string `gorm:"column:secret_key" json:"secret_key" form:"secret_key"`
-	Url            string `gorm:"column:url" json:"url" form:"url"`
+Url            string `gorm:"column:url" json:"url" form:"url"`
 	AccessKey      string `gorm:"column:access_key" json:"access_key" form:"access_key"`
 	Cainfo         string `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
 	AppSecret      string `gorm:"column:app_secret" json:"app_secret" form:"app_secret"`
@@ -1049,6 +1065,7 @@ type BusinessParams struct {
 	MdtrtId          string
 	SetlId           string
 	StasType         string
+
 }
 
 type BusinessParamsTwo struct {
@@ -1069,6 +1086,20 @@ type BusinessParamsTwo struct {
 	SetlId           string
 }
 
+
+type BusinessParams5262 struct {
+	RefdSetlFlag         string
+	QBegntime         	 string
+	QEndtime      		 string
+	MedType   			 string
+	PageNum     		 string
+	PageSize      		 string
+	Certno     			 string
+	Psnno    			 string
+
+}
+
+
 type Custom struct {
 	DetItemFeeSumamt string
 	Cut              string
@@ -1661,17 +1692,51 @@ type NewCustomTwo struct {
 	Type             int64
 	AdviceId         int64
 	ProjectId        int64
-	ItemId           int64
+	ItemId           string
+	StartTime        string
+	Content string
+	Bby01             string
+
 }
 
+type ChargeList struct {
+	Bby01 			string
+	Vaj25              string
+	Bbx01              string
+	Vaf21              string
+	Vaf22              string
+	Vaf42              string
+
+
+}
+
+
+type ChargeListtwo struct {
+	Bby01 			string
+	Vaj25              string
+
+}
 type UploadInfo struct {
 	Bce02a   string `json:"bce02a"`
+	Acf01   int64 `json:"acf01"`
+	Bce01   string `json:"bce01"`
+	Bck01   string `json:"bck01"`
+	ChargeList []ChargeList `json:"chargeList"`
+	ChargeListtwo []ChargeListtwo `json:"chargeList"`
+
+	Bce01a   string `json:"bce01a"`
+
 	Bck01c   string `json:"bck01c"`
+	Bck01a   string `json:"bck01a"`
+
 	Diag     []*Diag
 	Fasong   string `json:"fasong"`
 	PresInfo []*PresInfo
-	Vaa01    int64 `json:"vaa01"`
+	Vaa01    int64 `json:"bby01"`
 	Vaa07    int64 `json:"vaa07"`
+	Vaa05    string `json:"vaa05"`
+
+
 }
 
 type Diag struct {
@@ -1830,3 +1895,200 @@ type NewHisOrder111 struct {
 func (NewHisOrder111) TableName() string {
 	return "his_order"
 }
+
+
+type Root2 struct {
+	XMLName    xml.Name   `xml:"Root"`
+	TradeInfo  TradeInfo  `xml:"tradeinfo"`
+
+	VAF1       VAF10       `xml:"VAF1"`
+
+}
+
+
+type Root struct {
+	XMLName    xml.Name   `xml:"Root"`
+	TradeInfo  TradeInfo  `xml:"tradeinfo"`
+	CBM1       CBM1       `xml:"CBM1"`
+	VAF1       VAF1       `xml:"VAF1"`
+	VAO1       VAO1       `xml:"VAO1"`
+	VBQ1       VBQ1       `xml:"VBQ1"`
+}
+
+type TradeInfo struct {
+	Type      int    `xml:"type"`
+	PatSource int    `xml:"pat_source"`
+	Detpid    string `xml:"detpid"`
+	Empid     string `xml:"empid"`
+	Empno     string `xml:"empno"`
+	Empname   string `xml:"empname"`
+}
+
+type CBM1 struct {
+	Ie []IEone `xml:"Ie"`
+}
+
+type VAF1 struct {
+	Ie []IEtwo `xml:"Ie"`
+}
+
+type VAO1 struct {
+	Ie []IEthree `xml:"Ie"`
+}
+
+type VBQ1 struct {
+	Ie []IEfour `xml:"Ie"`
+}
+
+type VAF10 struct {
+	Ie []IEfive `xml:"Ie"`
+}
+
+type IEone struct {
+	CBMID  string `xml:"CBMID,attr"`
+	VAA01  string `xml:"VAA01,attr"`
+	VAA07  string `xml:"VAA07,attr"`
+	ACF01  string `xml:"ACF01,attr"`
+	CBM06  string `xml:"CBM06,attr"`
+	CBM07  string `xml:"CBM07,attr"`
+	BCK01A string `xml:"BCK01A,attr"`
+	BCK01B string `xml:"BCK01B,attr"`
+	BCK01C string `xml:"BCK01C,attr"`
+	CBM19  string `xml:"CBM19,attr"`
+
+}
+type IEtwo struct {
+	CBMID  string `xml:"CBMID,attr"`
+	VAF04  string `xml:"VAF04,attr"`
+	VAA01  string `xml:"VAA01,attr"`
+	VAF06  string `xml:"VAF06,attr"`
+	BCK01A string `xml:"BCK01A,attr"`
+	ROWNR  string `xml:"ROWNR,attr"`
+	VAF10  string `xml:"VAF10,attr"`
+	VAF11  string `xml:"VAF11,attr"`
+	BDA01  string `xml:"BDA01,attr"`
+	BBX01  string `xml:"BBX01,attr"`
+	VAF14  string `xml:"VAF14,attr"`
+	VAF15  string `xml:"VAF15,attr"`
+	BBY01  string `xml:"BBY01,attr"`
+	VAF17  string `xml:"VAF17,attr"`
+	VAF18  string `xml:"VAF18,attr"`
+	VAF19  string `xml:"VAF19,attr"`
+	VAF20  string `xml:"VAF20,attr"`
+	VAF21  string `xml:"VAF21,attr"`
+	VAF22  string `xml:"VAF22,attr"`
+	Crypt  string `xml:"Crypt,attr"`
+	VAF23  string `xml:"VAF23,attr"`
+	BCK01B string `xml:"BCK01B,attr"`
+	VAF26  string `xml:"VAF26,attr"`
+	VAF27  string `xml:"VAF27,attr"`
+	VAF28  string `xml:"VAF28,attr"`
+	VAF29  string `xml:"VAF29,attr"`
+	VAF30  string `xml:"VAF30,attr"`
+	VAF31  string `xml:"VAF31,attr"`
+	VAF32  string `xml:"VAF32,attr"`
+	VAF33  string `xml:"VAF33,attr"`
+	VAF34  string `xml:"VAF34,attr"`
+	VAF35  string `xml:"VAF35,attr"`
+	VAF36  string `xml:"VAF36,attr"`
+	VAF37  string `xml:"VAF37,attr"`
+	BCE02A  string `xml:"BCE02A,attr"`
+	BCE03A  string `xml:"BCE03A,attr"`
+	BCE03B  string `xml:"BCE03B,attr"`
+	VAF53  string `xml:"VAF53,attr"`
+	VAF55  string `xml:"VAF55,attr"`
+	BCK01D  string `xml:"BCK01D,attr"`
+	VAF58  string `xml:"VAF58,attr"`
+	VAF59  string `xml:"VAF59,attr"`
+	VAF60  string `xml:"VAF60,attr"`
+	VAF61  string `xml:"VAF61,attr"`
+	VAF62  string `xml:"VAF62,attr"`
+	LSign  string `xml:"lSign,attr"`
+	BDA01A  string `xml:"BDA01A,attr"`
+	LRoute  string `xml:"lRoute,attr"`
+	BCE01A  string `xml:"BCE01A,attr"`
+	BCE01B  string `xml:"BCE01B,attr"`
+	VAF01B  string `xml:"VAF01B,attr"`
+	VCO01  string `xml:"VCO01,attr"`
+	BCE01H  string `xml:"BCE01H,attr"`
+	BCE03H  string `xml:"BCE03H,attr"`
+	BIW02  string `xml:"BIW02,attr"`
+	RCurrent  string `xml:"rCurrent,attr"`
+	FCheck  string `xml:"FCheck,attr"`
+	UnameA  string `xml:"UnameA,attr"`
+	VEH02  string `xml:"VEH02,attr"`
+	BCK01C  string `xml:"BCK01C,attr"`
+
+
+
+
+}
+type IEthree struct {
+	CBMID  string `xml:"CBMID,attr"`
+	VAA01  string `xml:"VAA01,attr"`
+	VAA07  string `xml:"VAA07,attr"`
+	ACF01  string `xml:"ACF01,attr"`
+
+	VAO06  string `xml:"VAO06,attr"`
+	VAO07  string `xml:"VAO07,attr"`
+	VAO10  string `xml:"VAO10,attr"`
+	VAO11  string `xml:"VAO11,attr"`
+	BAK01A  string `xml:"BAK01A,attr"`
+	CAM01  string `xml:"CAM01,attr"`
+	VAO15  string `xml:"VAO15,attr"`
+	VAO18  string `xml:"VAO18,attr"`
+	VAO22  string `xml:"VAO22,attr"`
+	IAA01  string `xml:"IAA01,attr"`
+	IAD03  string `xml:"IAD03,attr"`
+	BAK01B  string `xml:"BAK01B,attr"`
+	VAO26  string `xml:"VAO26,attr"`
+	IAD04  string `xml:"IAD04,attr"`
+	IAD01  string `xml:"IAD01,attr"`
+	VAO25  string `xml:"VAO25,attr"`
+	VAO35  string `xml:"VAO35,attr"`
+
+
+}
+type IEfour struct {
+	VBQ01  string `xml:"VBQ01,attr"`
+	VAA01  string `xml:"VAA01,attr"`
+	VAA07  string `xml:"VAA07,attr"`
+	ACF01  string `xml:"ACF01,attr"`
+	VAP01  string `xml:"VAP01,attr"`
+	VBQ07  string `xml:"VBQ07,attr"`
+	BCK01A string `xml:"BCK01A,attr"`
+	BCK01B string `xml:"BCK01B,attr"`
+	BCE03A  string `xml:"BCE03A,attr"`
+	BCE01A  string `xml:"BCE01A,attr"`
+	VBQ27  string `xml:"VBQ27,attr"`
+	VBQ28  string `xml:"VBQ28,attr"`
+	VBQ29  string `xml:"VBQ29,attr"`
+	VBQ30  string `xml:"VBQ30,attr"`
+
+
+}
+type IEfive struct {
+	VAF01  string `xml:"VAF01,attr"`
+
+}
+
+
+func main() {
+	data := `YOUR_XML_CONTENT_HERE`
+
+	var root Root
+	err := xml.Unmarshal([]byte(data), &root)
+	if err != nil {
+		fmt.Println("错误:", err)
+		return
+	}
+
+	fmt.Printf("%+v\n", root)
+}
+
+
+
+
+
+
+

models/zuobiao_models.go

@@ -0,0 +1,25 @@
+package models
+
+
+
+
+type HisZuobiaoAdvice struct {
+	ID int64 `gorm:"column:id" json:"id" form:"id"`
+	AdviceRequestLog string `gorm:"column:advice_request_log" json:"advice_request_log" form:"advice_request_log"`
+	AdviceResultLog string `gorm:"column:advice_result_log" json:"advice_result_log" form:"advice_result_log"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	SettleRequestLog string `gorm:"column:settle_request_log" json:"settle_request_log" form:"settle_request_log"`
+	SettleResultLog string `gorm:"column:settle_result_log" json:"settle_result_log" form:"settle_result_log"`
+	Cbm01 string `gorm:"column:cbm01" json:"cbm01" form:"cbm01"`
+	AdiviceIds string `gorm:"column:adivice_ids" json:"adivice_ids" form:"adivice_ids"`
+}
+
+
+func (HisZuobiaoAdvice) TableName() string {
+	return "his_zuobiao_advice"
+}

service/dianzichufang.go

@@ -12,7 +12,7 @@ import (
 	"time"
 )
 
-func GetCFYLJG001(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, cFYLJG001 models.CFYLJG001) (string, string) {
+func GetCFYLJG001(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, cFYLJG001 models.CFYLJG001,isu string) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -94,7 +94,7 @@ func GetCFYLJG001(org_name string, doctor string, fixmedins_code string, insuplc
 
 		rxdrug["drug_totlcnt_emp"] = item.DrugTotlcntEmp
 		rxdrug["hosp_appr_flag"] = item.HospApprFlag
-		rxdrug["extras"] = item.Extras
+		//rxdrug["extras"] = ""
 		rxdrugdetail = append(rxdrugdetail, rxdrug)
 	}
 	inputData["rxdrugdetail"] = rxdrugdetail
@@ -145,7 +145,14 @@ func GetCFYLJG001(org_name string, doctor string, fixmedins_code string, insuplc
 	mdtrtinfo["rgst_fee"] = cFYLJG001.Mdtrtinfo.RgstFee
 	mdtrtinfo["medfee_sumamt"] = cFYLJG001.Mdtrtinfo.MedfeeSumamt
 	mdtrtinfo["fstdiag_flag"] = cFYLJG001.Mdtrtinfo.FstdiagFlag
-	mdtrtinfo["extras"] = cFYLJG001.Mdtrtinfo.Extras
+	type MyData struct {
+		Insutype string `json:"insutype"`
+	}
+	data := MyData{
+		Insutype: isu,
+	}
+
+	mdtrtinfo["extras"] = data
 	inputData["mdtrtinfo"] = mdtrtinfo
 
 	diseinfos := make([]map[string]interface{}, 0)
@@ -228,14 +235,15 @@ func GetCFYLJG002(org_name string, doctor string, fixmedins_code string, insuplc
 	//生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	inputData := make(map[string]interface{})
-	//inputData := makemap[string]interface{})
+	inputDatas := make(map[string]interface{})
 
 	inputMessage["infno"] = "CFYLJG002"
 	inputData["fixmedins_code"] = fixmedins_code
 	inputData["original_value"] = original_value
 	inputData["original_rx_file"] = original_rx_file
 	inputData["extras"] = extras
-	inputMessage["rx_sign_info"] = inputData
+	inputDatas["rx_sign_info"] = inputData
+	inputMessage["input"] = inputDatas
 
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
@@ -295,6 +303,7 @@ func GetCFYLJG003(org_name string, doctor string, fixmedins_code string, insuplc
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
+	inputData2 := make(map[string]interface{})
 
 	inputMessage["infno"] = "CFYLJG003"
 
@@ -321,7 +330,8 @@ func GetCFYLJG003(org_name string, doctor string, fixmedins_code string, insuplc
 	inputData["phar_chk_time"] = cFYLJG003.PharChkTime
 	inputData["rx_file"] = cFYLJG003.RxFile
 	inputData["sign_digest"] = cFYLJG003.SignDigest
-	inputMessage["rx_upload_info"] = inputData
+	inputData2["rx_upload_info"] = inputData
+	inputMessage["input"] = inputData2
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
 	inputLog = string(bytesData)
@@ -379,10 +389,10 @@ func GetCFYLJG004(org_name string, doctor string, fixmedins_code string, insuplc
 	//生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	inputData := make(map[string]interface{})
-	//inputDatas := make([]map[string]interface{}, 0)
+	inputData1 := make(map[string]interface{})
 
+	//inputDatas := make([]map[string]interface{}, 0)
 	inputMessage["infno"] = "CFYLJG004"
-
 	inputData["hi_rxno"] = cFYLJG004.HiRxno
 	inputData["undo_dr_code"] = cFYLJG004.UndoDrCode
 	inputData["undo_dr_name"] = cFYLJG004.UndoDrName
@@ -391,8 +401,8 @@ func GetCFYLJG004(org_name string, doctor string, fixmedins_code string, insuplc
 	inputData["undo_rea"] = cFYLJG004.UndoRea
 	inputData["undo_time"] = cFYLJG004.UndoTime
 	inputData["fixmedins_code"] = cFYLJG004.FixmedinsCode
-
-	inputMessage["rx_cancel_info"] = inputData
+	inputData1["rx_cancel_info"] = inputData
+	inputMessage["input"] = inputData1
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
 	inputLog = string(bytesData)
@@ -449,12 +459,16 @@ func GetCFYLJG005(org_name string, doctor string, fixmedins_code string, insuplc
 	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"] = "CFYLJG005"
 
-	inputData["fixmedins_code"] = cFYLJG005.FixmedinsCode
+	inputData["fixmedins_code"] = fixmedins_code
 
 	inputData["hi_rxno"] = cFYLJG005.HiRxno
 	inputData["mdtrt_id"] = cFYLJG005.MdtrtID
@@ -462,8 +476,8 @@ func GetCFYLJG005(org_name string, doctor string, fixmedins_code string, insuplc
 	inputData["psn_name"] = cFYLJG005.PsnName
 	inputData["psn_cert_type"] = cFYLJG005.PsnCertType
 	inputData["certno"] = cFYLJG005.Certno
-
-	inputMessage["rx_detl_query"] = inputData
+	inputData2["rx_detl_query"]  = inputData
+	inputMessage["input"] = inputData2
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
 	inputLog = string(bytesData)
@@ -512,7 +526,6 @@ func GetCFYLJG005(org_name string, doctor string, fixmedins_code string, insuplc
 	return str, inputLog
 
 }
-
 func GetCFYLJG006(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)
@@ -522,17 +535,18 @@ func GetCFYLJG006(org_name string, doctor string, fixmedins_code string, insuplc
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	inputData := make(map[string]interface{})
 	//inputDatas := make([]map[string]interface{}, 0)
+	inputData2 := make(map[string]interface{})
 
 	inputMessage["infno"] = "CFYLJG006"
 
-	inputData["fixmedins_code"] = cFYLJG006.FixmedinsCode
+	inputData["fixmedins_code"] = fixmedins_code
 	inputData["hi_rxno"] = cFYLJG006.HiRxno
 	inputData["mdtrt_id"] = cFYLJG006.MdtrtID
 	inputData["psn_cert_type"] = cFYLJG006.PsnCertType
 	inputData["certno"] = cFYLJG006.Certno
 	inputData["psn_name"] = cFYLJG006.PsnName
-
-	inputMessage["rx_chk_info"] = inputData
+	inputData2["rx_chk_info"] =inputData
+	inputMessage["input"] = inputData2
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
 	inputLog = string(bytesData)
@@ -589,18 +603,95 @@ func GetCFYLJG007(org_name string, doctor string, fixmedins_code string, insuplc
 	//生成输入报文
 	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"] = "CFYLJG007"
 
-	inputData["fixmedins_code"] = cFYLJG007.FixmedinsCode
+	inputData["fixmedins_code"] = fixmedins_code
 	inputData["hi_rxno"] = cFYLJG007.HiRxno
 	inputData["mdtrt_id"] = cFYLJG007.MdtrtID
 	inputData["psn_no"] = cFYLJG007.PsnNo
 	inputData["psn_cert_type"] = cFYLJG007.PsnCertType
 	inputData["certno"] = cFYLJG007.Certno
+	inputData["psn_name"] = cFYLJG007.PsnName
+
+	inputData2["rx_setl_query"] = inputData
+
+	inputMessage["input"] = inputData2
+	var inputLog string
+	bytesData, err := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 
-	inputMessage["rx_setl_query"] = inputData
+	var url string
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "CFYLJG007"
+	}
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, inputLog
+
+}
+func GetCFYLJG008(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, cFYLJG008 models.CFYLJG008) (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"] = "CFYLJG008"
+
+	inputData["pageNum"] = cFYLJG008.PageNum
+	inputData["pageSize"] = cFYLJG008.PageSize
+	inputData["orderType"] = cFYLJG008.OrderType
+	inputData["poolareaNo"] = cFYLJG008.PoolareaNo
+	inputData["fixmedinsName"] = cFYLJG008.FixmedinsName
+	inputData["lng"] = cFYLJG008.Lng
+	inputData["lat"] = cFYLJG008.Lat
+	inputData["medinsProdInvChgDDTOList"] = cFYLJG008.MedList
+
+	inputMessage["input"] = inputData
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
 	inputLog = string(bytesData)

service/fj_service.go

@@ -1842,6 +1842,215 @@ func FJyb5301(psnNo string, insutype string, org_name string, doctor string, fix
 	return str
 }
 
+func Fjyb4101(struct4101 Struct4101, params models.PublicParams) (string, string, string) {
+	timestamp := time.Now().Unix()
+	inputMessage := SetHnInputMessage(timestamp, params.FixmedinsName, params.OpterName, params.FixmedinsCode, params.InsuplcAdmdvs, params.MdtrtareaAdmvs, params.Cainfo)
+	// 生成输入报文
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "4101A" // 交易编码
+	year := time.Now().Format("2006")
+	month := time.Now().Format("01")
+	day := time.Now().Format("02")
+
+	inputData["mdtrt_id"] = struct4101.MdtrtId // 就诊 ID  必填（来自2201接口返回）
+	inputData["setl_id"] = struct4101.SetlId   // 结算 ID  必填
+	inputData["psn_no"] = struct4101.PsnNo     // 结算 ID  必填
+
+	inputData["fixmedins_name"] = params.FixmedinsName      // 定点医药机构名称  必填
+	inputData["fixmedins_code"] = params.FixmedinsCode      // 定点医药机构编码  必填
+	inputData["hi_setl_lv"] = ""                            // 医保结算等级
+	inputData["hi_no"] = struct4101.PsnNo                   // 医保编号
+	inputData["medcasno"] = struct4101.PsnNo                // 病案号  必填
+	inputData["dcla_time"] = year + "-" + month + "-" + day // 申报时间  必填
+	inputData["psn_name"] = struct4101.PsnName              // 人员姓名  必填
+	inputData["gend"] = struct4101.Gend                     // 性别  必填
+	inputData["brdy"] = struct4101.Brdy                     // 出生日期  必填
+	inputData["age"] = struct4101.Age                       // 年龄  必填
+	inputData["ntly"] = struct4101.Ntly                     // 国籍  必填
+
+
+	inputData["nwb_age"] = ""                                 // 年龄  必填
+	inputData["naty"] = struct4101.Naty                       // 民族  必填
+	inputData["patn_cert_type"] = struct4101.PatnCertType     // 患者证件类别  必填
+	inputData["certno"] = struct4101.Certno                   // 证件号码  必填
+	inputData["prfs"] = struct4101.Prfs                       // 职业  必填
+	inputData["curr_addr"] = ""                               // 现住址  必填
+	inputData["emp_name"] = ""                                // 单位名称  必填
+	inputData["emp_addr"] = ""                                // 单位地址  必填
+	inputData["emp_tel"] = ""                                 // 单位电话  必填
+	inputData["poscode"] = ""                                 // 邮编  必填
+	inputData["coner_name"] = ""           // 联系人姓名  必填
+	inputData["patn_rlts"] = ""              // 与患者关系  必填
+	inputData["coner_addr"] = ""            // 联系人地址  必填
+	inputData["coner_tel"] = ""              // 联系人电话  必填
+	inputData["hi_type"] = struct4101.HiType                  // 医保类型  必填
+	inputData["insuplc"] = struct4101.Insuplc                 // 参保地  必填
+	inputData["sp_psn_type"] = ""                             // 特殊人员类型  必填
+	inputData["nwb_adm_type"] = ""                            // 新生儿入院类型  必填
+	inputData["nwb_bir_wt"] = ""                              // 新生儿出生体重  必填
+	inputData["nwb_adm_wt"] = ""                              // 新生儿入院体重  必填
+	inputData["opsp_diag_caty"] = ""                          // 门诊慢特病诊断  必填
+	inputData["opsp_mdtrt_date"] = ""                         // 门诊慢特病就诊日期  必填
+	inputData["ipt_med_type"] = struct4101.IptMedType         // 住院医疗类型  必填
+	inputData["adm_way"] = ""                                 // 入院途径  必填
+	inputData["trt_type"] = ""                                // 治疗类别  必填
+	inputData["adm_time"] = struct4101.AdmTime                // 入院时间  必填
+	inputData["adm_caty"] = struct4101.AdmCaty                // 入院科别  必填
+	inputData["refldept_dept"] = ""                           // 转科科别  必填
+	inputData["dscg_time"] = struct4101.AdmEndTime            // 出院时间  必填
+	inputData["dscg_caty"] = struct4101.AdmCaty               // 出院科别  必填
+	inputData["act_ipt_days"] = ""                            // 实际住院天数  必填
+	inputData["otp_wm_dise"] = ""                             // 门（急） 诊西医诊断  必填
+	inputData["wm_dise_code"] = ""                            // 门（急） 诊中医诊断  必填
+	inputData["otp_tcm_dise"] = ""                            // 西医诊断疾病代码  必填
+	inputData["tcm_dise_code"] = ""                           // 中医诊断代码  必填
+	inputData["oprn_oprt_code_cnt"] = ""                      // 手术操作代码计数  必填
+	inputData["vent_used_dura"] = ""                          // 呼吸机使用时长  必填
+	inputData["pwcry_bfadm_coma_dura"] = ""                   // 颅脑损伤患者入院前昏迷时长  必填
+	inputData["pwcry_afadm_coma_dura"] = ""                   // 颅脑损伤患者入院后昏迷时长  必填
+	inputData["bld_cat"] = ""                                 // 输血品种  必填
+	inputData["bld_amt"] = ""                                 // 输血量  必填
+	inputData["bld_unt"] = ""                                 // 输血计量单位  必填
+	inputData["spga_nurscare_days"] = ""                      // 特级护理天数  必填
+	inputData["lv1_nurscare_days"] = ""                       // 一级护理天数  必填
+	inputData["scd_nurscare_days"] = ""                       // 二级护理天数  必填
+	inputData["lv3_nurscare_days"] = ""                       // 三级护理天数  必填
+	inputData["acp_medins_name"] = ""                         // 拟接收机构名称  必填
+	inputData["acp_optins_code"] = ""                         // 拟接收机构代码  必填
+	inputData["bill_code"] = struct4101.BillCode              // 票据代码  必填
+	inputData["bill_no"] = struct4101.BillNo                  // 票据号码  必填
+	inputData["biz_sn"] = struct4101.BizSn                    // 业务流水号  必填
+	inputData["days_rinp_flag_31"] = ""                       // 出院 31 天内再住院计划标志  必填
+	inputData["days_rinp_pup_31"] = ""                        // 出院 31 天内再住院目的  必填
+	inputData["chfpdr_name"] = struct4101.DoctorName          // 主诊医师姓名  必填
+	inputData["chfpdr_code"] = struct4101.DoctorCode          // 主诊医师代码  必填
+	inputData["setl_begn_date"] = struct4101.SetlBegnDate     // 结算开始日期  必填
+	inputData["setl_end_date"] = struct4101.SetlEndDate       // 结算结束日期  必填
+	inputData["psn_selfpay"] = struct4101.PsnSelfPay          // 个人自付  必填
+	inputData["psn_ownpay"] = struct4101.PsnOwnPay            // 个人自费  必填
+	inputData["acct_pay"] = struct4101.AcctPay                // 个人账户支出  必填
+	inputData["hi_paymtd"] = struct4101.HiPaymtd              // 医保支付方式  必填
+	inputData["hsorg"] = struct4101.Hsorg                     // 医保机构  必填
+	inputData["hsorg_opter"] = struct4101.HsorgOpter          // 医保机构经办人  必填
+	inputData["medins_fill_dept"] = struct4101.MedinsFillDept // 医疗机构填报部门  必填
+	inputData["medins_fill_psn"] = struct4101.MedinsFillPsn   // 医疗机构填报人  必填
+	inputData["psn_cashpay"] = struct4101.PsnCashpay          // 医疗机构填报人  必填
+
+	payinfo := make([]map[string]interface{}, 0) // 基金支付信息
+	for _, item := range struct4101.CustomStruct {
+		payinfotemp := make(map[string]interface{})
+		if item.FundPayType == "310100" || item.FundPayType == "310200" || item.FundPayType == "320100" || item.FundPayType == "330100" || item.FundPayType == "340100" || item.FundPayType == "350100" || item.FundPayType == "370100" || item.FundPayType == "390100" || item.FundPayType == "610100" || item.FundPayType == "640100" || item.FundPayType == "620100" {
+			payinfotemp["fund_pay_type"] = item.FundPayType // 基金支付类型  必填
+			payinfotemp["fund_payamt"] = item.FundPayamt    // 基金支付金额
+			payinfo = append(payinfo, payinfotemp)
+		}
+	}
+	opspdiseinfo := make([]map[string]interface{}, 0) // 门诊慢特病诊断信息
+
+	opspdiseinfotemp := make(map[string]interface{})
+	opspdiseinfotemp["diag_name"] = struct4101.OpspdiseinfoStruct[len(struct4101.OpspdiseinfoStruct)-1].DiagName      // 诊断名称  必填
+	opspdiseinfotemp["diag_code"] = struct4101.OpspdiseinfoStruct[len(struct4101.OpspdiseinfoStruct)-1].DiagCode      // 诊断代码 必填
+	opspdiseinfotemp["oprn_oprt_name"] = struct4101.OpspdiseinfoStruct[len(struct4101.OpspdiseinfoStruct)-1].DiagName // 手术操作名称 必填
+	opspdiseinfotemp["oprn_oprt_code"] = struct4101.OpspdiseinfoStruct[len(struct4101.OpspdiseinfoStruct)-1].DiagCode // 手术操作代码 必填
+	opspdiseinfo = append(opspdiseinfo, opspdiseinfotemp)
+
+	diseinfo := make([]map[string]interface{}, 0) // 住院诊断信息
+	for _, item := range struct4101.Diseinfo {
+		diseinfotemp := make(map[string]interface{})
+		diseinfotemp["maindiag_flag"] = item.MaindiagFlag // 手术操作代码 必填
+		diseinfotemp["diag_type"] = item.DiagType         // 诊断类别  必填
+		diseinfotemp["diag_code"] = item.DiagCode         // 诊断代码 必填
+		diseinfotemp["diag_name"] = item.DiagName         // 诊断名称 必填
+		diseinfotemp["adm_cond_type"] = "3"               // 入院病情类型 必填
+		diseinfo = append(diseinfo, diseinfotemp)
+	}
+
+	iteminfo := make([]map[string]interface{}, 0)
+	for _, item := range struct4101.IteminfoStruct {
+		iteminfotemp := make(map[string]interface{})
+		iteminfotemp["med_chrgitm"] = item.MedChrgitm            // 医疗收费项目  必填
+		iteminfotemp["amt"] = item.Amt                           // 金额 必填
+		iteminfotemp["claa_sumfee"] = item.ClaaSumfee            // 甲类费用合计 必填
+		iteminfotemp["clab_amt"] = item.ClabAmt                  // 乙类金额 必填
+		iteminfotemp["fulamt_ownpay_amt"] = item.FulamtOwnpayAmt // 全自费金额 必填
+		iteminfotemp["oth_amt"] = item.OthAmt                    // 其他金额 必填
+		iteminfo = append(iteminfo, iteminfotemp)
+	}
+
+	oprninfo := make([]map[string]interface{}, 0) // 手术操作信息
+	oprninfotemp := make(map[string]interface{})
+	oprninfotemp["oprn_oprt_type"] = "" // 手术操作类别  必填
+	oprninfotemp["oprn_oprt_name"] = "" // 手术操作名称 必填
+	oprninfotemp["oprn_oprt_code"] = "" // 手术操作代码 必填
+	oprninfotemp["oprn_oprt_date"] = "" // 手术操作日期 必填
+	oprninfotemp["anst_way"] = ""       // 麻醉方式 必填
+	oprninfotemp["oper_dr_name"] = ""   // 术者医师姓名 必填
+	oprninfotemp["oper_dr_code"] = ""   // 术者医师代码 必填
+	oprninfotemp["anst_dr_name"] = ""   // 麻醉医师姓名 必填
+	oprninfotemp["anst_dr_code"] = ""   // 麻醉医师代码 必填
+	oprninfo = append(oprninfo, oprninfotemp)
+
+	icuinfo := make([]map[string]interface{}, 0) // 重症监护信息
+	icuinfotemp := make(map[string]interface{})
+	icuinfotemp["scs_cutd_ward_type"] = ""   // 重症监护病房类型  必填
+	icuinfotemp["scs_cutd_inpool_time"] = "" // 重症监护进入时间 必填
+	icuinfotemp["scs_cutd_exit_time"] = ""   // 重症监护退出时间 必填
+	icuinfotemp["scs_cutd_sum_dura"] = ""    // 重症监护合计时长 必填
+	icuinfo = append(icuinfo, icuinfotemp)
+	input["setlinfo"] = inputData
+	input["payinfo"] = payinfo
+	input["opspdiseinfo"] = opspdiseinfo
+	input["diseinfo"] = diseinfo
+	input["iteminfo"] = iteminfo
+
+	inputMessage["input"] = input //交易输入
+	bytesData, _ := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), "", ""
+	}
+
+	var requestLog string
+	requestLog = string(bytesData)
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
+	return output, requestLog, err_msg
+}
+
+func Fjyb4102(psn_no string,SetlId string, params models.PublicParams,stas_type string) (string, string, string) {
+	timestamp := time.Now().Unix()
+	inputMessage := SetHnInputMessage(timestamp, params.FixmedinsName, params.OpterName, params.FixmedinsCode, params.InsuplcAdmdvs, params.MdtrtareaAdmvs, params.Cainfo)
+	// 生成输入报文
+	input := make(map[string]interface{})
+	input2 := make(map[string]interface{})
+
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "4102" // 交易编码
+
+
+	inputData["setl_id"] = SetlId   // 结算 ID  必填
+	inputData["psn_no"] = psn_no     // 结算 ID  必填
+	inputData["stas_type"] = stas_type     // 结算 ID  必填
+	input2["stastinfo"] = inputData
+	input["data"] = input2
+	inputMessage["input"] = input //交易输入
+	bytesData, _ := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), "", ""
+	}
+
+	var requestLog string
+	requestLog = string(bytesData)
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
+	return output, requestLog, err_msg
+}
+
+
 //
 //func Hbyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
 //	// 生成签名

service/gdyb_service.go

@@ -1753,6 +1753,7 @@ func Gdyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputMessage["infno"] = "3201"                                    // 交易编码
 	inputData["insutype"] = businessParams.Insutype                   // 险种
 	inputData["clr_type"] = businessParams.ClrType                    // 就诊 ID（来自2201接口返回）
+
 	inputData["setl_optins"] = businessParams.SetlOptins              // 结算经办机构
 	inputData["stmt_begndate"] = businessParams.StmtBegndate          // 对帐开始时间
 	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间
@@ -2214,7 +2215,7 @@ func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_
 	return str
 }
 
-func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type_code string, start_time string, ent_time string, list_type string) string {
+func Gdyb3301(baseParams models.BaseParams, name string, codg string, list_type_code string, start_time string, ent_time string, list_type string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -2923,12 +2924,12 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	inputData["ntly"] = struct4101.Ntly                     // 国籍  必填
 	inputData["nwb_age"] = ""                               // 年龄  必填
 	inputData["naty"] = struct4101.Naty                     // 民族  必填
-	if org_id == 10138 {
-		inputData["dscg_way"] = "9" // 民族  必填
 
-		inputData["resp_nurs_code"] = "N441623001432" // 民族  必填
+	inputData["dscg_way"] = "9" // 民族  必填
+
+		//inputData["resp_nurs_code"] = "N441623001432" // 民族  必填
+
 
-	}
 
 	inputData["patn_cert_type"] = struct4101.PatnCertType     // 患者证件类别  必填
 	inputData["certno"] = struct4101.Certno                   // 证件号码  必填
@@ -3008,22 +3009,22 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	opspdiseinfo := make([]map[string]interface{}, 0) // 门诊慢特病诊断信息
 
 	opspdiseinfotemp := make(map[string]interface{})
-	opspdiseinfotemp["diag_name"] = struct4101.Diseinfo[len(struct4101.Diseinfo)-1].DiagName // 诊断名称  必填
-	opspdiseinfotemp["diag_code"] = struct4101.Diseinfo[len(struct4101.Diseinfo)-1].DiagCode // 诊断代码 必填
+	opspdiseinfotemp["diag_name"] = "慢性肾功能不全（血透治疗）" // 诊断名称  必填
+	opspdiseinfotemp["diag_code"] ="N18.904" // 诊断代码 必填
 	opspdiseinfotemp["oprn_oprt_name"] = "血液透析"                                              // 手术操作名称 必填
 	opspdiseinfotemp["oprn_oprt_code"] = "39.9500"                                           // 手术操作代码 必填
 	opspdiseinfo = append(opspdiseinfo, opspdiseinfotemp)
 
 	diseinfo := make([]map[string]interface{}, 0) // 住院诊断信息
-	//for _, item := range struct4101.Diseinfo {
-	//	diseinfotemp := make(map[string]interface{})
-	//	diseinfotemp["maindiag_flag"] = item.MaindiagFlag // 手术操作代码 必填
-	//	diseinfotemp["diag_type"] = item.DiagType         // 诊断类别  必填
-	//	diseinfotemp["diag_code"] = item.DiagCode         // 诊断代码 必填
-	//	diseinfotemp["diag_name"] = item.DiagName         // 诊断名称 必填
-	//	diseinfotemp["adm_cond_type"] = "3"               // 入院病情类型 必填
-	//	diseinfo = append(diseinfo, diseinfotemp)
-	//}
+	for _, item := range struct4101.Diseinfo {
+		diseinfotemp := make(map[string]interface{})
+		diseinfotemp["maindiag_flag"] = item.MaindiagFlag // 手术操作代码 必填
+		diseinfotemp["diag_type"] = item.DiagType         // 诊断类别  必填
+		diseinfotemp["diag_code"] = item.DiagCode         // 诊断代码 必填
+		diseinfotemp["diag_name"] = item.DiagName         // 诊断名称 必填
+		diseinfotemp["adm_cond_type"] = "3"               // 入院病情类型 必填
+		diseinfo = append(diseinfo, diseinfotemp)
+	}
 
 	iteminfo := make([]map[string]interface{}, 0)
 	for _, item := range struct4101.IteminfoStruct {
@@ -4962,6 +4963,20 @@ func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_adm
 
 		}
 		//for _, item := range result3260.Output.Data[start-1 : stop] {
+		//	if item.MdtrtId == "out202306301104036" {
+		//		feedetailInfo := make(map[string]interface{})
+		//		feedetailInfo["certno"] = item.Certno
+		//		feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
+		//		feedetailInfo["mdtrt_setl_time"] = item.MdtrtSetlTime     // 人员编号 （来自1101接口返回）
+		//		feedetailInfo["setl_sn"] = item.SetlSn                    // 收费批次号
+		//		feedetailInfo["medfee_sumamt"] = item.MedfeeSumamt        // 病种编码
+		//		feedetailInfo["optins_pay_sumamt"] = item.OptinsPaySumamt // 处方号
+		//		feedetailInfo["cnfm_flag"] = "0"                          // 处方号
+		//		feedetail = append(feedetail, feedetailInfo)
+		//	}
+		//
+		//}
+		//for _, item := range result3260.Output.Data[start-1 : stop] {
 		//	if item.MdtrtId == "out20230418732788" {
 		//		feedetailInfo := make(map[string]interface{})
 		//		feedetailInfo["certno"] = item.Certno
@@ -4989,8 +5004,18 @@ func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		//	}
 		//
 		//}
+		if  fixmedins_code == "H44030501364"{
+
+			inputData["totalrow"] = result3260.Output.Totalrow - 2// 人员姓名
+
+
+		}else{
+
+			inputData["totalrow"] = result3260.Output.Totalrow // 人员姓名
+
+
+		}
 
-		inputData["totalrow"] = 174 // 人员姓名
 
 		// 创建一个新的 Excel 文件
 		//f := excelize.NewFile()
@@ -5082,7 +5107,7 @@ func Gdyb3262(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	inputMessage["infno"] = "3262" // 交易编码
 
 	inputData["trt_year"] = year  // 就诊凭证编号
-	inputData["trt_month"] = "07" // 开始时间
+	inputData["trt_month"] = month // 开始时间
 	inputData["otransid"] = "0"   // 开始时间
 
 	input["data"] = inputData
@@ -6134,3 +6159,371 @@ func SetGdInputMessage(timestamp int64, org_name string, doctor string, fixmedin
 	inputMessage["sign_no"] = "" //交易签到流水号
 	return inputMessage
 }
+
+func Gdyb3101(pd models.PatientDtos, fed models.FsiEncounterDtos, fdds []*models.FsiDiagnoseDtos, fods []*models.FsiOrderDtos, fopds []*models.FsiOperationDtosData, params models.PublicParams, trig_scen string) (string, string) {
+
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, params.SecretKey)
+
+	// 生成输入报文
+	inputMessage := SetGdInputMessage(timestamp, params.FixmedinsName, params.OpterName, params.FixmedinsCode, params.InsuplcAdmdvs, params.MdtrtareaAdmvs, params.Cainfo)
+
+	//inputMessage := SetJSInputMessage(timestamp, params.FixmedinsName, params.OpterName, params.FixmedinsCode, params.InsuplcAdmdvs, params.MdtrtareaAdmvs, params.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	patientDtosinputData := make(map[string]interface{})
+	fisEncounterDtosData := make(map[string]interface{})
+	fsiDiagnoseDtosDatas := make([]map[string]interface{}, 0)
+
+	fsiOrderDtosDatas := make([]map[string]interface{}, 0)
+
+	fsiOperationDtosData := make(map[string]interface{})
+	fsiOperationDtosDatas := make([]map[string]interface{}, 0)
+
+	//就诊信息
+	fisEncounterDtosData["mdtrt_id"] = fed.MdtrtID
+	fisEncounterDtosData["medins_id"] = fed.MedinsID
+	fisEncounterDtosData["medins_name"] = fed.MedinsName
+	fisEncounterDtosData["medins_admdvs"] = fed.MedinsAdmdvs
+	fisEncounterDtosData["medins_type"] = fed.MedinsType
+	fisEncounterDtosData["medins_lv"] = fed.MedinsLv
+	fisEncounterDtosData["wardarea_codg"] = fed.WardareaCodg
+	fisEncounterDtosData["wardno"] = fed.Wardno
+	fisEncounterDtosData["bedno"] = fed.Bedno
+	fisEncounterDtosData["adm_date"] = fed.AdmDate
+	fisEncounterDtosData["dscg_date"] = fed.DscgDate
+	fisEncounterDtosData["dscg_main_dise_codg"] = fed.DscgMainDiseCodg
+	fisEncounterDtosData["dscg_main_dise_name"] = fed.DscgMainDiseName
+
+	for _, fdd := range fdds {
+		fsiDiagnoseDtosData := make(map[string]interface{})
+		//诊断集合
+		fsiDiagnoseDtosData["dise_id"] = fdd.DiseID
+		fsiDiagnoseDtosData["inout_dise_type"] = fdd.InoutDiseType
+		fsiDiagnoseDtosData["maindise_flag"] = fdd.MaindiseFlag
+		fsiDiagnoseDtosData["dias_srt_no"] = fdd.DiasSrtNo
+		fsiDiagnoseDtosData["dise_codg"] = fdd.DiseCodg
+		fsiDiagnoseDtosData["dise_name"] = fdd.DiseName
+		fsiDiagnoseDtosData["dise_date"] = fdd.DiseDate
+		fsiDiagnoseDtosDatas = append(fsiDiagnoseDtosDatas, fsiDiagnoseDtosData)
+	}
+
+	fisEncounterDtosData["fsi_diagnose_dtos"] = fsiDiagnoseDtosDatas
+
+	fisEncounterDtosData["dr_codg"] = fed.DrCodg
+	fisEncounterDtosData["adm_dept_codg"] = fed.AdmDeptCodg
+	fisEncounterDtosData["adm_dept_name"] = fed.AdmDeptName
+	fisEncounterDtosData["dscg_dept_codg"] = fed.DscgDeptCodg
+	fisEncounterDtosData["dscg_dept_name"] = fed.DscgDeptName
+	fisEncounterDtosData["med_mdtrt_type"] = fed.MedMdtrtType
+	fisEncounterDtosData["med_type"] = fed.MedType
+
+	for _, fod := range fods {
+		fsiOrderDtosData := make(map[string]interface{})
+		//医嘱集合
+		fsiOrderDtosData["rx_id"] = fod.RxID
+		fsiOrderDtosData["rxno"] = fod.Rxno
+		fsiOrderDtosData["grpno"] = fod.Grpno
+		fsiOrderDtosData["long_drord_flag"] = fod.LongDrordFlag
+		fsiOrderDtosData["hilist_type"] = fod.HilistType
+		fsiOrderDtosData["chrg_type"] = fod.ChrgType
+		fsiOrderDtosData["drord_bhvr"] = fod.DrordBhvr
+		fsiOrderDtosData["hilist_code"] = fod.HilistCode
+		fsiOrderDtosData["hilist_name"] = fod.HosplistName
+		fsiOrderDtosData["hilist_dosform"] = fod.HilistDosform
+		fsiOrderDtosData["hilist_lv"] = fod.HilistLv
+		fsiOrderDtosData["hilist_pric"] = fod.HilistPric
+		fsiOrderDtosData["lv1_hosp_item_pric"] = fod.Lv1HospItemPric
+		fsiOrderDtosData["lv2_hosp_item_pric"] = fod.Lv2HospItemPric
+		fsiOrderDtosData["lv3_hosp_item_pric"] = fod.Lv3HospItemPric
+		fsiOrderDtosData["hilist_memo"] = fod.HilistMemo
+		fsiOrderDtosData["hosplist_code"] = fod.HosplistCode
+		fsiOrderDtosData["hosplist_name"] = fod.HosplistName
+		fsiOrderDtosData["hosplist_dosform"] = fod.HosplistDosform
+		fsiOrderDtosData["cnt"] = fod.Cnt
+		fsiOrderDtosData["pric"] = fod.Pric
+		fsiOrderDtosData["sumamt"] = fod.Sumamt
+		fsiOrderDtosData["ownpay_amt"] = fod.OwnpayAmt
+		fsiOrderDtosData["selfpay_amt"] = fod.SelfpayAmt
+		fsiOrderDtosData["spec"] = fod.Spec
+		fsiOrderDtosData["spec_unt"] = fod.SpecUnt
+		fsiOrderDtosData["drord_begn_date"] = fod.DrordBegnDate
+		fsiOrderDtosData["drord_stop_date"] = fod.DrordStopDate
+		fsiOrderDtosData["drord_dept_codg"] = fod.DrordDeptCodg
+		fsiOrderDtosData["drord_dept_name"] = fod.DrordDeptName
+		fsiOrderDtosData["drord_dr_codg"] = fod.DrordDrCodg
+		fsiOrderDtosData["drord_dr_name"] = fod.DrordDrName
+		fsiOrderDtosData["drord_dr_profttl"] = fod.DrordDrProfttl
+		fsiOrderDtosData["curr_drord_flag"] = fod.CurrDrordFlag
+		fsiOrderDtosDatas = append(fsiOrderDtosDatas, fsiOrderDtosData)
+	}
+	fisEncounterDtosData["fsi_order_dtos"] = fsiOrderDtosDatas
+
+	fisEncounterDtosData["matn_stas"] = fed.MatnStas
+	fisEncounterDtosData["medfee_sumamt"] = fed.MedfeeSumamt
+	fisEncounterDtosData["ownpay_amt"] = fed.OwnpayAmt
+	fisEncounterDtosData["selfpay_amt"] = fed.SelfpayAmt
+	fisEncounterDtosData["acct_payamt"] = fed.AcctPayamt
+	fisEncounterDtosData["ma_amt"] = fed.MaAmt
+	fisEncounterDtosData["hifp_payamt"] = fed.HifpPayamt
+	fisEncounterDtosData["setl_totlnum"] = fed.SetlTotlnum
+	fisEncounterDtosData["insutype"] = fed.Insutype
+	fisEncounterDtosData["reim_flag"] = fed.ReimFlag
+	fisEncounterDtosData["out_setl_flag"] = fed.OutSetlFlag
+
+	//手术操作
+	for _, fopd := range fopds {
+		fsiOperationDtosData["setl_list_oprn_id"] = fopd.Setl_list_oprn_id
+		fsiOperationDtosData["oprn_code"] = fopd.Oprn_code
+		fsiOperationDtosData["oprn_name"] = fopd.Oprn_name
+		fsiOperationDtosData["main_oprn_flag"] = fopd.Main_oprn_flag
+		fsiOperationDtosData["oprn_date"] = fopd.Oprn_date
+		fsiOperationDtosData["anst_way"] = fopd.Anst_way
+		fsiOperationDtosData["oper_dr_name"] = fopd.Oper_dr_name
+		fsiOperationDtosData["oper_dr_code"] = fopd.Oper_dr_code
+		fsiOperationDtosData["anst_dr_name"] = fopd.Anst_dr_name
+		fsiOperationDtosData["anst_dr_code"] = fopd.Anst_dr_code
+		fsiOperationDtosDatas = append(fsiOperationDtosDatas, fsiOperationDtosData)
+	}
+	fisEncounterDtosData["fsi_operation_dtos"] = fsiOperationDtosDatas
+
+	patientDtosinputData["patn_id"] = pd.PatnID
+	patientDtosinputData["patn_name"] = pd.PatnName
+	patientDtosinputData["gend"] = pd.Gend
+	patientDtosinputData["brdy"] = pd.Brdy
+	patientDtosinputData["poolarea"] = pd.Poolarea
+	patientDtosinputData["curr_mdtrt_id"] = pd.CurrMdtrtID
+	patientDtosinputData["fsi_his_data_dto"] = ""
+	patientDtosinputData["fsi_encounter_dtos"] = fisEncounterDtosData
+	inputData["syscode"] = "LinkDialysis"
+	inputData["trig_scen"] = trig_scen
+	inputData["rule_ids"] = ""
+	inputData["task_id"] = ""
+
+	inputData["patient_dtos"] = patientDtosinputData
+	input["data"] = inputData
+	inputMessage["infno"] = "3101"
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_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 + "3101"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(),""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(),""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(),""
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str,string(bytesData)
+}
+func  Gdyb3102(pd models.PatientDtos, fed models.FsiEncounterDtos, fdds []*models.FsiDiagnoseDtos, fods []*models.FsiOrderDtos, fopds []*models.FsiOperationDtosData, params models.PublicParams, trig_scen string) (string, string) {
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, params.SecretKey)
+
+	// 生成输入报文
+	inputMessage := SetGdInputMessage(timestamp, params.FixmedinsName, params.OpterName, params.FixmedinsCode, params.InsuplcAdmdvs, params.MdtrtareaAdmvs, params.Cainfo)
+
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	patientDtosinputData := make(map[string]interface{})
+	fisEncounterDtosData := make(map[string]interface{})
+	fsiDiagnoseDtosDatas := make([]map[string]interface{}, 0)
+
+	fsiOrderDtosDatas := make([]map[string]interface{}, 0)
+
+	fsiOperationDtosData := make(map[string]interface{})
+	fsiOperationDtosDatas := make([]map[string]interface{}, 0)
+
+	//就诊信息
+	fisEncounterDtosData["mdtrt_id"] = fed.MdtrtID
+	fisEncounterDtosData["medins_id"] = fed.MedinsID
+	fisEncounterDtosData["medins_name"] = fed.MedinsName
+	fisEncounterDtosData["medins_admdvs"] = fed.MedinsAdmdvs
+	fisEncounterDtosData["medins_type"] = fed.MedinsType
+	fisEncounterDtosData["medins_lv"] = fed.MedinsLv
+	fisEncounterDtosData["wardarea_codg"] = fed.WardareaCodg
+	fisEncounterDtosData["wardno"] = fed.Wardno
+	fisEncounterDtosData["bedno"] = fed.Bedno
+	fisEncounterDtosData["adm_date"] = fed.AdmDate
+	fisEncounterDtosData["dscg_date"] = fed.DscgDate
+	fisEncounterDtosData["dscg_main_dise_codg"] = fed.DscgMainDiseCodg
+	fisEncounterDtosData["dscg_main_dise_name"] = fed.DscgMainDiseName
+
+	for _, fdd := range fdds {
+		fsiDiagnoseDtosData := make(map[string]interface{})
+		//诊断集合
+		fsiDiagnoseDtosData["dise_id"] = fdd.DiseID
+		fsiDiagnoseDtosData["inout_dise_type"] = fdd.InoutDiseType
+		fsiDiagnoseDtosData["maindise_flag"] = fdd.MaindiseFlag
+		fsiDiagnoseDtosData["dias_srt_no"] = fdd.DiasSrtNo
+		fsiDiagnoseDtosData["dise_codg"] = fdd.DiseCodg
+		fsiDiagnoseDtosData["dise_name"] = fdd.DiseName
+		fsiDiagnoseDtosData["dise_date"] = fdd.DiseDate
+		fsiDiagnoseDtosDatas = append(fsiDiagnoseDtosDatas, fsiDiagnoseDtosData)
+	}
+
+	fisEncounterDtosData["fsi_diagnose_dtos"] = fsiDiagnoseDtosDatas
+
+	fisEncounterDtosData["dr_codg"] = fed.DrCodg
+	fisEncounterDtosData["adm_dept_codg"] = fed.AdmDeptCodg
+	fisEncounterDtosData["adm_dept_name"] = fed.AdmDeptName
+	fisEncounterDtosData["dscg_dept_codg"] = fed.DscgDeptCodg
+	fisEncounterDtosData["dscg_dept_name"] = fed.DscgDeptName
+	fisEncounterDtosData["med_mdtrt_type"] = fed.MedMdtrtType
+	fisEncounterDtosData["med_type"] = fed.MedType
+
+	for _, fod := range fods {
+		fsiOrderDtosData := make(map[string]interface{})
+		//医嘱集合
+		fsiOrderDtosData["rx_id"] = fod.RxID
+		fsiOrderDtosData["rxno"] = fod.Rxno
+		fsiOrderDtosData["grpno"] = fod.Grpno
+		fsiOrderDtosData["long_drord_flag"] = fod.LongDrordFlag
+		fsiOrderDtosData["hilist_type"] = fod.HilistType
+		fsiOrderDtosData["chrg_type"] = fod.ChrgType
+		fsiOrderDtosData["drord_bhvr"] = fod.DrordBhvr
+		fsiOrderDtosData["hilist_code"] =  fod.HosplistCode
+		fsiOrderDtosData["hilist_name"] = fod.HosplistName
+		fsiOrderDtosData["hilist_dosform"] = fod.HilistDosform
+		fsiOrderDtosData["hilist_lv"] = fod.HilistLv
+		fsiOrderDtosData["hilist_pric"] = fod.HilistPric
+		fsiOrderDtosData["lv1_hosp_item_pric"] = fod.Lv1HospItemPric
+		fsiOrderDtosData["lv2_hosp_item_pric"] = fod.Lv2HospItemPric
+		fsiOrderDtosData["lv3_hosp_item_pric"] = fod.Lv3HospItemPric
+		fsiOrderDtosData["hilist_memo"] = fod.HilistMemo
+		fsiOrderDtosData["hosplist_code"] = fod.HosplistCode
+		fsiOrderDtosData["hosplist_name"] = fod.HosplistName
+		fsiOrderDtosData["hosplist_dosform"] = fod.HosplistDosform
+		fsiOrderDtosData["cnt"] = fod.Cnt
+		fsiOrderDtosData["pric"] = fod.Pric
+		fsiOrderDtosData["sumamt"] = fod.Sumamt
+		fsiOrderDtosData["ownpay_amt"] = fod.OwnpayAmt
+		fsiOrderDtosData["selfpay_amt"] = fod.SelfpayAmt
+		fsiOrderDtosData["spec"] = fod.Spec
+		fsiOrderDtosData["spec_unt"] = fod.SpecUnt
+		fsiOrderDtosData["drord_begn_date"] = fod.DrordBegnDate
+		fsiOrderDtosData["drord_stop_date"] = fod.DrordStopDate
+		fsiOrderDtosData["drord_dept_codg"] = fod.DrordDeptCodg
+		fsiOrderDtosData["drord_dept_name"] = fod.DrordDeptName
+		fsiOrderDtosData["drord_dr_codg"] = fod.DrordDrCodg
+		fsiOrderDtosData["drord_dr_name"] = fod.DrordDrName
+		fsiOrderDtosData["drord_dr_profttl"] = fod.DrordDrProfttl
+		fsiOrderDtosData["curr_drord_flag"] = fod.CurrDrordFlag
+		fsiOrderDtosDatas = append(fsiOrderDtosDatas, fsiOrderDtosData)
+	}
+
+	fisEncounterDtosData["fsi_order_dtos"] = fsiOrderDtosDatas
+
+	fisEncounterDtosData["matn_stas"] = fed.MatnStas
+	fisEncounterDtosData["medfee_sumamt"] = fed.MedfeeSumamt
+	fisEncounterDtosData["ownpay_amt"] = fed.OwnpayAmt
+	fisEncounterDtosData["selfpay_amt"] = fed.SelfpayAmt
+	fisEncounterDtosData["acct_payamt"] = fed.AcctPayamt
+	fisEncounterDtosData["ma_amt"] = fed.MaAmt
+	fisEncounterDtosData["hifp_payamt"] = fed.HifpPayamt
+	fisEncounterDtosData["setl_totlnum"] = fed.SetlTotlnum
+	fisEncounterDtosData["insutype"] = fed.Insutype
+	fisEncounterDtosData["reim_flag"] = fed.ReimFlag
+	fisEncounterDtosData["out_setl_flag"] = fed.OutSetlFlag
+
+	//手术操作
+	for _, fopd := range fopds {
+		fsiOperationDtosData["setl_list_oprn_id"] = fopd.Setl_list_oprn_id
+		fsiOperationDtosData["oprn_code"] = fopd.Oprn_code
+		fsiOperationDtosData["oprn_name"] = fopd.Oprn_name
+		fsiOperationDtosData["main_oprn_flag"] = fopd.Main_oprn_flag
+		fsiOperationDtosData["oprn_date"] = fopd.Oprn_date
+		fsiOperationDtosData["anst_way"] = fopd.Anst_way
+		fsiOperationDtosData["oper_dr_name"] = fopd.Oper_dr_name
+		fsiOperationDtosData["oper_dr_code"] = fopd.Oper_dr_code
+		fsiOperationDtosData["anst_dr_name"] = fopd.Anst_dr_name
+		fsiOperationDtosData["anst_dr_code"] = fopd.Anst_dr_code
+		fsiOperationDtosDatas = append(fsiOperationDtosDatas, fsiOperationDtosData)
+	}
+	fisEncounterDtosData["fsi_operation_dtos"] = fsiOperationDtosDatas
+
+	patientDtosinputData["patn_id"] = pd.PatnID
+	patientDtosinputData["patn_name"] = pd.PatnName
+	patientDtosinputData["gend"] = pd.Gend
+	patientDtosinputData["brdy"] = pd.Brdy
+	patientDtosinputData["poolarea"] = pd.Poolarea
+	patientDtosinputData["curr_mdtrt_id"] = pd.CurrMdtrtID
+	patientDtosinputData["fsi_his_data_dto"] = ""
+	patientDtosinputData["fsi_encounter_dtos"] = fisEncounterDtosData
+	inputData["syscode"] = "LinkDialysis"
+	inputData["trig_scen"] = trig_scen
+	inputData["rule_ids"] = ""
+	inputData["task_id"] = ""
+	inputData["patient_dtos"] = patientDtosinputData
+	input["data"] = inputData
+	inputMessage["infno"] = "3102"
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_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 + "3102"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(),""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(),""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(),""
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str,string(bytesData)
+}
+

service/hbyb_service.go

@@ -922,6 +922,89 @@ func Hbyb3202a(baseParams models.BaseParams, businessParams []*models.BusinessPa
 
 }
 
+
+func Hbyb5262(baseParams models.BaseParams, businessParams models.BusinessParams5262, page string , limit string) string {
+
+	fmt.Println(baseParams)
+	fmt.Println(businessParams)
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	//inputDatas := []make(map[string]interface{})
+
+	inputMessage["infno"] = "5262" // 交易编码
+	inputData := make(map[string]interface{})
+	inputData["refd_setl_flag"] = businessParams.RefdSetlFlag
+	inputData["q_begntime"] = businessParams.QBegntime
+	inputData["q_endtime"] = businessParams.QEndtime
+	inputData["med_type"] =   businessParams.MedType
+	inputData["page_num"] = page
+	inputData["page_size"] = limit
+	inputData["certno"] = businessParams.Certno
+	inputData["psnno"] = businessParams.Psnno
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "5262", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	fmt.Println(string(out))
+	return ConvertToString(string(out), "gbk", "utf-8")
+}
+
+func Hbyb5267(baseParams models.BaseParams, businessParams models.BusinessParams5262, page string , limit string) string {
+
+	fmt.Println(baseParams)
+	fmt.Println(businessParams)
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	//inputDatas := []make(map[string]interface{})
+
+	inputMessage["infno"] = "5267" // 交易编码
+	inputData := make(map[string]interface{})
+	inputData["refd_setl_flag"] = businessParams.RefdSetlFlag
+	inputData["q_begntime"] = businessParams.QBegntime
+	inputData["q_endtime"] = businessParams.QEndtime
+	inputData["med_type"] =   businessParams.MedType
+	inputData["page_num"] = page
+	inputData["page_size"] = limit
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "5267", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	fmt.Println(string(out))
+	return ConvertToString(string(out), "gbk", "utf-8")
+}
+
 //文件上传
 
 //文件上传

service/his_project_service.go

@@ -715,6 +715,20 @@ func GetBatchDrugList(idss []int64) (drug []*models.BaseDrugList, err error) {
 
 	return drug, err
 }
+func GetBatchDrugListtw(org_id int64) (drug []*models.BaseDrugList, err error) {
+
+	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_manufacturer as m")
+	fmt.Print(table)
+
+		db = db.Where("x.org_id = ?", org_id)
+
+	err = db.Select("x.id,x.medical_insurance_number,x.code,x.drug_name,x.drug_spec,x.drug_type,x.min_unit,x.last_price,x.retail_price,x.limit_remark,x.drug_dosage_form,x.social_security_directory_code,m.manufacturer_name").Joins("left join xt_manufacturer as m on m.id = x.manufacturer").Scan(&drug).Error
+
+	return drug, err
+}
+
+
 
 func GetBatchGoodInformationList(idss []int64) (good []*models.GoodInformation, err error) {
 
@@ -729,3 +743,17 @@ func GetBatchGoodInformationList(idss []int64) (good []*models.GoodInformation,
 	err = db.Select("x.id,x.social_security_directory_code,x.good_name,x.specification_name,x.production_type,x.special_medical,x.good_unit,x.buy_price,x.sell_price,x.remark,m.manufacturer_name").Joins("left join xt_manufacturer as m on m.id = x.manufacturer").Scan(&good).Error
 	return good, err
 }
+
+
+func GetBatchGoodInformationListtwo(org_id int64) (good []*models.GoodInformation, err error) {
+
+	db := XTReadDB().Table("xt_good_information as x").Where("x.status=1")
+	table := XTReadDB().Table("xt_manufacturer as m")
+	fmt.Println(table)
+
+		db = db.Where("x.org_id = ?", org_id)
+
+	err = db.Select("x.id,x.social_security_directory_code,x.good_name,x.specification_name,x.production_type,x.special_medical,x.good_unit,x.buy_price,x.sell_price,x.remark,m.manufacturer_name").Joins("left join xt_manufacturer as m on m.id = x.manufacturer").Scan(&good).Error
+	return good, err
+}
+

service/his_service.go

@@ -526,6 +526,16 @@ func FindLastPatientPrescriptionInfoTwo(org_id int64, patient_id int64, record_d
 	return
 }
 
+func FindLastPatientPrescriptionInfoTwo1(org_id int64, patient_id int64) (info models.HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? and p_type = 1", org_id, patient_id).Last(&info).Error
+	return
+}
+
+func FindLastPatientPrescriptionInfoTwo2(org_id int64, patient_id int64,start_time string, end_time string) (info []models.HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? and p_type = 1 and FROM_UNIXTIME(record_date) >= ? and FROM_UNIXTIME(record_date) <= ?", org_id, patient_id,start_time,end_time).Find(&info).Error
+	return
+}
+
 func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 	err = writeDb.Save(&info).Error
 	return
@@ -1072,6 +1082,12 @@ func FindDiagnoseById(id int64) (models.HisXtDiagnoseConfig, error) {
 	return dealer, err
 }
 
+func FindDiagnoseByIdtwo(id string) (models.HisXtDiagnoseConfig, error) {
+	dealer := models.HisXtDiagnoseConfig{}
+	err := readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ?", id).First(&dealer).Error
+	return dealer, err
+}
+
 func FindDiagnoseByIds(ids []string) ([]*models.HisXtDiagnoseConfig, error) {
 	dealer := []*models.HisXtDiagnoseConfig{}
 	err := readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id IN (?) AND status = 1", ids).Find(&dealer).Error
@@ -1289,7 +1305,14 @@ func GetBathchMyPorjecgList(idss []int64) (project []*models.MyHisProject, err e
 
 	return project, err
 }
+func GetBathchMyPorjecgListtwo(org_id int64) (project []*models.MyHisProject, err error) {
+	db := XTReadDB().Table("xt_his_project")
+
+	err = db.Where("status = 1 and user_org_id = ?", org_id).Find(&project).Error
 
+
+	return project, err
+}
 func GetBatchDoctorList(idss []int64) (role []*models.SgjUserAdminRole, err error) {
 
 	db := UserReadDB().Table("sgj_user_admin_role as x").Where("x.status =1")
@@ -1485,7 +1508,7 @@ func GetAllHisOrderTwo(org_id int64) (his []*models.HisOrder, err error) {
 }
 
 func GetAllHisOrder10106(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2023-07-01 00:00:00' AND setl_time <= '2023-07-31 23:59:00'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2023-08-01 00:00:00' AND setl_time <= '2023-08-31 23:59:00'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1506,6 +1529,14 @@ func GetAllHisOrder10278() (his []*models.HisOrder, err error) {
 	return
 }
 
+
+func GetAllHisOrder10265() (his []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10265  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2023-09-01 00:00:00'").Order("setl_time asc").Find(&his).Error
+	fmt.Println(err)
+	return
+}
+
+
 //	func GetAllHisOrder2(org_id int64) (his []models.HisOrder, err error) {
 //		err = readDb.Model(&models.HisOrder{}).Where("id = 180753").Order("setl_time asc").First(&his).Error
 //		return
@@ -1608,3 +1639,22 @@ func GetOrderDetailByTimeTen(start_time string, end_time string, org_id int64, f
 }
 
 //
+func Saveflow(flow models.HisPrescriptionFlow){
+	writeDb.Save(&flow)
+}
+
+
+
+func GetNewHisPrescriptionTenone(org_id int64,number string) (prescription []*models.HisPrescriptionTen, err error) {
+	err = readDb.Model(&models.HisPrescriptionTen{}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("BaseDrugLib", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject", "status=1").Preload("GoodInfo", "status=1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND batch_number = ? and order_status = 4 ", org_id, number).
+		Find(&prescription).Error
+	return
+}
+

service/hn_service.go

@@ -532,7 +532,7 @@ func Hnyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["rx_circ_flag"] = "0"                          // 外购处方标志
 		feedetailInfo["fee_ocur_time"] = item.FeeOcurTime            // 费用发生时间
 		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
-		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
+		feedetailInfo["medins_list_codg"] =  item.MedListCodg          // 医药机构目录编码
 		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额
 		feedetailInfo["cnt"] = item.Cut                              // 数量
 		feedetailInfo["pric"] = item.Price                           // 单价
@@ -2036,3 +2036,86 @@ func Hnyb3507(struct3507 models.Struct3507) (string, string) {
 	return HNHttpRequest(struct3507.RequestUrl, struct3507.AccessKey, struct3507.SecretKey, timestamp, string(bytesData), "3507"), string(bytesData)
 
 }
+
+
+
+func Hnyb3301(org_name string,opera string,fixmedins_code string,insuplc_admdvs string,mdtrtarea_admvs string,cainfo string, name string, codg string, list_type string,start_time string, ent_time string, request_url string,access_key string,secret_key string) (string,string) {
+	// 生成签名
+	//nonce := GetRandomString(32)
+	// 生成签名
+	timestamp := time.Now().Unix()
+	//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)
+
+	// 生成输入报文
+	//inputMessage := SetHnInputMessage(timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs, baseParams.Cainfo)
+
+	//inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3301" // 交易编码
+	inputData["fixmedins_hilist_id"] = codg
+	inputData["fixmedins_hilist_name"] = name
+	inputData["list_type"] = list_type
+	inputData["med_list_codg"] = codg
+	inputData["begndate"] = start_time
+	inputData["enddate"] = ent_time
+
+	inputData["aprvno"] = ""
+	inputData["dosform"] = ""
+	inputData["exct_cont"] = ""
+	inputData["item_cont"] = ""
+	inputData["prcunt"] = ""
+	inputData["spec"] = ""
+	inputData["pacspec"] = ""
+	inputData["memo"] = ""
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(),""
+	}
+
+	request_url = request_url + "3301"
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "3301"), string(bytesData)
+
+}
+func Hnyb3302(org_name string,opera string,fixmedins_code string,insuplc_admdvs string,mdtrtarea_admvs string,cainfo string, name string, codg string, list_type string,start_time string, ent_time string, request_url string,access_key string,secret_key string) (string,string) {
+	// 生成签名
+	//nonce := GetRandomString(32)
+	// 生成签名
+	timestamp := time.Now().Unix()
+	//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)
+
+	// 生成输入报文
+	//inputMessage := SetHnInputMessage(timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs, baseParams.Cainfo)
+
+	//inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3302" // 交易编码
+	inputData["fixmedins_code"] = fixmedins_code
+	inputData["fixmedins_hilist_id"] = codg
+	inputData["list_type"] = list_type
+	inputData["med_list_codg"] = codg
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(),""
+	}
+
+	request_url = request_url + "3302"
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "3302"), string(bytesData)
+
+}

service/jsyb_service.go

@@ -613,23 +613,15 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
 		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
 
-		if fixmedins_code == "H32092103007" {
-			feedetailInfo["bilg_dr_codg"] = "D320923012139"   // 开单医生编码
-			feedetailInfo["bilg_dr_name"] = "王曙光"             // 开单医师姓名
-			feedetailInfo["acord_dept_codg"] = ""             // 受单科室编码
-			feedetailInfo["acord_dept_name"] = ""             // 受单科室名称
-			feedetailInfo["orders_dr_code"] = "D320923012139" // 受单医生编码
-			feedetailInfo["orders_dr_name"] = "王曙光"           // 受单医生姓名
 
-		} else {
-			feedetailInfo["bilg_dr_codg"] = "D371621008686"   // 开单医生编码
-			feedetailInfo["bilg_dr_name"] = "王云刚"             // 开单医师姓名
+			feedetailInfo["bilg_dr_codg"] = item.DoctorNumber   // 开单医生编码
+			feedetailInfo["bilg_dr_name"] = item.DoctorName             // 开单医师姓名
 			feedetailInfo["acord_dept_codg"] = ""             // 受单科室编码
 			feedetailInfo["acord_dept_name"] = ""             // 受单科室名称
-			feedetailInfo["orders_dr_code"] = "D371621008686" // 受单医生编码
-			feedetailInfo["orders_dr_name"] = "王云刚"           // 受单医生姓名
+			feedetailInfo["orders_dr_code"] = item.DoctorNumber  // 受单医生编码
+			feedetailInfo["orders_dr_name"] = item.DoctorName            // 受单医生姓名
+
 
-		}
 
 		if balance_accounts_type == "8" {
 			feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志

service/nm_service.go

@@ -995,3 +995,4 @@ func Nmyb2503(psnNo string, insutype string, org_name string, op string, doctor
 	fmt.Println(str)
 	return str
 }
+

service/zh_his_service.go

@@ -1735,3 +1735,68 @@ func ZHyb4103(baseParams models.BaseParams, businessParams models.BusinessParams
 	fmt.Println(str)
 	return str
 }
+func ZHyb4104(baseParams models.BaseParams, businessParams models.BusinessParams) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, baseParams.SecretKey)
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "4104" // 交易编码
+	inputData["setl_ym"] = "202309"
+	inputData["page_num"] = "1"
+	inputData["page_size"] = "100"
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	//url := gdyb_url + "5203"
+	var url string
+	if baseParams.FixmedinsCode == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "4103"
+	}
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5203"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}