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

controllers/js/jsyb_controller.go

@@ -53,12 +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/readcardface", &JSybController{}, "get:Readcardface")
 
-
 	beego.Router("/jsyb/3260", &JSybController{}, "get:Get3260")
 	beego.Router("/jsyb/3261", &JSybController{}, "get:Get3261")
 	beego.Router("/jsyb/3262", &JSybController{}, "post:Get3262")
@@ -76,9 +74,6 @@ func JSybRegistRouters() {
 	beego.Router("/jsyb/3274", &JSybController{}, "post:Get3274")
 	beego.Router("/jsyb/3275", &JSybController{}, "post:Get3275")
 
-
-
-
 	beego.Router("/jsyb/3501", &JSybController{}, "post:Get3501")
 	beego.Router("/jsyb/3502", &JSybController{}, "post:Get3502")
 	beego.Router("/jsyb/3503", &JSybController{}, "post:Get3503")
@@ -86,19 +81,21 @@ func JSybRegistRouters() {
 	beego.Router("/jsyb/3505", &JSybController{}, "post:Get3505")
 	beego.Router("/jsyb/3506", &JSybController{}, "post:Get3506")
 	beego.Router("/jsyb/3507", &JSybController{}, "post:Get3507")
-
-
+	beego.Router("/jsyb/3508", &JSybController{}, "post:Get3508")
+	beego.Router("/jsyb/3509", &JSybController{}, "post:Get3509")
+	beego.Router("/jsyb/3510", &JSybController{}, "post:Get3510")
+	beego.Router("/jsyb/3511", &JSybController{}, "post:Get3511")
+	beego.Router("/jsyb/3512", &JSybController{}, "post:Get3512")
+	beego.Router("/jsyb/3513", &JSybController{}, "post:Get3513")
 
 	beego.Router("/jsyb/1318", &JSybController{}, "get:Get1318")
 
-
-
 	//beego.Router("/jsyb/3276", &JSybController{}, "post:Get3276")
 	//beego.Router("/jsyb/3277", &JSybController{}, "post:Get3277")
 
 }
 
-func (c *JSybController)Get1318(){
+func (c *JSybController) Get1318() {
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
 	fixmedins_code := c.GetString("fixmedins_code")
@@ -109,7 +106,7 @@ func (c *JSybController)Get1318(){
 	ak := c.GetString("ak")
 	h_code := c.GetString("h_code")
 	cainfo := c.GetString("cainfo")
-	result, request := service.Jsyb1318(h_code,org_name,doctor,fixmedins_code,insuplc_admdvs,mdtrtarea_admvs,secret_key,url,ak,cainfo)
+	result, request := service.Jsyb1318(h_code, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, cainfo)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request), &dat2); err == nil {
 	} else {
@@ -1081,6 +1078,200 @@ func (c *JSybController) Get3507() {
 	})
 
 }
+
+func (c *JSybController) Get3508() {
+	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["struct_3508s"])
+	var struct3508 models.Struct3508
+	if err := json.Unmarshal(userJSONBytes, &struct3508); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3508(struct3508)
+	saveJsLog(result, request_log, "3508", "库存查询", struct3508.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+func (c *JSybController) Get3509() {
+	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["struct_3509s"])
+	var struct3509 models.Struct3509
+	if err := json.Unmarshal(userJSONBytes, &struct3509); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3509(struct3509)
+	saveJsLog(result, request_log, "3509", "库存查询", struct3509.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+func (c *JSybController) Get3510() {
+	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["struct_3510s"])
+	var struct3510 models.Struct3510
+	if err := json.Unmarshal(userJSONBytes, &struct3510); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3510(struct3510)
+	saveJsLog(result, request_log, "3510", "库存盘点", struct3510.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+func (c *JSybController) Get3511() {
+	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["struct_3511s"])
+	var struct3511 models.Struct3511
+	if err := json.Unmarshal(userJSONBytes, &struct3511); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3511(struct3511)
+	saveJsLog(result, request_log, "3511", "库存查询", struct3511.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+func (c *JSybController) Get3512() {
+	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["struct_3512s"])
+	var struct3512 models.Struct3512
+	if err := json.Unmarshal(userJSONBytes, &struct3512); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3512(struct3512)
+	saveJsLog(result, request_log, "3512", "3512查询", struct3512.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+func (c *JSybController) Get3513() {
+	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["struct_3513s"])
+	var struct3513 models.Struct3513
+	if err := json.Unmarshal(userJSONBytes, &struct3513); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3513(struct3513)
+	saveJsLog(result, request_log, "3513", "库存盘点", struct3513.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+
 func (c *JSybController) Get9001() {
 
 }
@@ -1091,8 +1282,8 @@ func (c *JSybController) PostOnec() {
 
 }
 func (c *JSybController) Posttwoc() {
-	result, request_log := service.Jsyb2201F()
-	saveJsLog(result, request_log, "2201", "挂号", "盐城响水悦达血液透析中心有限公司")
+	//result, request_log := service.2201F()
+	//saveJsLog(result, request_log, "2201", "挂号", "盐城响水悦达血液透析中心有限公司")
 
 }
 func (c *JSybController) Get5301() {
@@ -1379,8 +1570,6 @@ func (c *JSybController) PostFive() {
 		return
 	}
 
-
-
 	//fmt.Println("2203A的time_stamp=" + respJSON["time_stamp"].(string))
 	result, request_log := service.Jsyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
 		respJSON["opter"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string), "", respJSON["url"].(string), respJSON["ak"].(string), respJSON["new_doctor_name"].(string), "", respJSON["cainfo"].(string))
@@ -1742,7 +1931,7 @@ type ELeCertData struct {
 
 type ELeCertDatathree struct {
 	Data struct {
-		AuthNo       string `json:"authNo"`
+		AuthNo      string `json:"authNo"`
 		Extra       string `json:"extra"`
 		IDNo        string `json:"idNo"`
 		IDType      string `json:"idType"`
@@ -1759,16 +1948,15 @@ type ELeCertDatathree struct {
 	Message string `json:"message"`
 }
 
-
-
 type ELeCertDatatwo struct {
 	Data struct {
-		AuthNo       string `json:"authNo"`
-		OutBizNo        string `json:"outBizNo"`
+		AuthNo   string `json:"authNo"`
+		OutBizNo string `json:"outBizNo"`
 	} `json:"data"`
 	Code    int    `json:"code"`
 	Message string `json:"message"`
 }
+
 func (c *JSybController) Readcardface() {
 	fixmedins_code := c.GetString("fixmedins_code")
 	secret_key := c.GetString("secret_key")
@@ -1784,13 +1972,13 @@ func (c *JSybController) Readcardface() {
 
 	fmt.Println(operator_id)
 	fmt.Println(operator)
-	_, pBusiCardInfo := c.GetELeCertInfoByFace(fixmedins_code, operator_id, operator,"01301")
+	_, pBusiCardInfo := c.GetELeCertInfoByFace(fixmedins_code, operator_id, operator, "01301")
 	fmt.Println(pBusiCardInfo)
 	pBusiCardInfo = Remove0000(pBusiCardInfo)
 	var eletwo ELeCertDatatwo
 	json.Unmarshal([]byte(pBusiCardInfo), &eletwo)
 
-	_, pBusiCardInfotwo := GetELeCertInfoByFacetwo(fixmedins_code, operator_id, operator,eletwo.Data.AuthNo,eletwo.Data.OutBizNo,"01301")
+	_, pBusiCardInfotwo := GetELeCertInfoByFacetwo(fixmedins_code, operator_id, operator, eletwo.Data.AuthNo, eletwo.Data.OutBizNo, "01301")
 
 	var ele ELeCertDatathree
 	err2 := json.Unmarshal([]byte(pBusiCardInfotwo), &ele)
@@ -1820,8 +2008,7 @@ func (c *JSybController) Readcardface() {
 			"busi_card_info": pBusiCardInfotwo,
 			"token":          token,
 			"result":         dat,
-			"eletwo":	pBusiCardInfo,
-
+			"eletwo":         pBusiCardInfo,
 		})
 	} else {
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -1830,10 +2017,8 @@ func (c *JSybController) Readcardface() {
 
 	}
 
-
 }
 
-
 func (c *JSybController) Readcardcharge() {
 	fixmedins_code := c.GetString("fixmedins_code")
 	secret_key := c.GetString("secret_key")
@@ -2246,16 +2431,13 @@ func (c *JSybController) ReadCard() {
 	case "5": //电子凭证
 		fmt.Println(operator_id)
 		fmt.Println(operator)
-		_, pBusiCardInfo := c.GetELeCertInfoByFace(fixmedins_code, operator_id, operator,"01101")
+		_, pBusiCardInfo := c.GetELeCertInfoByFace(fixmedins_code, operator_id, operator, "01101")
 		fmt.Println(pBusiCardInfo)
 		pBusiCardInfo = Remove0000(pBusiCardInfo)
 		var eletwo ELeCertDatatwo
 		json.Unmarshal([]byte(pBusiCardInfo), &eletwo)
 
-
-		_, pBusiCardInfotwo := GetELeCertInfoByFacetwo(fixmedins_code, operator_id, operator,eletwo.Data.AuthNo,eletwo.Data.OutBizNo,"01301")
-
-
+		_, pBusiCardInfotwo := GetELeCertInfoByFacetwo(fixmedins_code, operator_id, operator, eletwo.Data.AuthNo, eletwo.Data.OutBizNo, "01301")
 
 		var ele ELeCertDatathree
 		err2 := json.Unmarshal([]byte(pBusiCardInfotwo), &ele)
@@ -2285,8 +2467,7 @@ func (c *JSybController) ReadCard() {
 				"busi_card_info": pBusiCardInfotwo,
 				"token":          token,
 				"result":         dat,
-				"eletwo":	pBusiCardInfo,
-
+				"eletwo":         pBusiCardInfo,
 			})
 		} else {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -2296,7 +2477,6 @@ func (c *JSybController) ReadCard() {
 		}
 		break
 
-
 	}
 
 }
@@ -2491,7 +2671,7 @@ func (c *JSybController) GetELeCertInfoFour2223(code string, operator_id string,
 	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
 }
 
-func (c *JSybController) GetELeCertInfoByFace(code string, operator_id string, operator_name string,businessType string) (string, string) {
+func (c *JSybController) GetELeCertInfoByFace(code string, operator_id string, operator_name string, businessType string) (string, string) {
 	// WebSocket服务器地址
 	serverURL := "ws://127.0.0.1:8899"
 
@@ -2539,7 +2719,7 @@ func (c *JSybController) GetELeCertInfoByFace(code string, operator_id string, o
 
 	return "", string(receivedMessage)
 }
-func GetELeCertInfoByFacetwo(code string, operator_id string, operator_name string,authNo string,outBizNo string,businessType string) (string, string) {
+func GetELeCertInfoByFacetwo(code string, operator_id string, operator_name string, authNo string, outBizNo string, businessType string) (string, string) {
 	//	// WebSocket服务器地址
 	serverURL := "ws://127.0.0.1:8899"
 
@@ -2684,8 +2864,6 @@ func (c *JSybController) GetELeCertInfoThree(code string, operator_id string, op
 	return "", string(receivedMessage)
 }
 
-
-
 func GetELeCertInfoSettle(code string, operator_id string, operator_name string) (string, string) {
 	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
 	readCard := DllDef.MustFindProc("GetPersonInfo")

controllers/nm/nm_controller.go

@@ -64,6 +64,442 @@ func NmybRegistRouters() {
 
 	beego.Router("/nmyb/2503", &NmController{}, "get:Post2503")
 
+	beego.Router("/nmyb/3501", &NmController{}, "get:Post3501")
+	beego.Router("/nmyb/3502", &NmController{}, "get:Post3502")
+	beego.Router("/nmyb/3503", &NmController{}, "get:Post3503")
+	beego.Router("/nmyb/3504", &NmController{}, "get:Post3504")
+	beego.Router("/nmyb/3505", &NmController{}, "get:Post3505")
+	beego.Router("/nmyb/3506", &NmController{}, "get:Post3506")
+	beego.Router("/nmyb/3507", &NmController{}, "get:Post3507")
+	beego.Router("/nmyb/3508", &NmController{}, "get:Post3508")
+	beego.Router("/nmyb/3509", &NmController{}, "get:Post3509")
+	beego.Router("/nmyb/3510", &NmController{}, "get:Post3510")
+	beego.Router("/nmyb/3511", &NmController{}, "get:Post3511")
+	beego.Router("/nmyb/3512", &NmController{}, "get:Post3512")
+	beego.Router("/nmyb/3513", &NmController{}, "get:Post3513")
+
+}
+func (c *NmController) Post3501() {
+	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["struct_3501s"])
+	var struct3501 models.Struct3501
+	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
+	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+func (c *NmController) Post3502() {
+	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["struct_3502s"])
+	var struct3502s models.Struct3502
+	if err := json.Unmarshal(userJSONBytes, &struct3502s); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.NMyb3502(struct3502s, struct3502s.SecretKey)
+	saveJsLog(result, request_log, "3502", "库存变更", struct3502s.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+func (c *NmController) Post3503() {
+	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["struct_3503s"])
+	var struct3503 models.Struct3503
+	if err := json.Unmarshal(userJSONBytes, &struct3503); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+	fmt.Println(struct3503)
+
+	result, request_log := service.NMyb3503(struct3503, struct3503.SecretKey)
+	saveJsLog(result, request_log, "3503", "库存采购", struct3503.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+}
+
+func (c *NmController) Post3504() {
+	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["struct_3504s"])
+	var struct3504 []models.Struct3504
+	if err := json.Unmarshal(userJSONBytes, &struct3504); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.NMyb3504(struct3504[0], struct3504[0].SecretKey)
+	saveJsLog(result, request_log, "3504", "库存盘点", struct3504[0].OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+func (c *NmController) Post3505() {
+	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["struct_3505s"])
+	var struct3505 models.Struct3505
+	if err := json.Unmarshal(userJSONBytes, &struct3505); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.NMyb3505(struct3505, struct3505.SecretKey)
+	saveJsLog(result, request_log, "3505", "销售", struct3505.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+}
+func (c *NmController) Post3506() {
+	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["struct_3506s"])
+	var struct3506 models.Struct3506
+	if err := json.Unmarshal(userJSONBytes, &struct3506); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.NMyb3506(struct3506, struct3506.SecretKey)
+	saveJsLog(result, request_log, "3506", "销售退库", struct3506.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+func (c *NmController) Post3507() {
+	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["struct_3507s"])
+	var struct3507 models.Struct3507
+	if err := json.Unmarshal(userJSONBytes, &struct3507); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.NMyb3507(struct3507, struct3507.SecretKey)
+	saveJsLog(result, request_log, "3507", "库存盘点", struct3507.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+
+func (c *NmController) Post3508() {
+	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["struct_3508s"])
+	var struct3508 models.Struct3508
+	if err := json.Unmarshal(userJSONBytes, &struct3508); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.NMyb3508(struct3508, struct3508.SecretKey)
+	saveJsLog(result, request_log, "3508", "库存查询", struct3508.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+
+func (c *NmController) Post3509() {
+	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["struct_3509s"])
+	var struct3509 models.Struct3509
+	if err := json.Unmarshal(userJSONBytes, &struct3509); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.NMyb3509(struct3509, struct3509.SecretKey)
+	saveJsLog(result, request_log, "3509", "库存盘点", struct3509.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+
+func (c *NmController) Post3510() {
+	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["struct_3510s"])
+	var struct3510 models.Struct3510
+	if err := json.Unmarshal(userJSONBytes, &struct3510); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.NMyb3510(struct3510, struct3510.SecretKey)
+	saveJsLog(result, request_log, "3510", "库存盘点", struct3510.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+
+func (c *NmController) Post3511() {
+	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["struct_3511s"])
+	var struct3511 models.Struct3511
+	if err := json.Unmarshal(userJSONBytes, &struct3511); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.NMyb3511(struct3511, struct3511.SecretKey)
+	saveJsLog(result, request_log, "3511", "库存查询", struct3511.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+
+func (c *NmController) Post3512() {
+	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["struct_3512s"])
+	var struct3512 models.Struct3512
+	if err := json.Unmarshal(userJSONBytes, &struct3512); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.NMyb3512(struct3512, struct3512.SecretKey)
+	saveJsLog(result, request_log, "3512", "库存盘点", struct3512.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+
+func (c *NmController) Post3513() {
+	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["struct_3513s"])
+	var struct3513 models.Struct3513
+	if err := json.Unmarshal(userJSONBytes, &struct3513); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.NMyb3513(struct3513, struct3513.SecretKey)
+	saveJsLog(result, request_log, "3513", "库存查询", struct3513.OrgName)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
 }
 
 func (c *NmController) Post2201() {
@@ -495,56 +931,56 @@ func (c *NmController) Post2503() {
 	})
 }
 
-//func (c *NmController) GetNewELeInfo() {
-//	token := c.GetString("token")
-//	user_name := c.GetString("user_name")
-//	id_card_no := c.GetString("id_card_no")
-//
-//	result, _ := service.Gdyb1101ForEleCert("赤峰费森血液透析中心", "关学丽", "H15049901371", "150499", "150499", "MSDBYGxXm1Mtyi3PtOUB7n1ktcxwyW57", token, user_name, id_card_no)
-//	var dat map[string]interface{}
-//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-//		fmt.Println(dat)
-//	} else {
-//		fmt.Println(err)
-//	}
-//	userJSONBytes, _ := json.Marshal(dat)
-//	var res ResultTwo
+//	func (c *NmController) GetNewELeInfo() {
+//		token := c.GetString("token")
+//		user_name := c.GetString("user_name")
+//		id_card_no := c.GetString("id_card_no")
 //
-//	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-//		utils.ErrorLog("解析失败：%v", err)
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//		return
-//	}
-//
-//	infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
-//	if infocode == 0 {
-//		data := make(map[string]interface{})
-//		data["token"] = token
-//		data["result"] = dat
-//		var req *http.Request
-//		bytesData, _ := json.Marshal(data)
-//		req, _ = http.NewRequest("POST", "http://172.16.13.253:9532/"+"api/ele/info", bytes.NewReader(bytesData))
-//		client := &http.Client{}
-//		resp, _ := client.Do(req)
-//		defer resp.Body.Close()
-//		body, ioErr := ioutil.ReadAll(resp.Body)
-//		if ioErr != nil {
-//			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//			return
+//		result, _ := service.Gdyb1101ForEleCert("赤峰费森血液透析中心", "关学丽", "H15049901371", "150499", "150499", "MSDBYGxXm1Mtyi3PtOUB7n1ktcxwyW57", token, user_name, id_card_no)
+//		var dat map[string]interface{}
+//		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//			fmt.Println(dat)
+//		} else {
+//			fmt.Println(err)
 //		}
-//		var respJSON map[string]interface{}
-//		if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
-//			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//		userJSONBytes, _ := json.Marshal(dat)
+//		var res ResultTwo
+//
+//		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//			utils.ErrorLog("解析失败：%v", err)
 //			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 //			return
 //		}
-//		c.ServeSuccessJSON(map[string]interface{}{
-//			"msg": "成功",
-//		})
 //
+//		infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
+//		if infocode == 0 {
+//			data := make(map[string]interface{})
+//			data["token"] = token
+//			data["result"] = dat
+//			var req *http.Request
+//			bytesData, _ := json.Marshal(data)
+//			req, _ = http.NewRequest("POST", "http://172.16.13.253:9532/"+"api/ele/info", bytes.NewReader(bytesData))
+//			client := &http.Client{}
+//			resp, _ := client.Do(req)
+//			defer resp.Body.Close()
+//			body, ioErr := ioutil.ReadAll(resp.Body)
+//			if ioErr != nil {
+//				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//				return
+//			}
+//			var respJSON map[string]interface{}
+//			if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+//				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//				return
+//			}
+//			c.ServeSuccessJSON(map[string]interface{}{
+//				"msg": "成功",
+//			})
+//
+//		}
 //	}
-//}
 func (c *NmController) GetToken() {
 	token := c.GetString("token")
 	results := strings.Split(token, "-")
@@ -733,7 +1169,7 @@ func (c *NmController) Post4101() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
-	result, _ := service.Gdyb4101fornm(struct4101, pp.SecretKey, pp.FixmedinsName, pp.OpterName, pp.FixmedinsCode, pp.InsuplcAdmdvs, pp.MdtrtareaAdmvs, 0,0)
+	result, _ := service.Gdyb4101fornm(struct4101, pp.SecretKey, pp.FixmedinsName, pp.OpterName, pp.FixmedinsCode, pp.InsuplcAdmdvs, pp.MdtrtareaAdmvs, 0, 0)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -897,7 +1333,6 @@ func (c *NmController) Post4104() {
 	})
 }
 
-
 func (c *NmController) Post1101() {
 	certNo := c.GetString("cert_no")
 	org_name := c.GetString("org_name")
@@ -911,7 +1346,7 @@ func (c *NmController) Post1101() {
 	certificates := c.GetString("certificates")
 	name := c.GetString("name")
 	certificate, _ := strconv.ParseInt(certificates, 10, 64)
-	result, request_log, result_log := service.ZHGdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificate, name,0)
+	result, request_log, result_log := service.ZHGdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificate, name, 0)
 
 	saveJsLog(result_log, request_log, "1101", "查询个人信息", org_name)
 	var dat map[string]interface{}
@@ -1785,7 +2220,7 @@ func (c *NmController) Get3201() {
 		AcctPay:          acctPay,
 		FixmedinsSetlCnt: fixmedinsSetlCnt,
 	}
-	result := service.Gdyb3201(baseParams, businessParams,0)
+	result := service.Gdyb3201(baseParams, businessParams, 0)
 	saveJsLog(result, "", "3201", "对总账", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {

service/his_service.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"gdyb/models"
 	"github.com/jinzhu/gorm"
-	"time"
 	"strconv"
+	"time"
 )
 
 type HisPatient struct {
@@ -316,13 +316,12 @@ func GetNewHisPrescription(org_id int64, his_patient_id int64, record_date int64
 }
 
 type OtherDrugWarehouseInfo struct {
-	ID               int64 `gorm:"column:id" json:"id" form:"id"`
-	DrugId           int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	WarehousingCount int64 `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
-	Status           int64 `gorm:"column:status" json:"status" form:"status"`
-	OrgId            int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
-
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugId           int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingCount int64  `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Status           int64  `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode         string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 }
 
 func (OtherDrugWarehouseInfo) TableName() string {
@@ -631,7 +630,7 @@ type HisOrder struct {
 	PayWays                 string  `gorm:"column:pay_ways" json:"pay_way" form:"pay_ways"`
 	OthDesc                 string  `gorm:"column:oth_desc" json:"oth_desc" form:"oth_desc"`
 	SetlDetail              string  `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
-	FaPiaoSn     string `gorm:"column:fa_piao_sn" json:"fa_piao_sn" form:"fa_piao_sn"`
+	FaPiaoSn                string  `gorm:"column:fa_piao_sn" json:"fa_piao_sn" form:"fa_piao_sn"`
 	//FaPiaoSn     string `gorm:"column:fa_piao_sn" json:"fa_piao_sn" form:"fa_piao_sn"`
 
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
@@ -976,7 +975,7 @@ func GetHisOrderByID(order_id int64) (order models.HisOrder, err error) {
 
 func GetFaPiaoHisOrderByID(order_id int64) (order models.HisFaPiaoOrder, err error) {
 	str := strconv.FormatInt(order_id, 10)
-	key := "%" + str +"%"
+	key := "%" + str + "%"
 	err = readDb.Model(&models.HisFaPiaoOrder{}).Where("order_ids like ? and status = 1", key).First(&order).Error
 	return
 }
@@ -1073,14 +1072,13 @@ func GetOrderByTimeFour(start_time int64, end_time int64, org_id int64) (orders
 	return
 }
 
-func GetOrderByTimeTenaaa(start_time int64, end_time int64, org_id int64,org string) (orders []*models.HisOrder, err error) {
+func GetOrderByTimeTenaaa(start_time int64, end_time int64, org_id int64, org string) (orders []*models.HisOrder, err error) {
 	db := readDb.Model(&models.HisOrder{})
-	db = db.Where("clr_options = ?  and user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? ", org,org_id, end_time, start_time)
+	db = db.Where("clr_options = ?  and user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? ", org, org_id, end_time, start_time)
 	err = db.Find(&orders).Error
 	return
 }
 
-
 func GetOrderByTime11222(start_time int64, end_time int64, org_id int64) (orders []*models.HisOrder, err error) {
 	db := readDb.Model(&models.HisOrder{})
 	db = db.Where("psn_name = '付云芳' and user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ?", org_id, end_time, start_time)
@@ -1734,13 +1732,26 @@ func GetNewDrugWarehouseInfo(org_id int64, id_arr []string) (newDrugWarehouse []
 	return
 }
 
-func GetNewDrugFlowInfo(org_id int64,id_arr []string) (flows []*models.DrugFlow, err error) {
+func GetNewDrugFlowInfo(org_id int64, id_arr []string) (flows []*models.DrugFlow, err error) {
 	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?)", org_id, id_arr).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
 	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
 	return
 }
 
+func GetNewDrugFlowInfoByPatient(patient_id int64, advice_id int64, time int64, org_id int64) (flows []*models.DrugFlow, err error) {
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?) and patinet_id = ? and advice_id = ? and system_time = ?", org_id, patient_id, advice_id, time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
+	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
+	return
+}
+
+func GetNewUploadDrugFlowInfoByPatientTwo(patient_id int64, advice_id int64, time int64, org_id int64) (flows []*models.DrugFlow, err error) {
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?) and patinet_id = ? and advice_id = ? and system_time = ? and is_sale = 1 and is_bg = 1", org_id, patient_id, advice_id, time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
+	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
+	return
+}
 
 func GetNewDrugFlowInfotwo() (flows []*models.DrugFlow, err error) {
 	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = 10188 and status = 1 and id >= ? and consumable_type = 3 and is_sale = 0", 2394762).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -1749,13 +1760,20 @@ func GetNewDrugFlowInfotwo() (flows []*models.DrugFlow, err error) {
 	return
 }
 
-
 func GetNewDrugFlowInfothree() (flows []*models.DrugFlow, err error) {
 	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = 10217 and status = 1 and id >= ?  and consumable_type = 3 and is_sale = 0", 2328112).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
 	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
 	return
 }
+
+func GetNewDrugFlowInforTen() (flows []*models.DrugFlow, err error) {
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = 10318 and status = 1 and drug_code != '' and consumable_type = 3 and is_sale = 0").Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
+	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
+	return
+}
+
 func GetHisPrescriptionByID(id int64) (pre models.HisPrescription) {
 	err = readDb.Model(&models.HisPrescription{}).Where("id = ? and status = 1", id).Find(&pre).Error
 	return
@@ -1804,7 +1822,6 @@ func GetHisOrderDetailByNumber(order_number string, org_id int64) (order []*HisO
 	return
 }
 
-
 type HisOrderInfo struct {
 	ID                     int64                  `gorm:"column:id" json:"id" form:"id"`
 	OrderNumber            string                 `gorm:"column:order_number" json:"order_number" form:"order_number"`
@@ -1832,7 +1849,6 @@ func (HisOrderInfo) TableName() string {
 	return "his_order_info"
 }
 
-
 type HisDoctorAdviceInfo struct {
 	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
@@ -1853,13 +1869,13 @@ type HisDoctorAdviceInfo struct {
 	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
 	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
 
-	Price                float64              `gorm:"column:price" json:"price" form:"price"`
-	DrugId               int64                `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Drug                 Drug                 `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	Price  float64 `gorm:"column:price" json:"price" form:"price"`
+	DrugId int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Drug   Drug    `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 
-	IsMedicine           int64                `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
-	ExecutionFrequencyId int64                `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
-	IsSelfDrug           int64                `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	IsMedicine           int64 `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId int64 `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	IsSelfDrug           int64 `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 }
 
 type Drug struct {
@@ -1980,10 +1996,10 @@ func (VMGoodInfo) TableName() string {
 	return "xt_good_information"
 }
 
-
 func (HisDoctorAdviceInfo) TableName() string {
 	return "his_doctor_advice_info"
 }
+
 type VMHisPatient struct {
 	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
 	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
@@ -2055,10 +2071,10 @@ type HisPrescriptionProject struct {
 	VMHisProject       VMHisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
 	VMGoodInfo         VMGoodInfo   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
 
-	Remark               string               `gorm:"column:remark" json:"remark" form:"remark"`
-	Unit                 string               `gorm:"column:unit" json:"unit" form:"unit"`
+	Remark string `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit   string `gorm:"column:unit" json:"unit" form:"unit"`
 
-	Type                 int64                `gorm:"column:type" json:"type" form:"type"`
+	Type int64 `gorm:"column:type" json:"type" form:"type"`
 
 	Doctor         int64 `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	ExecutionTime  int64 `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
@@ -2079,3 +2095,45 @@ type HisPrescriptionProject struct {
 func (HisPrescriptionProject) TableName() string {
 	return "his_prescription_project"
 }
+
+func FindeHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, etime int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status= 1 and is_medicine = 0")
+
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if stime > 0 {
+		db = db.Where("advice_date >=?", stime)
+	}
+	if etime > 0 {
+		db = db.Where("advice_date<=?", etime)
+	}
+	err = db.Find(&advice).Error
+
+	return advice, err
+}
+
+func FindUploadHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, etime int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status= 1 and is_medicine = 0")
+
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if stime > 0 {
+		db = db.Where("advice_date >=?", stime)
+	}
+	if etime > 0 {
+		db = db.Where("advice_date<=?", etime)
+	}
+	db = db.Where("is_upload  = 1")
+	err = db.Find(&advice).Error
+	return advice, err
+}

service/jsyb_service.go

@@ -242,7 +242,7 @@ func Jsyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, i
 	inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
 	inputData["card_sn"] = ""           // 卡识别码
 	inputData["certno"] = id_card_no    // 证件号码
-	inputData["psn_cert_type"] = "01"    // 人员证件类型
+	inputData["psn_cert_type"] = "01"   // 人员证件类型
 
 	inputData["mdtrt_cert_no"] = Token // 就诊凭证编号
 	inputData["begntime"] = ""         // 开始时间
@@ -614,15 +614,12 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
 		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
 
-
-			feedetailInfo["bilg_dr_codg"] = item.DoctorNumber   // 开单医生编码
-			feedetailInfo["bilg_dr_name"] = item.DoctorName             // 开单医师姓名
-			feedetailInfo["acord_dept_codg"] = ""             // 受单科室编码
-			feedetailInfo["acord_dept_name"] = ""             // 受单科室名称
-			feedetailInfo["orders_dr_code"] = item.DoctorNumber  // 受单医生编码
-			feedetailInfo["orders_dr_name"] = item.DoctorName            // 受单医生姓名
-
-
+		feedetailInfo["bilg_dr_codg"] = item.DoctorNumber   // 开单医生编码
+		feedetailInfo["bilg_dr_name"] = item.DoctorName     // 开单医师姓名
+		feedetailInfo["acord_dept_codg"] = ""               // 受单科室编码
+		feedetailInfo["acord_dept_name"] = ""               // 受单科室名称
+		feedetailInfo["orders_dr_code"] = item.DoctorNumber // 受单医生编码
+		feedetailInfo["orders_dr_name"] = item.DoctorName   // 受单医生姓名
 
 		if balance_accounts_type == "8" {
 			feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
@@ -1724,22 +1721,22 @@ func Jsyb3501(struct3501 models.Struct3501) (string, string) {
 	inputMessage := SetJSInputMessage(timestamp, struct3501.OrgName, struct3501.Opter, struct3501.Code, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3501"                                  // 交易编码
-	inputData["med_list_codg"] = struct3501.MedListCodg             // 定点医药机构目录编号
-	inputData["fixmedins_hilist_id"] = struct3501.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3501.FixmedinsHilistName         // 定点医药机构目录名称
-	inputData["rx_flag"] = struct3501.RxFlag                        //
-	inputData["invdate"] = struct3501.Invdate                       // 人员编号 （来自1101接口返回）
-	inputData["inv_cnt"] = struct3501.InvCnt                        // 人员编号 （来自1101接口返回）
-	inputData["manu_lotnum"] = struct3501.ManuLotnum                // 人员编号 （来自1101接口返回）
-	inputData["fixmedins_bchno"] = struct3501.FixmedinsBchno        // 人员编号 （来自1101接口返回）
-	inputData["manu_date"] = struct3501.ManuDate                    // 人员编号 （来自1101接口返回）
-	inputData["expy_end"] = struct3501.ExpyEnd                      // 人员编号 （来自1101接口返回）
-	inputData["memo"] = ""                                          // 人员编号 （来自1101接口返回）
+	inputMessage["infno"] = "3501"                                      // 交易编码
+	inputData["med_list_codg"] = struct3501.MedListCodg                 // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3501.FixmedinsHilistId     // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3501.FixmedinsHilistName // 定点医药机构目录名称
+	inputData["rx_flag"] = struct3501.RxFlag                            //
+	inputData["invdate"] = struct3501.Invdate                           // 人员编号 （来自1101接口返回）
+	inputData["inv_cnt"] = struct3501.InvCnt                            // 人员编号 （来自1101接口返回）
+	inputData["manu_lotnum"] = struct3501.ManuLotnum                    // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_bchno"] = struct3501.FixmedinsBchno            // 人员编号 （来自1101接口返回）
+	inputData["manu_date"] = struct3501.ManuDate                        // 人员编号 （来自1101接口返回）
+	inputData["expy_end"] = struct3501.ExpyEnd                          // 人员编号 （来自1101接口返回）
+	inputData["memo"] = ""                                              // 人员编号 （来自1101接口返回）
 	feedetail := make([]map[string]interface{}, 0)
 	druginputData := make(map[string]interface{})
 	druginputData["drug_trac_codg"] = struct3501.DrugTracCodg
-	feedetail = append(feedetail,druginputData)
+	feedetail = append(feedetail, druginputData)
 	inputData["drugtracinfo"] = feedetail
 	input["invinfo"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -1764,12 +1761,12 @@ func Jsyb3502(struct3502 models.Struct3502) (string, string) {
 	inputData["med_list_codg"] = struct3502.MedListCodg // 定点医药机构目录编号
 	inputData["inv_chg_type"] = struct3502.InvChgType   // 定点医药机构目录编号
 
-	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsCode // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3502.FixmedinsHilistName     // 定点医药机构目录名称
-	inputData["fixmedins_bchno"] = struct3502.FixmedinsBchno    // 人员编号 （来自1101接口返回）
-	inputData["pric"] = struct3502.Pric                         // 人员编号 （来自1101接口返回）
-	inputData["cnt"] = struct3502.Cnt                           // 人员编号 （来自1101接口返回）
-	inputData["rx_flag"] = struct3502.RxFlag                    //
+	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsCode         // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3502.FixmedinsHilistName // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3502.FixmedinsBchno            // 人员编号 （来自1101接口返回）
+	inputData["pric"] = struct3502.Pric                                 // 人员编号 （来自1101接口返回）
+	inputData["cnt"] = struct3502.Cnt                                   // 人员编号 （来自1101接口返回）
+	inputData["rx_flag"] = struct3502.RxFlag                            //
 
 	inputData["inv_chg_time"] = struct3502.InvChgTime // 人员编号 （来自1101接口返回）
 	inputData["inv_chg_opter_name"] = ""              // 人员编号 （来自1101接口返回）
@@ -1780,7 +1777,7 @@ func Jsyb3502(struct3502 models.Struct3502) (string, string) {
 	feedetail := make([]map[string]interface{}, 0)
 	druginputData := make(map[string]interface{})
 	druginputData["drug_trac_codg"] = struct3502.DrugTracCodg
-	feedetail = append(feedetail,druginputData)
+	feedetail = append(feedetail, druginputData)
 	inputData["drugtracinfo"] = feedetail
 	input["invinfo"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -1886,11 +1883,11 @@ func Jsyb3505(struct3505 models.Struct3505) (string, string) {
 	inputMessage := SetJSInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.Code, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3505"                                  // 交易编码
-	inputData["med_list_codg"] = struct3505.MedListCodg             // 定点医药机构目录编号
-	inputData["fixmedins_hilist_id"] = struct3505.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3505.FixmedinsHilistName         // 定点医药机构目录名称
-	inputData["fixmedins_bchno"] = struct3505.FixmedinsBchno        // 人员编号 （来自1101接口返回）
+	inputMessage["infno"] = "3505"                                      // 交易编码
+	inputData["med_list_codg"] = struct3505.MedListCodg                 // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3505.FixmedinsHilistId     // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3505.FixmedinsHilistName // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3505.FixmedinsBchno            // 人员编号 （来自1101接口返回）
 
 	inputData["prsc_dr_cert_type"] = struct3505.PrscDrCertType // 人员编号 （来自1101接口返回）
 	inputData["prsc_dr_certno"] = struct3505.PrscDrCertno      // 人员编号 （来自1101接口返回）
@@ -1932,11 +1929,11 @@ func Jsyb3505(struct3505 models.Struct3505) (string, string) {
 	//input["selinfo"] = inputData
 	feedetail := make([]map[string]interface{}, 0)
 
-	codes := strings.Split(struct3505.DrugTracCodg,",")
-	for _,item := range codes{
+	codes := strings.Split(struct3505.DrugTracCodg, ",")
+	for _, item := range codes {
 		druginputData := make(map[string]interface{})
 		druginputData["drug_trac_codg"] = item
-		feedetail = append(feedetail,druginputData)
+		feedetail = append(feedetail, druginputData)
 	}
 	inputData["drugtracinfo"] = feedetail
 	input["selinfo"] = inputData
@@ -1958,11 +1955,11 @@ func Jsyb3506(struct3506 models.Struct3506) (string, string) {
 	inputMessage := SetJSInputMessage(timestamp, struct3506.OrgName, struct3506.Opter, struct3506.Code, struct3506.InsuplcAdmdvs, struct3506.MdtrtareaAdmvs, struct3506.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3506"                                  // 交易编码
-	inputData["med_list_codg"] = struct3506.MedListCodg             // 定点医药机构目录编号
-	inputData["fixmedins_hilist_id"] = struct3506.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3506.FixmedinsHilistName         // 定点医药机构目录名称
-	inputData["fixmedins_bchno"] = struct3506.FixmedinsBchno        // 人员编号 （来自1101接口返回）
+	inputMessage["infno"] = "3506"                                      // 交易编码
+	inputData["med_list_codg"] = struct3506.MedListCodg                 // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3506.FixmedinsHilistId     // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3506.FixmedinsHilistName // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3506.FixmedinsBchno            // 人员编号 （来自1101接口返回）
 
 	inputData["setl_id"] = struct3506.SetlId                       // 人员编号 （来自1101接口返回）
 	inputData["psn_no"] = struct3506.PsnNo                         // 人员编号 （来自1101接口返回）
@@ -1983,11 +1980,11 @@ func Jsyb3506(struct3506 models.Struct3506) (string, string) {
 
 	feedetail := make([]map[string]interface{}, 0)
 
-	codes := strings.Split(struct3506.DrugTracCodg,",")
-	for _,item := range codes{
+	codes := strings.Split(struct3506.DrugTracCodg, ",")
+	for _, item := range codes {
 		druginputData := make(map[string]interface{})
 		druginputData["drug_trac_codg"] = item
-		feedetail = append(feedetail,druginputData)
+		feedetail = append(feedetail, druginputData)
 	}
 	//input["drugtracinfo"] = feedetail
 	//input["drugtracinfo"] = struct3506.DrugTracCodg
@@ -2011,9 +2008,9 @@ func Jsyb3507(struct3507 models.Struct3507) (string, string) {
 	inputMessage := SetJSInputMessage(timestamp, struct3507.OrgName, struct3507.Opter, struct3507.FixmedinsCode, struct3507.InsuplcAdmdvs, struct3507.MdtrtareaAdmvs, struct3507.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3507"                          // 交易编码
+	inputMessage["infno"] = "3507"                           // 交易编码
 	inputData["fixmedins_bchno"] = struct3507.FixmedinsBchno // 人员编号 （来自1101接口返回）
-	inputData["inv_data_type"] = struct3507.InvDataType     // 人员编号 （来自1101接口返回）
+	inputData["inv_data_type"] = struct3507.InvDataType      // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -2027,6 +2024,308 @@ func Jsyb3507(struct3507 models.Struct3507) (string, string) {
 	struct3507.RequestUrl = struct3507.RequestUrl + "3507"
 	return HttpRequest(struct3507.RequestUrl, struct3507.AccessKey, struct3507.SecretKey, timestamp, string(bytesData)), string(bytesData)
 
+}
+func Jsyb3508(struct3508 models.Struct3508) (string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3508.OrgName, struct3508.Opter, struct3508.FixmedinsCode, struct3508.InsuplcAdmdvs, struct3508.MdtrtareaAdmvs, struct3508.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3508"
+	inputData["fixmedins_code"] = struct3508.FixmedinsCode
+	inputData["medins_list_codg"] = struct3508.MedListCodg
+	inputData["fixmedins_bchno"] = ""
+	inputData["begndate"] = struct3508.Begndate
+	inputData["enddate"] = struct3508.Enddate
+
+	inputData["medins_prod_inv_no"] = ""
+	inputData["medins_list_name"] = ""
+	inputData["rx_flag"] = ""
+	inputData["list_sp_item_flag"] = ""
+	inputData["trdn_flag"] = ""
+	inputData["invdate"] = ""
+	inputData["manu_lotnum"] = ""
+	inputData["manu_date"] = ""
+	inputData["expy_end"] = ""
+	inputData["memo"] = ""
+	inputData["vali_flag"] = ""
+	inputData["rid"] = ""
+	inputData["crter_id"] = ""
+	inputData["crter_name"] = ""
+	inputData["crte_optins_no"] = ""
+	inputData["opter_id"] = ""
+	inputData["opter_name"] = ""
+	inputData["optins_no"] = ""
+	inputData["poolarea_no"] = ""
+	inputData["fixmedins_bchno"] = ""
+	inputData["inv_data_type"] = ""
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	struct3508.RequestUrl = struct3508.RequestUrl + "3508"
+	return HttpRequest(struct3508.RequestUrl, struct3508.AccessKey, struct3508.SecretKey, timestamp, string(bytesData)), string(bytesData)
+
+}
+func Jsyb3509(struct3509 models.Struct3509) (string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3509.OrgName, struct3509.Opter, struct3509.FixmedinsCode, struct3509.InsuplcAdmdvs, struct3509.MdtrtareaAdmvs, struct3509.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3509"
+	inputData["fixmedins_code"] = struct3509.FixmedinsCode
+	//inputData["med_list_codg"] = struct3509.MedinsListCodg
+	inputData["medins_list_codg"] = struct3509.MedListCodg
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["begndate"] = struct3509.Begndate
+	inputData["enddate"] = struct3509.Enddate
+	inputData["medins_prod_inv_no"] = ""
+	inputData["medins_list_name"] = ""
+	inputData["rx_flag"] = ""
+	inputData["list_sp_item_flag"] = ""
+	inputData["trdn_flag"] = ""
+	inputData["invdate"] = ""
+	inputData["manu_lotnum"] = ""
+	inputData["manu_date"] = ""
+	inputData["expy_end"] = ""
+	inputData["memo"] = ""
+	inputData["vali_flag"] = ""
+	inputData["rid"] = ""
+
+	inputData["crter_id"] = ""
+	inputData["crter_name"] = ""
+	inputData["crte_optins_no"] = ""
+	inputData["opter_id"] = ""
+	inputData["opter_name"] = ""
+	inputData["optins_no"] = ""
+	inputData["poolarea_no"] = ""
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["inv_data_type"] = ""
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	struct3509.RequestUrl = struct3509.RequestUrl + "3509"
+	return HttpRequest(struct3509.RequestUrl, struct3509.AccessKey, struct3509.SecretKey, timestamp, string(bytesData)), string(bytesData)
+
+}
+func Jsyb3510(struct3510 models.Struct3510) (string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3510.OrgName, struct3510.Opter, struct3510.FixmedinsCode, struct3510.InsuplcAdmdvs, struct3510.MdtrtareaAdmvs, struct3510.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3510"
+	inputData["fixmedins_code"] = struct3510.FixmedinsCode
+	//inputData["medins_list_codg"] = struct3510.MedinsListCodg
+	inputData["medins_list_codg"] = struct3510.MedListCodg
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["begndate"] = struct3510.Begndate
+	inputData["enddate"] = struct3510.Enddate
+	inputData["medins_prod_inv_no"] = ""
+	inputData["medins_list_name"] = ""
+	inputData["rx_flag"] = ""
+	inputData["list_sp_item_flag"] = ""
+	inputData["trdn_flag"] = ""
+	inputData["invdate"] = ""
+	inputData["manu_lotnum"] = ""
+	inputData["manu_date"] = ""
+	inputData["expy_end"] = ""
+	inputData["memo"] = ""
+	inputData["vali_flag"] = ""
+	inputData["rid"] = ""
+
+	inputData["crter_id"] = ""
+	inputData["crter_name"] = ""
+	inputData["crte_optins_no"] = ""
+	inputData["opter_id"] = ""
+	inputData["opter_name"] = ""
+	inputData["optins_no"] = ""
+	inputData["poolarea_no"] = ""
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["inv_data_type"] = ""
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	struct3510.RequestUrl = struct3510.RequestUrl + "3510"
+	return HttpRequest(struct3510.RequestUrl, struct3510.AccessKey, struct3510.SecretKey, timestamp, string(bytesData)), string(bytesData)
+
+}
+func Jsyb3511(struct3511 models.Struct3511) (string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3511.OrgName, struct3511.Opter, struct3511.FixmedinsCode, struct3511.InsuplcAdmdvs, struct3511.MdtrtareaAdmvs, struct3511.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3511"
+	inputData["fixmedins_code"] = struct3511.FixmedinsCode
+	//inputData["medins_list_codg"] = struct3511.MedinsListCodg
+	inputData["medins_list_codg"] = struct3511.MedListCodg
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["begndate"] = struct3511.Begndate
+	inputData["enddate"] = struct3511.Enddate
+	inputData["medins_prod_inv_no"] = ""
+	inputData["medins_list_name"] = ""
+	inputData["rx_flag"] = ""
+	inputData["list_sp_item_flag"] = ""
+	inputData["trdn_flag"] = ""
+	inputData["invdate"] = ""
+	inputData["manu_lotnum"] = ""
+	inputData["manu_date"] = ""
+	inputData["expy_end"] = ""
+	inputData["memo"] = ""
+	inputData["vali_flag"] = ""
+	inputData["rid"] = ""
+
+	inputData["crter_id"] = ""
+	inputData["crter_name"] = ""
+	inputData["crte_optins_no"] = ""
+	inputData["opter_id"] = ""
+	inputData["opter_name"] = ""
+	inputData["optins_no"] = ""
+	inputData["poolarea_no"] = ""
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["inv_data_type"] = ""
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	struct3511.RequestUrl = struct3511.RequestUrl + "3511"
+	return HttpRequest(struct3511.RequestUrl, struct3511.AccessKey, struct3511.SecretKey, timestamp, string(bytesData)), string(bytesData)
+
+}
+func Jsyb3512(struct3512 models.Struct3512) (string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3512.OrgName, struct3512.Opter, struct3512.FixmedinsCode, struct3512.InsuplcAdmdvs, struct3512.MdtrtareaAdmvs, struct3512.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3512"
+	inputData["fixmedins_code"] = struct3512.FixmedinsCode
+	//inputData["medins_list_codg"] = struct3512.MedinsListCodg
+	inputData["medins_list_codg"] = struct3512.MedListCodg
+	inputData["fixmedins_bchno"] = ""
+	inputData["begndate"] = struct3512.Begndate
+	inputData["enddate"] = struct3512.Enddate
+	inputData["medins_prod_inv_no"] = ""
+	inputData["medins_list_name"] = ""
+	inputData["rx_flag"] = ""
+	inputData["list_sp_item_flag"] = ""
+	inputData["trdn_flag"] = ""
+	inputData["invdate"] = ""
+	inputData["manu_lotnum"] = ""
+	inputData["manu_date"] = ""
+	inputData["expy_end"] = ""
+	inputData["memo"] = ""
+	inputData["vali_flag"] = ""
+	inputData["rid"] = ""
+
+	inputData["crter_id"] = ""
+	inputData["crter_name"] = ""
+	inputData["crte_optins_no"] = ""
+	inputData["opter_id"] = ""
+	inputData["opter_name"] = ""
+	inputData["optins_no"] = ""
+	inputData["poolarea_no"] = ""
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["inv_data_type"] = ""
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	struct3512.RequestUrl = struct3512.RequestUrl + "3512"
+	return HttpRequest(struct3512.RequestUrl, struct3512.AccessKey, struct3512.SecretKey, timestamp, string(bytesData)), string(bytesData)
+
+}
+func Jsyb3513(struct3513 models.Struct3513) (string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3513.OrgName, struct3513.Opter, struct3513.FixmedinsCode, struct3513.InsuplcAdmdvs, struct3513.MdtrtareaAdmvs, struct3513.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3513"
+	inputData["fixmedins_code"] = struct3513.FixmedinsCode
+	//inputData["medins_list_codg"] = struct3513.MedinsListCodg
+	inputData["medins_list_codg"] = struct3513.MedListCodg
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["begndate"] = struct3513.Begndate
+	inputData["enddate"] = struct3513.Enddate
+	inputData["medins_prod_inv_no"] = ""
+	inputData["med_list_codg"] = ""
+	inputData["medins_list_name"] = ""
+	inputData["rx_flag"] = ""
+	inputData["list_sp_item_flag"] = ""
+	inputData["trdn_flag"] = ""
+	inputData["invdate"] = ""
+	inputData["manu_lotnum"] = ""
+	inputData["manu_date"] = ""
+	inputData["expy_end"] = ""
+	inputData["memo"] = ""
+	inputData["vali_flag"] = ""
+	inputData["rid"] = ""
+
+	inputData["crter_id"] = ""
+	inputData["crter_name"] = ""
+	inputData["crte_optins_no"] = ""
+	inputData["opter_id"] = ""
+	inputData["opter_name"] = ""
+	inputData["optins_no"] = ""
+	inputData["poolarea_no"] = ""
+
+	inputData["fixmedins_bchno"] = ""
+	inputData["inv_data_type"] = ""
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	struct3513.RequestUrl = struct3513.RequestUrl + "3513"
+	return HttpRequest(struct3513.RequestUrl, struct3513.AccessKey, struct3513.SecretKey, timestamp, string(bytesData)), string(bytesData)
+
 }
 
 // 对账权限查询
@@ -2617,7 +2916,6 @@ func Jxyb3277(stmt_mon string, org_name string, doctor string, fixmedins_code st
 	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3277"), string(bytesData)
 }
 
-
 func Jsyb1318(code string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, request_url string, access_key string, cainfo string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
@@ -2626,20 +2924,20 @@ func Jsyb1318(code string, org_name string, doctor string, fixmedins_code string
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "1318" // 交易编码
-	inputData["query_date"] =  ""
-	inputData["hilist_code"] =  code
-	inputData["hilist_lmtpric_type"] =  ""
-	inputData["overlmt_dspo_way"] =  ""
-	inputData["insu_admdvs"] =  ""
-	inputData["begndate"] =  ""
-	inputData["enddate"] =  ""
-	inputData["vali_flag"] =  ""
-	inputData["rid"] =  ""
-	inputData["tabname"] =  ""
-	inputData["poolarea_no"] =  ""
-	inputData["updt_time"] =  "2024-03-11"
-	inputData["page_num"] =  "1"
-	inputData["page_size"] =  "100"
+	inputData["query_date"] = ""
+	inputData["hilist_code"] = code
+	inputData["hilist_lmtpric_type"] = ""
+	inputData["overlmt_dspo_way"] = ""
+	inputData["insu_admdvs"] = ""
+	inputData["begndate"] = ""
+	inputData["enddate"] = ""
+	inputData["vali_flag"] = ""
+	inputData["rid"] = ""
+	inputData["tabname"] = ""
+	inputData["poolarea_no"] = ""
+	inputData["updt_time"] = "2024-03-11"
+	inputData["page_num"] = "1"
+	inputData["page_size"] = "100"
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)