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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10217
+org_id = 10265
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/js/jsyb_controller.go

@@ -274,6 +274,7 @@ func (c *JSybController) PostFour() {
 	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
 	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
 	secret_key := respJSON["secret_key"].(string)
+
 	url := respJSON["url"].(string)
 	ak := respJSON["ak"].(string)
 	begin_time := respJSON["begin_time"].(string)

controllers/nm/nm_controller.go

@@ -5,10 +5,12 @@ import (
 	"fmt"
 	"gdyb/controllers"
 	"gdyb/enums"
+	"gdyb/models"
 	"gdyb/service"
 	"gdyb/utils"
 	"github.com/astaxie/beego"
 	"github.com/axgle/mahonia"
+	"io/ioutil"
 	"os"
 	"regexp"
 	"strconv"
@@ -24,16 +26,16 @@ type NmController struct {
 
 func JSybRegistRouters() {
 	beego.Router("/nmyb/1101", &NmController{}, "get:Post1101")
-	beego.Router("/nmyb/2401", &NmController{}, "get:Post2401")
+	beego.Router("/nmyb/2401", &NmController{}, "post:Post2401")
+	beego.Router("/nmyb/2402", &NmController{}, "post:Post2402")
 	beego.Router("/nmyb/2404", &NmController{}, "get:Post2404")
 	beego.Router("/nmyb/2405", &NmController{}, "post:Post2405")
-	beego.Router("/nmyb/2402", &NmController{}, "post:Post2402")
-	beego.Router("/nmyb/2301", &NmController{}, "get:Post2301")
+	beego.Router("/nmyb/2301", &NmController{}, "post:Post2301")
 	beego.Router("/nmyb/2302", &NmController{}, "get:Post2302")
 	beego.Router("/nmyb/2303", &NmController{}, "get:Post2303")
 	beego.Router("/nmyb/2304", &NmController{}, "get:Post2304")
 	beego.Router("/nmyb/2305", &NmController{}, "get:Post2305")
-	beego.Router("/nmyb/2503", &NmController{}, "get:Get2503")
+
 	beego.Router("/nmyb/readcard", &NmController{}, "get:ReadCard")
 }
 
@@ -50,40 +52,324 @@ func (c *NmController) Post1101() {
 	certificates := c.GetString("certificates")
 	name := c.GetString("name")
 	certificate, _ := strconv.ParseInt(certificates, 10, 64)
-	service.ZHGdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificate, name)
+	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)
+
+	saveJsLog(result_log, request_log, "1101", "查询个人信息", org_name)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	} else {
+
+	}
+
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+		"log": dat2,
+	})
 
 }
 
 func (c *NmController) Post2401() {
+	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_2401"])
+	var struct2401 service.Struct2401
+	if err := json.Unmarshal(userJSONBytes, &struct2401); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+	org_name := respJSON["org_name"].(string)
+	fixmedins_code := respJSON["fixmedins_code"].(string)
+	doctor := respJSON["doctor"].(string)
+	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
+	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
+	secret_key := respJSON["secret_key"].(string)
+	result, request_log := service.ZHGdyb2401(struct2401, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
+	saveJsLog(result, request_log, "2401", "入院登记", org_name)
+	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) Post2404() {
+	mdtrt_id := c.GetString("mdtrt_id")
+	psn_no := c.GetString("psn_no")
+	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")
+	org_name := c.GetString("org_name")
+
+	result, requestLog := service.ZHGdyb2404(mdtrt_id, psn_no, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
+	saveJsLog(result, requestLog, "2404", "入院登记撤销", org_name)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+	}
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(requestLog), &dat2); err == nil {
+	} else {
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+		"log": dat2,
+	})
 
 }
 
 func (c *NmController) Post2405() {
+	mdtrt_id := c.GetString("mdtrt_id")
+	psn_no := c.GetString("psn_no")
+	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")
+	org_name := c.GetString("org_name")
+
+	result, requestLog := service.ZHGdyb2405(mdtrt_id, psn_no, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
+	saveJsLog(result, requestLog, "2405", "出院登记撤销", org_name)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+	}
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(requestLog), &dat2); err == nil {
+	} else {
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+		"log": dat2,
+	})
 
 }
 
 func (c *NmController) Post2402() {
-
+	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_2402"])
+	var struct2402 service.Struct2402
+	if err := json.Unmarshal(userJSONBytes, &struct2402); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+	org_name := respJSON["org_name"].(string)
+	fixmedins_code := respJSON["fixmedins_code"].(string)
+	doctor := respJSON["doctor"].(string)
+	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
+	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
+	secret_key := respJSON["secret_key"].(string)
+	result, request_log := service.ZHGdyb2402(struct2402, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
+	saveJsLog(result, request_log, "2402", "出院", org_name)
+	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) Post2301() {
 
+	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["customs"])
+	var customs []*models.NewCustom
+	if err := json.Unmarshal(userJSONBytes, &customs); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	number := respJSON["number"].(string)
+
+	chrg_bchno := respJSON["chrg_bchno"].(string)
+	dept := respJSON["dept"].(string)
+	dept_code := respJSON["dept_code"].(string)
+	doctor_code := respJSON["doctor_code"].(string)
+	doctor_name := respJSON["doctor_name"].(string)
+	opertor := respJSON["opertor"].(string)
+
+	org_name := respJSON["org_name"].(string)
+	fixmedins_code := respJSON["fixmedins_code"].(string)
+	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
+	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
+	secret_key := respJSON["secret_key"].(string)
+	med_type := respJSON["med_type"].(string)
+	psn_no := respJSON["psn_no"].(string)
+
+	result, requestLog := service.ZHGdyb2301A(psn_no, number, customs, chrg_bchno, org_name, doctor_name, dept, fixmedins_code, dept_code, doctor_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, opertor)
+	saveJsLog(result, requestLog, "2301", "上传明细", org_name)
+
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(requestLog), &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) Post2302() {
+	mdtrt_id := c.GetString("mdtrt_id")
+	psn_no := c.GetString("psn_no")
+	number := c.GetString("number")
+	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")
+	org_name := c.GetString("org_name")
+	refund_type, _ := c.GetInt64("refund_type")
+
+	result, requestLog := service.Gdyb2302(psn_no, mdtrt_id, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code, number, refund_type)
+	saveJsLog(result, requestLog, "2302", "退明细", org_name)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(requestLog), &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) Post2303() {
+	mdtrt_id := c.GetString("mdtrt_id")
+	psn_no := c.GetString("psn_no")
+	chrg_bchno := c.GetString("chrg_bchno")
+	cert_no := c.GetString("cert_no")
+	insutype_type := c.GetString("insutype_type")
 
-}
+	allTotal := c.GetString("total")
+	id_card_type, _ := c.GetInt64("id_card_type")
 
-func (c *NmController) Post2304() {
+	doctor := c.GetString("doctor")
+	certificates, _ := c.GetInt64("certificates")
+
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	org_name := c.GetString("org_name")
 
+	result, src_resquest := service.ZHGdyb2303(psn_no, mdtrt_id, chrg_bchno, cert_no, insutype_type, allTotal, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, "0", id_card_type, 0, 0, 0, 0, certificates)
+	saveJsLog(result, src_resquest, "2303", "预结算", org_name)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(src_resquest), &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) Post2304() {
+	mdtrt_id := c.GetString("mdtrt_id")
+	psn_no := c.GetString("psn_no")
+	chrg_bchno := c.GetString("chrg_bchno")
+	cert_no := c.GetString("cert_no")
+	insutype_type := c.GetString("insutype_type")
+
+	allTotal := c.GetString("total")
+	id_card_type, _ := c.GetInt64("id_card_type")
+
+	doctor := c.GetString("doctor")
+	certificates, _ := c.GetInt64("certificates")
+
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	org_name := c.GetString("org_name")
 
+	result, src_resquest := service.ZHGdyb2304(psn_no, mdtrt_id, chrg_bchno, cert_no, insutype_type, allTotal, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, "0", id_card_type, 0, 0, 0, 0, certificates)
+	saveJsLog(result, src_resquest, "2304", "住院结算", org_name)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(src_resquest), &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) Post2305() {
+	mdtrt_id := c.GetString("mdtrt_id")
+	psn_no := c.GetString("psn_no")
+	doctor := c.GetString("doctor")
+	setl_id := c.GetString("setl_id")
 
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	org_name := c.GetString("org_name")
+
+	result, requestLog := service.Gdyb2305(psn_no, mdtrt_id, setl_id, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	saveJsLog(result, requestLog, "2305", "退费", org_name)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(requestLog), &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) Get2503() {

controllers/sg/his_api_controller.go

@@ -869,60 +869,36 @@ func (c *HisApiController) ReadCard() {
 			}
 			var status string
 			status = respJSON["data"].(map[string]interface{})["status"].(string)
-			card_type := respJSON["data"].(map[string]interface{})["type"].(string)
+			//card_type := respJSON["data"].(map[string]interface{})["type"].(string)
 
 			var token string
 			var res ResultTwo           //1101结果
 			var res10265 ResultTwo10265 //1101结果
-			var card_info string        //卡信息
-			var busi_card_info string
-
-			card_info = respJSON["data"].(map[string]interface{})["card_info"].(string)
-			busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
 
 			if status == "0" { //读卡成功
-				if card_type == "1" {
-
-					respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
-					result, _ := json.Marshal(respJSON)
-
-					if err := json.Unmarshal([]byte(result), &res10265); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					res.ErrMsg = res10265.ErrMsg
-					infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
-					res.Infcode = infocode
-					res.Output = res10265.Output
-					res.InfRefmsgid = res10265.InfRefmsgid
+				var card_info string //卡信息
+				var busi_card_info string
 
-				} else {
-					var card_info string //卡信息
-					var busi_card_info string
+				token = respJSON["data"].(map[string]interface{})["token"].(string)
+				busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
+				card_info = respJSON["data"].(map[string]interface{})["card_info"].(string)
 
-					token = respJSON["data"].(map[string]interface{})["token"].(string)
-					busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
-					card_info = respJSON["data"].(map[string]interface{})["card_info"].(string)
-
-					fmt.Println(card_info)
-					fmt.Println(busi_card_info)
+				fmt.Println(card_info)
+				fmt.Println(busi_card_info)
 
-					respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
-					result, _ := json.Marshal(respJSON)
-
-					if err := json.Unmarshal([]byte(result), &res10265); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					res.ErrMsg = res10265.ErrMsg
-					infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
-					res.Infcode = infocode
-					res.Output = res10265.Output
-					res.InfRefmsgid = res10265.InfRefmsgid
+				respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
+				result, _ := json.Marshal(respJSON)
 
+				if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
 				}
+				res.ErrMsg = res10265.ErrMsg
+				infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+				res.Infcode = infocode
+				res.Output = res10265.Output
+				res.InfRefmsgid = res10265.InfRefmsgid
 
 				if res.Infcode == 0 {
 					patient, err := service.GetPatientByIDCard(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)
@@ -934,89 +910,31 @@ func (c *HisApiController) ReadCard() {
 						return
 
 					} else {
-
-						if card_type == "1" {
-							bas := strings.Split(card_info, "|")
-							basNumber := bas[2]
-							Iinfos, _ := json.Marshal(res.Output.Iinfo)
-							Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
-							infoStr := string(Iinfos)
-							idetinfoStr := string(Idetinfos)
-							psn := &models.HisPsn{
-								PsnNo:        res.Output.Baseinfo.PsnNo,
-								Age:          res.Output.Baseinfo.Age,
-								PatientId:    patient.ID,
-								Certno:       res.Output.Baseinfo.Certno,
-								Brdy:         res.Output.Baseinfo.Brdy,
-								Gend:         res.Output.Baseinfo.Gend,
-								Naty:         res.Output.Baseinfo.Naty,
-								PsnCertType:  res.Output.Baseinfo.PsnCertType,
-								PsnName:      res.Output.Baseinfo.PsnName,
-								Idetinfo:     idetinfoStr,
-								Insuinfo:     infoStr,
-								UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
-								CardInfo:     card_info,
-								VerifyNumber: busi_card_info,
-							}
-							service.CreateHisPsn(psn)
-							c.ServeSuccessJSON(map[string]interface{}{
-								"patient": patient,
-								"number":  basNumber,
-							})
-						} else if card_type == "4" {
-							Iinfos, _ := json.Marshal(res.Output.Iinfo)
-							Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
-							infoStr := string(Iinfos)
-							idetinfoStr := string(Idetinfos)
-							psn := &models.HisPsn{
-								PsnNo:        res.Output.Baseinfo.PsnNo,
-								Age:          res.Output.Baseinfo.Age,
-								PatientId:    patient.ID,
-								Certno:       res.Output.Baseinfo.Certno,
-								Brdy:         res.Output.Baseinfo.Brdy,
-								Gend:         res.Output.Baseinfo.Gend,
-								Naty:         res.Output.Baseinfo.Naty,
-								PsnCertType:  res.Output.Baseinfo.PsnCertType,
-								PsnName:      res.Output.Baseinfo.PsnName,
-								Idetinfo:     idetinfoStr,
-								Insuinfo:     infoStr,
-								UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
-								CardInfo:     card_info,
-								VerifyNumber: token,
-							}
-							service.CreateHisPsn(psn)
-							c.ServeSuccessJSON(map[string]interface{}{
-								"patient": patient,
-								"number":  token,
-							})
-
-						} else {
-							Iinfos, _ := json.Marshal(res.Output.Iinfo)
-							Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
-							infoStr := string(Iinfos)
-							idetinfoStr := string(Idetinfos)
-							psn := &models.HisPsn{
-								PsnNo:        res.Output.Baseinfo.PsnNo,
-								Age:          res.Output.Baseinfo.Age,
-								PatientId:    patient.ID,
-								Certno:       res.Output.Baseinfo.Certno,
-								Brdy:         res.Output.Baseinfo.Brdy,
-								Gend:         res.Output.Baseinfo.Gend,
-								Naty:         res.Output.Baseinfo.Naty,
-								PsnCertType:  res.Output.Baseinfo.PsnCertType,
-								PsnName:      res.Output.Baseinfo.PsnName,
-								Idetinfo:     idetinfoStr,
-								Insuinfo:     infoStr,
-								UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
-								CardInfo:     card_info,
-								VerifyNumber: token,
-							}
-							service.CreateHisPsn(psn)
-							c.ServeSuccessJSON(map[string]interface{}{
-								"patient": patient,
-								"number":  token,
-							})
+						Iinfos, _ := json.Marshal(res.Output.Iinfo)
+						Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+						infoStr := string(Iinfos)
+						idetinfoStr := string(Idetinfos)
+						psn := &models.HisPsn{
+							PsnNo:        res.Output.Baseinfo.PsnNo,
+							Age:          res.Output.Baseinfo.Age,
+							PatientId:    patient.ID,
+							Certno:       res.Output.Baseinfo.Certno,
+							Brdy:         res.Output.Baseinfo.Brdy,
+							Gend:         res.Output.Baseinfo.Gend,
+							Naty:         res.Output.Baseinfo.Naty,
+							PsnCertType:  res.Output.Baseinfo.PsnCertType,
+							PsnName:      res.Output.Baseinfo.PsnName,
+							Idetinfo:     idetinfoStr,
+							Insuinfo:     infoStr,
+							UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+							CardInfo:     card_info,
+							VerifyNumber: token,
 						}
+						service.CreateHisPsn(psn)
+						c.ServeSuccessJSON(map[string]interface{}{
+							"patient": patient,
+							"number":  token,
+						})
 					}
 				} else {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
@@ -1025,15 +943,10 @@ func (c *HisApiController) ReadCard() {
 			} else { //读卡失败
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
 				return
-
 			}
-
 		}
-
 		break
-
 	}
-
 }
 
 var initFlag int64 = 0

controllers/zh/zh_his_api_controller.go

@@ -1,6 +1,7 @@
 package zh
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"gdyb/controllers"
@@ -11,8 +12,10 @@ import (
 	"github.com/astaxie/beego"
 	"github.com/axgle/mahonia"
 	"github.com/jinzhu/gorm"
+	"io/ioutil"
 	"math"
 	"math/rand"
+	"net/http"
 	"os"
 	"regexp"
 	"strconv"
@@ -494,7 +497,50 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 	config, _ := service.GetMedicalInsuranceConfig(c.GetAdminUserInfo().CurrentOrgId)
 	if config.IsOpen == 1 {
 
-		result := service.Gdyb1101A(id_card_no, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, patient.Name)
+		var result string
+		var request_log string
+		var result_log string
+
+		if miConfig.MdtrtareaAdmvs == "150499" {
+			//请求内网数据
+			api := "http://172.16.13.254:9532/" + "nmyb/1101?cert_no=" + patient.IdCardNo +
+				"&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10) + "&name=" + patient.Name
+
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			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(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			result_byte, _ := json.Marshal(respJSON)
+			result = string(result_byte)
+			saveLog(result_log, request_log, "1101", "人员基本信息获取")
+
+		} else {
+			result, request_log, result_log = service.ZHGdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates, name)
+			saveLog(result_log, request_log, "1101", "人员基本信息获取")
+
+		}
+
+		//result := service.Gdyb1101A(id_card_no, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, patient.Name)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)
@@ -625,71 +671,109 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 	diagnosisConfig, _ := service.FindDiagnoseByIds(diagnosis_ids_arr)
 	sickConfig, _ := service.FindSickById(sick_type)
 	departmentInfo, _ := service.GetDepartMentDetail(department)
-
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
 	role, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
-	result, request_log, result_log := service.ZHGdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates, name)
-	//fmt.Println(request_log)
-	//fmt.Println(result_log)
-	saveLog(result_log, request_log, "1101", "人员基本信息获取")
 
-	doctorInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor)
+	var result string
+	var request_log string
+	var result_log string
+	var res2 ResultTwo
+	var resTwo10265 ResultTwo10265
+	psn_info, _ := service.GetPsnByPatientId(patient.ID)
 
-	deviceNumber, _ := service.GetDeviceNumberByID(adm_bed, adminInfo.CurrentOrgId)
+	if miConfig.MdtrtareaAdmvs == "150499" {
+		if id_card_type == 1 {
+			//请求内网数据
+			api := "http://172.16.13.254:9532/" + "nmyb/1101?cert_no=" + patient.IdCardNo +
+				"&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10) + "&name=" + patient.Name
 
-	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 res2 ResultTwo
-	//if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
-	//	utils.ErrorLog("解析失败：%v", err)
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
-	var res2 ResultTwo
-	var resTwo10265 ResultTwo10265
+			body, ioErr := ioutil.ReadAll(resp.Body)
 
-	if miConfig.Code == "H15049901371" {
-		if err := json.Unmarshal(userJSONBytes, &resTwo10265); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
-		Infcode, _ := strconv.ParseInt(resTwo10265.Infcode, 10, 64)
-		res2.Infcode = Infcode
-		res2.ErrMsg = resTwo10265.ErrMsg
-		res2.Output = resTwo10265.Output
-		res2.InfRefmsgid = resTwo10265.InfRefmsgid
-		res2.RespondTime = resTwo10265.RespondTime
-		res2.WarnInfo = resTwo10265.WarnInfo
+			var respJSON map[string]interface{}
+
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			result_byte, _ := json.Marshal(respJSON)
+			result = string(result_byte)
+
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			userJSONBytes, _ := json.Marshal(dat)
+			if err := json.Unmarshal(userJSONBytes, &resTwo10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			Infcode, _ := strconv.ParseInt(resTwo10265.Infcode, 10, 64)
+			res2.Infcode = Infcode
+			res2.ErrMsg = resTwo10265.ErrMsg
+			res2.Output = resTwo10265.Output
+			res2.InfRefmsgid = resTwo10265.InfRefmsgid
+			res2.RespondTime = resTwo10265.RespondTime
+			res2.WarnInfo = resTwo10265.WarnInfo
+		} else {
+			res2.Infcode = 0
+			res2.Output.Baseinfo.PsnNo = psn_info.PsnNo
+			res2.Output.Baseinfo.Certno = patient.IdCardNo
+		}
 	} else {
+		result, request_log, result_log = service.ZHGdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates, name)
+		saveLog(result_log, request_log, "1101", "人员基本信息获取")
+	}
+
+	doctorInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor)
+	deviceNumber, _ := service.GetDeviceNumberByID(adm_bed, adminInfo.CurrentOrgId)
+
+	if miConfig.MdtrtareaAdmvs != "150499" {
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+		userJSONBytes, _ := json.Marshal(dat)
 		if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-
 	}
 
-	//InsuplcAdmdvs = res2.Output.
-
-	if social_type != 0 {
-
+	var infoStr string
+	if miConfig.MdtrtareaAdmvs == "150499" {
+		if id_card_type == 1 {
+			Iinfos, _ := json.Marshal(res2.Output.Iinfo)
+			infoStr = string(Iinfos)
+		} else {
+			infoStr = psn_info.Insuinfo
+		}
 	} else {
-
+		Iinfos, _ := json.Marshal(res2.Output.Iinfo)
+		infoStr = string(Iinfos)
 	}
 
-	Iinfos, _ := json.Marshal(res2.Output.Iinfo)
-	infoStr := string(Iinfos)
-
 	var rf []*ResultFive
 	json.Unmarshal([]byte(infoStr), &rf)
 	var insutypes []*ResultFive
@@ -846,9 +930,43 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			dises = append(dises, dise)
 		}
 		struct2401.Diseinfo = dises
-		result, request_log := service.ZHGdyb2401(struct2401, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, insuplc_admdvs, miConfig.MdtrtareaAdmvs)
-		saveLog(result, request_log, "2401", "入医登记")
 
+		var result string
+		var request_log string
+		if miConfig.MdtrtareaAdmvs == "150499" {
+			data := make(map[string]interface{})
+			data["org_name"] = miConfig.OrgName
+			data["doctor"] = role.UserName
+			data["fixmedins_code"] = miConfig.Code
+			data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+			data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
+			data["secret_key"] = miConfig.SecretKey
+			data["struct_2401"] = struct2401
+			var req *http.Request
+			bytesData, _ := json.Marshal(data)
+			req, _ = http.NewRequest("POST", "http://172.16.13.254:9532/"+"jsyb/2401", 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
+			}
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			result_byte, _ := json.Marshal(respJSON)
+			result = string(result_byte)
+		} else {
+			result, request_log = service.ZHGdyb2401(struct2401, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, insuplc_admdvs, miConfig.MdtrtareaAdmvs)
+			saveLog(result, request_log, "2401", "入院登记")
+		}
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)
@@ -1035,9 +1153,43 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 	struct2402.Diseinfo = dises
 	struct2402.DiseName = sickConfig.ClassName
 	struct2402.DiseCode = sickConfig.CountryCode
-	result, request_log := service.ZHGdyb2402(struct2402, miConfig.OrgName, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
-	//saveLog(result,request_log,"出院)
-	saveLog(result, request_log, "2402", "出院")
+
+	var result string
+	var request_log string
+	if miConfig.MdtrtareaAdmvs == "150499" {
+		data := make(map[string]interface{})
+		data["org_name"] = miConfig.OrgName
+		data["doctor"] = role.UserName
+		data["fixmedins_code"] = miConfig.Code
+		data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+		data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
+		data["secret_key"] = miConfig.SecretKey
+		data["struct_2402"] = struct2402
+		var req *http.Request
+		bytesData, _ := json.Marshal(data)
+		req, _ = http.NewRequest("POST", "http://172.16.13.254:9532/"+"nmyb/2402", 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)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		var respJSON map[string]interface{}
+		if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		result_byte, _ := json.Marshal(respJSON)
+		result = string(result_byte)
+	} else {
+		result, request_log = service.ZHGdyb2402(struct2402, miConfig.OrgName, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
+		saveLog(result, request_log, "2402", "出院")
+	}
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -1211,9 +1363,43 @@ func (c *ZHHisApiController) GetSettleInfo() {
 		allTotal = fmt.Sprintf("%.4f", order.MedfeeSumamt)
 
 	}
-	result, src_resquest = service.ZHGdyb2304(record.PsnNo, record.Number, chrg_bchno, cert_no, record.InsutypeType, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "0", record.IdCardType, 0, 0, 0, 0, record.Certificates)
-	//saveLog()
-	saveLog(result, src_resquest, "2304", "住院结算")
+
+	if miConfig.MdtrtareaAdmvs == "150499" {
+		//请求内网数据
+		api := "http://172.16.13.254:9532/" + "nmyb/2304?psn_no=" + record.PsnNo + "&mdtrt_id=" + record.Number + "&chrg_bchno=" + chrg_bchno +
+			"&insutype_type=" + record.InsutypeType + "&total=" + allTotal +
+			"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(record.IdCardType, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(record.Certificates, 10) + "&name=" + record.Name + "&cert_no=" + record.IdCardNo
+		resp, requestErr := http.Get(api)
+		if requestErr != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		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(string(body)), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		result_byte, _ := json.Marshal(respJSON)
+		result = string(result_byte)
+
+	} else {
+		result, src_resquest = service.ZHGdyb2304(record.PsnNo, record.Number, chrg_bchno, cert_no, record.InsutypeType, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "0", record.IdCardType, 0, 0, 0, 0, record.Certificates)
+		//saveLog()
+		saveLog(result, src_resquest, "2304", "住院结算")
+
+	}
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -1390,8 +1576,43 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 	}
 	var result string
 	var src_resquest string
-	result, src_resquest = service.ZHGdyb2303(record.PsnNo, record.Number, chrg_bchno, cert_no, record.InsutypeType, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "0", record.IdCardType, 0, 0, 0, 0, record.Certificates)
-	saveLog(result, src_resquest, "2303", "住院预结算")
+
+	if miConfig.MdtrtareaAdmvs == "150499" {
+		//请求内网数据
+		api := "http://172.16.13.254:9532/" + "nmyb/2303?psn_no=" + record.PsnNo + "&mdtrt_id=" + record.Number + "&chrg_bchno=" + chrg_bchno +
+			"&insutype_type=" + record.InsutypeType + "&total=" + allTotal +
+			"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(record.IdCardType, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(record.Certificates, 10) + "&name=" + record.Name + "&cert_no=" + record.IdCardNo
+		resp, requestErr := http.Get(api)
+		if requestErr != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		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(string(body)), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		result_byte, _ := json.Marshal(respJSON)
+		result = string(result_byte)
+
+	} else {
+		result, src_resquest = service.ZHGdyb2303(record.PsnNo, record.Number, chrg_bchno, cert_no, record.InsutypeType, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "0", record.IdCardType, 0, 0, 0, 0, record.Certificates)
+		saveLog(result, src_resquest, "2303", "住院预结算")
+
+	}
+
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -1538,9 +1759,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	}
 	recordDateTime := theTime.Unix()
 	adminUser := c.GetAdminUserInfo()
-
 	var prescriptions []*models.HisPrescription
-
 	data := make(map[string]interface{})
 	if settle_accounts_type == 1 { //日结
 		prescriptions, _ = service.GetZHHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
@@ -1565,20 +1784,13 @@ func (c *ZHHisApiController) GetUploadInfo() {
 		prescriptions, _ = service.GetZHMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime)
 
 	}
-
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	record, _ := service.GetInHospitalRecord(in_hospital_id)
-
 	if record.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 
-	//if record.InHospitalStatus == 1 && record.OutHospitalStatus == 0 {
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHospitalNoExistDataException)
-	//	return
-	//}
-
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
@@ -1589,6 +1801,8 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	department, _ := service.GetDepartMentDetail(record.Departments)
 	strconv.FormatInt(record.PatientId, 10)
 
+	doctor_info, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, record.Doctor)
+
 	//client := &http.Client{}
 	data["psn_no"] = record.PsnNo
 	data["mdtrt_id"] = record.Number
@@ -1710,20 +1924,6 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				}
 			}
 
-			//for _, subItem := range item.HisAdditionalCharge {
-			//	if len(subItem.XtHisAddtionConfig.Code) > 0 {
-			//		cus := &models.NewCustom{
-			//			DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*float64(subItem.Count)),
-			//			Cut:              fmt.Sprintf("%.4f", float64(subItem.Count)),
-			//			FeedetlSn:        subItem.FeedetlSn,
-			//			Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
-			//			MedListCodg:      subItem.XtHisAddtionConfig.Code,
-			//			HospApprFlag:     -1,
-			//
-			//		}
-			//		customs = append(customs, cus)
-			//	}
-			//}
 		}
 
 		//总页数,向上取整,注意除之前要先转换类型为float64
@@ -1740,22 +1940,53 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				stop = len(customs)
 			}
 
-			//data["pre"] = customs[start-1 : stop]
-			//bytesData, _ := json.Marshal(data)
-			//req, _ := http.NewRequest("POST", "http://127.0.0.1:9532/"+"gdyb/zh/five", bytes.NewReader(bytesData))
-			//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
-			//}
-			resultLog, requestLog := service.ZHGdyb2301(record.PsnNo, record.Number, customs[start-1:stop], chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(department.ID, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["med_type"].(string))
-			saveLog(resultLog, requestLog, "2301", "上传明细")
+			var result string
+			var requestLog string
+			if miConfig.MdtrtareaAdmvs == "150499" {
+				data := make(map[string]interface{})
+				data["psn_no"] = record.PsnNo
+				data["number"] = record.Number
+				data["customs"] = customs[start-1 : stop]
+				data["chrg_bchno"] = chrg_bchno
+				data["dept"] = strconv.FormatInt(department.ID, 10)
+				data["dept_code"] = department.Number
+				data["doctor_code"] = doctor_info.ID
+				data["doctor_name"] = doctor_info.UserName
+				data["org_name"] = miConfig.OrgName
+				data["opertor"] = roles.UserName
+				data["fixmedins_code"] = miConfig.Code
+				data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+				data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
+				data["secret_key"] = miConfig.SecretKey
+
+				var req *http.Request
+				bytesData, _ := json.Marshal(data)
+				req, _ = http.NewRequest("POST", "http://172.16.13.254:9532/"+"nmyb/2301", 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
+				}
+				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+				result_byte, _ := json.Marshal(respJSON)
+				result = string(result_byte)
+			} else {
+				result, requestLog = service.ZHGdyb2301(record.PsnNo, record.Number, customs[start-1:stop], chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(department.ID, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["med_type"].(string))
+				saveLog(result, requestLog, "2301", "上传明细")
+			}
 
 			var dat map[string]interface{}
-			if err := json.Unmarshal([]byte(resultLog), &dat); err == nil {
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
 			} else {
 				fmt.Println(err)
@@ -1959,8 +2190,46 @@ func (c *ZHHisApiController) ZHRefund() {
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 
-		result, src_resquest := service.Gdyb2305(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
-		saveLog(result, src_resquest, "2305", "退费")
+		var result string
+		var requestLog string
+		if miConfig.MdtrtareaAdmvs == "150499" {
+			//请求内网数据
+			api := "http://172.16.13.254:9532/" + "nmyb/2305?mdtrt_id=" + record.Number + "&psn_no=" + record.PsnNo + "&setl_id=" + order.SetlId +
+				"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			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(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			result_byte, _ := json.Marshal(respJSON)
+			result = string(result_byte)
+			//saveLog(result, requestLog, "2404", "入院登记撤销")
+			saveLog(result, requestLog, "2305", "退费")
+
+		} else {
+			result, requestLog := service.Gdyb2305(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+			saveLog(result, requestLog, "2305", "退费")
+
+		}
 
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -2068,8 +2337,41 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 		var isSuccess bool = true
 
 		for _, item := range infos {
-			result, requestLog := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, item.FeedetlSn, 1)
-			saveLog(result, requestLog, "2302", "日结退明细")
+			var result string
+			var requestLog string
+			if miConfig.MdtrtareaAdmvs == "150499" {
+				//请求内网数据
+				api := "http://172.16.13.254:9532/" + "nmyb/2302?psn_no=" + record.PsnNo + "&mdtrtId=" + record.Number + "&feedetl_sn=" + item.FeedetlSn +
+					"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&refund_type=" + "1"
+				resp, requestErr := http.Get(api)
+				if requestErr != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				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(string(body)), &respJSON); err != nil {
+					utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+				result_byte, _ := json.Marshal(respJSON)
+				result = string(result_byte)
+				saveLog(result, requestLog, "2302", "日结退明细")
+
+			} else {
+				result, requestLog := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, item.FeedetlSn, 1)
+				saveLog(result, requestLog, "2302", "日结退明细")
+
+			}
+
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -2127,13 +2429,43 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 		//var order models.HisOrder
 		//order, _ = service.GetHisOrderByID(order_id)
 		//record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+		var result string
+		var requestLog string
 		record, _ := service.GetInHospitalRecord(his_patient_id)
 		config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 		if config.IsOpen == 1 { //对接了医保，走医保流程
 
-			result, requestLog := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
-			//saveLog(result,requestLog,)
-			saveLog(result, requestLog, "2302", "月结退明细")
+			if miConfig.MdtrtareaAdmvs == "150499" {
+				//请求内网数据
+				api := "http://172.16.13.254:9532/" + "nmyb/2302?psn_no=" + record.PsnNo + "&mdtrtId=" + record.Number + "&number=0000" +
+					"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&refund_type=" + "1"
+				resp, requestErr := http.Get(api)
+				if requestErr != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				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(string(body)), &respJSON); err != nil {
+					utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+				result_byte, _ := json.Marshal(respJSON)
+				result = string(result_byte)
+				//saveLog(result, requestLog, "2302", "日结退明细")
+
+			} else {
+				result, requestLog = service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
+				saveLog(result, requestLog, "2302", "月结退明细")
+			}
 
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -2200,8 +2532,45 @@ func (this *ZHHisApiController) GetZHOutHospitalUnCheck() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInHospitalNoExistDataException)
 		return
 	}
-	result, requestLog := service.ZHGdyb2405(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
-	saveLog(result, requestLog, "2405", "出院登记撤销")
+
+	var result string
+	var requestLog string
+	if miConfig.MdtrtareaAdmvs == "150499" {
+		//请求内网数据
+		api := "http://172.16.13.254:9532/" + "nmyb/2405?mdtrt_id=" + record.Number + "&psn_no=" + record.PsnNo +
+			"&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName + "&fixmedins_code=" + miConfig.Code +
+			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+		resp, requestErr := http.Get(api)
+		if requestErr != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		body, ioErr := ioutil.ReadAll(resp.Body)
+
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		var respJSON map[string]interface{}
+
+		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		result_byte, _ := json.Marshal(respJSON)
+		result = string(result_byte)
+
+	} else {
+		result, requestLog = service.ZHGdyb2405(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+		saveLog(result, requestLog, "2405", "出院登记撤销")
+
+	}
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -2251,20 +2620,56 @@ func (this *ZHHisApiController) GetZHOutHospitalUnCheck() {
 func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 	id, _ := this.GetInt64("id")
 	admin_user_id, _ := this.GetInt64("admin_user_id")
-
 	adminInfo := this.GetAdminUserInfo()
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
 	role, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
-
 	record, _ := service.GetInHospitalRecord(id)
+
 	if record.ID == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInHospitalNoExistDataException)
 		return
 	}
 
-	result, requestLog := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
-	//saveLog(result,requestLog,)
-	saveLog(result, requestLog, "2302", "月结退明细")
+	var result string
+	var requestLog string
+
+	if miConfig.MdtrtareaAdmvs == "150499" {
+		//请求内网数据
+		api := "http://172.16.13.254:9532/" + "nmyb/2302?psn_no=" + record.PsnNo + "&mdtrtId=" + record.Number + "&number=" + "0000" +
+			"&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName + "&fixmedins_code=" + miConfig.Code +
+			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&refund_type=0"
+		resp, requestErr := http.Get(api)
+		if requestErr != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		body, ioErr := ioutil.ReadAll(resp.Body)
+
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		var respJSON map[string]interface{}
+
+		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		result_byte, _ := json.Marshal(respJSON)
+		result = string(result_byte)
+		saveLog(result, requestLog, "2302", "月结退明细")
+
+	} else {
+		result, requestLog = service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
+		saveLog(result, requestLog, "2302", "月结退明细")
+
+	}
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -2298,10 +2703,47 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 	}
 
 	if res2.Infcode == 0 {
+
 		service.UpdataHospitalOrderStatus(record.Number, adminInfo.CurrentOrgId)
-		result, requestLog := service.ZHGdyb2404(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
-		//saveLog()
-		saveLog(result, requestLog, "2404", "入院登记撤销")
+
+		var result string
+		var requestLog string
+		if miConfig.MdtrtareaAdmvs == "150499" {
+			//请求内网数据
+			api := "http://172.16.13.254:9532/" + "nmyb/2404?mdtrt_id=" + record.Number + "&psn_no=" + record.PsnNo +
+				"&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			body, ioErr := ioutil.ReadAll(resp.Body)
+
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			var respJSON map[string]interface{}
+
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			result_byte, _ := json.Marshal(respJSON)
+			result = string(result_byte)
+
+		} else {
+			result, requestLog = service.ZHGdyb2404(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+			saveLog(result, requestLog, "2404", "入院登记撤销")
+
+		}
 
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {

service/zh_his_service.go

@@ -673,6 +673,125 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCusto
 
 }
 
+func ZHGdyb2301A(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, opertor string) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	//tempTime := time.Unix(timestamp, 0)
+	//timeFormat := tempTime.Format("20060102150405")
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	//chrgBchno := rand.Intn(100000) + 10000
+
+	var customs []*models.NewCustom
+
+	customs = hisPrescription
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, opertor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	feedetail := make([]map[string]interface{}, 0)
+	inputMessage["infno"] = "2301" // 交易编码
+
+	//chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
+	for _, item := range customs {
+		feedetailInfo := make(map[string]interface{})
+		feedetailInfo["feedetl_sn"] = item.FeedetlSn
+		feedetailInfo["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
+		feedetailInfo["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
+		feedetailInfo["med_type"] = med_type
+		feedetailInfo["fee_ocur_time"] = item.FeeOcurTime            // 费用发生时间
+		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
+		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
+		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额
+		feedetailInfo["cnt"] = item.Cut                              // 数量
+		feedetailInfo["pric"] = item.Price                           // 单价
+		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
+		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
+		feedetailInfo["bilg_dr_codg"] = doctor_id                    // 开单医生编码
+		feedetailInfo["bilg_dr_name"] = doctor
+		feedetailInfo["acord_dept_codg"] = ""    // 受单科室编码
+		feedetailInfo["acord_dept_name"] = ""    // 受单科室名称
+		feedetailInfo["orders_dr_code"] = ""     // 受单医生编码
+		feedetailInfo["orders_dr_name"] = ""     // 受单医生姓名
+		feedetailInfo["chrg_bchno"] = chrg_bchno // 收费批次号
+		feedetailInfo["dise_codg"] = ""          // 病种编码
+		feedetailInfo["rxno"] = ""               // 处方号
+		feedetailInfo["rx_circ_flag"] = "0"      // 外购处方标志
+		feedetailInfo["sin_dos_dscr"] = ""       // 单次剂量描述
+		feedetailInfo["used_frqu_dscr"] = ""     // 使用频次描述
+		feedetailInfo["prd_days"] = "0"          // 周期天数
+		feedetailInfo["medc_way_dscr"] = ""      // 用药途径描述
+		// 开单医师姓名
+
+		if item.HospApprFlag != -1 {
+			if item.HospApprFlag == 1 {
+				feedetailInfo["hosp_appr_flag"] = "0" // 医院审批标志
+			} else if item.HospApprFlag == 2 {
+				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+			} else if item.HospApprFlag == 3 {
+				feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
+			} else {
+				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+			}
+		} else {
+			feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+		}
+
+		feedetailInfo["tcmdrug_used_way"] = "" // 中药使用方式
+		feedetailInfo["etip_flag"] = ""        // 外检标志
+		feedetailInfo["etip_hosp_code"] = ""   // 外检医院编码
+		feedetailInfo["dscg_tkdrug_flag"] = "" // 出院带药标志
+		feedetailInfo["matn_fee_flag"] = ""    // 生育费用标志
+		feedetail = append(feedetail, feedetailInfo)
+	}
+	input["feedetail"] = feedetail
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println("----------")
+	fmt.Println(string(bytesData))
+	fmt.Println("----------")
+	requestLog := string(bytesData)
+
+	if err != nil {
+		fmt.Println(err.Error())
+		return "", ""
+	}
+	reader := bytes.NewReader(bytesData)
+
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	url := gdyb_url + "2301"
+	if mdtrtarea_admvs == "150499" {
+		url = gdyb_url
+	}
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return "", ""
+	}
+
+	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 "", ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return "", ""
+	}
+	return string(respBytes), requestLog
+
+}
+
 //  住院费用明细信息撤销
 func Gdyb2302(psnNo string, mdtrtId string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, number string, refund_type int64) (string, string) {
 	// 生成签名