Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/gdyb_controller.go

@@ -72,7 +72,12 @@ func (c *GdybController) PostOne() {
 	doctor := c.GetString("doctor")
 	fixmedins_code := c.GetString("fixmedins_code")
 
-	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code)
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+
+	secret_key := c.GetString("secret_key")
+
+	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key)
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -94,7 +99,15 @@ func (c *GdybController) PostTwo() {
 	dept := c.GetString("dept")
 	fixmedins_code := c.GetString("fixmedins_code")
 
-	result := service.Gdyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code)
+	dept_code := c.GetString("dept_code")
+	doctor_id := c.GetString("doctor_id")
+
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+
+	secret_key := c.GetString("secret_key")
+
+	result := service.Gdyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key)
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -113,8 +126,12 @@ func (c *GdybController) PostThree() {
 	iptOtpNo := c.GetString("ipt_otp_no")
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 
-	result := service.Gdyb2202(psnNo, mdtrtId, iptOtpNo, org_name, doctor)
+	secret_key := c.GetString("secret_key")
+
+	result := service.Gdyb2202(psnNo, mdtrtId, iptOtpNo, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
@@ -131,7 +148,12 @@ func (c *GdybController) PostFour() {
 	doctor_id, _ := c.GetInt64("doctor_id", 0)
 	fixmedins_code := c.GetString("fixmedins_code")
 
-	result := service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code)
+	diag_code := c.GetString("diag_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+
+	result := service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 	} else {
@@ -179,7 +201,8 @@ func (c *GdybController) PostFive() {
 		return
 	}
 
-	result := service.Gdyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string), respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string))
+	result := service.Gdyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
+		respJSON["doctor"].(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))
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -199,7 +222,12 @@ func (c *GdybController) PostSix() {
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
 
-	result := service.Gdyb2205(psnNo, mdtrtId, chrgBchno, org_name, doctor)
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+
+	secret_key := c.GetString("secret_key")
+
+	result := service.Gdyb2205(psnNo, mdtrtId, chrgBchno, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
@@ -215,8 +243,9 @@ func (c *GdybController) PostSeven() {
 	total := c.GetString("total")
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
+	secret_key := c.GetString("secret_key")
 
-	result := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor)
+	result := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, secret_key)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -238,8 +267,11 @@ func (c *GdybController) PostEight() {
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
 	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
 
-	result := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code)
+	result := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -258,8 +290,9 @@ func (c *GdybController) PostNine() {
 	setlId := c.GetString("setl_id")
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
+	secret_key := c.GetString("secret_key")
 
-	result := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor)
+	result := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})

controllers/his_api_controller.go

@@ -1300,7 +1300,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 	if config.IsOpen == 1 {
 
-		api := "http://127.0.0.1:9531/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code
+		api := "http://127.0.0.1:9531/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 		resp, requestErr := http.Get(api)
 
 		if requestErr != nil {
@@ -1366,11 +1366,14 @@ func (c *HisApiController) GetRegisterInfo() {
 
 		department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 
+		//department_id := strconv.FormatInt(department.ID, 10)
+		doctor_id := strconv.FormatInt(patientPrescription.DoctorId, 10)
+
 		if count <= 0 {
 			api := "http://127.0.0.1:9531/" + "gdyb/two?cert_no=" + patient.IdCardNo + "&insutype=" +
 				res.Output.Iinfo[0].Insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
-				"&dept=" + department.Name + "&fixmedins_code=" + miConfig.Code
+				"&dept=" + department.Name + "&fixmedins_code=" + miConfig.Code + "&dept_code=" + department.Number + "&doctor_id=" + doctor_id + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1424,7 +1427,8 @@ func (c *HisApiController) GetRegisterInfo() {
 			if err == nil {
 				api := "http://127.0.0.1:9531/" + "gdyb/four?psn_no=" + his.PsnNo +
 					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
-					"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + "11" + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code
+					"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + "11" + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1551,7 +1555,9 @@ func (c *HisApiController) GetUploadInfo() {
 
 	//org, _ := service.GetOrgById(adminUser.CurrentOrgId)
 	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, id, recordDateTime)
+	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 
+	strconv.FormatInt(his.PatientId, 10)
 	client := &http.Client{}
 	data := make(map[string]interface{})
 	data["psn_no"] = his.PsnNo
@@ -1563,6 +1569,10 @@ func (c *HisApiController) GetUploadInfo() {
 	data["dept"] = patientPrescription.Departments
 
 	data["fixmedins_code"] = miConfig.Code
+	data["dept_code"] = department.Number
+	data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+	data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
+	data["secret_key"] = miConfig.SecretKey
 
 	var ids []int64
 	//var idsTwo []int64
@@ -1713,7 +1723,7 @@ func (c *HisApiController) GetUploadInfo() {
 				insutype := rf[0].Insutype
 				api := "http://127.0.0.1:9531/" + "gdyb/eight?cert_no=" + cert_no + "&insutype=" +
 					insutype + "&psn_no=" + psn_no + "&chrg_bchno=" + chrg_bchno + "&mdtrt_id=" + mdtrt_id +
-					"&total=" + allTotal + "&org_name=" + org.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code
+					"&total=" + allTotal + "&org_name=" + org.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 				resp, requestErr := http.Get(api)
 
 				if requestErr != nil {

models/his_models.go

@@ -756,17 +756,20 @@ func (HisOrderError) TableName() string {
 }
 
 type MedicalInsuranceOrgConfig struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	Code          string `gorm:"column:code" json:"code" form:"code"`
-	OrgName       string `gorm:"column:org_name" json:"org_name" form:"org_name"`
-	Vpn           string `gorm:"column:vpn" json:"vpn" form:"vpn"`
-	EleCardId     string `gorm:"column:ele_card_id" json:"ele_card_id" form:"ele_card_id"`
-	EleCardKey    string `gorm:"column:ele_card_key" json:"ele_card_key" form:"ele_card_key"`
-	ChannelNumber string `gorm:"column:channel_number" json:"channel_number" form:"channel_number"`
-	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status        int64  `gorm:"column:status" json:"status" form:"status"`
-	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	Code           string `gorm:"column:code" json:"code" form:"code"`
+	OrgName        string `gorm:"column:org_name" json:"org_name" form:"org_name"`
+	Vpn            string `gorm:"column:vpn" json:"vpn" form:"vpn"`
+	EleCardId      string `gorm:"column:ele_card_id" json:"ele_card_id" form:"ele_card_id"`
+	EleCardKey     string `gorm:"column:ele_card_key" json:"ele_card_key" form:"ele_card_key"`
+	ChannelNumber  string `gorm:"column:channel_number" json:"channel_number" form:"channel_number"`
+	Ctime          int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	MdtrtareaAdmvs string `gorm:"column:mdtrtarea_admvs" json:"mdtrtarea_admvs" form:"mdtrtarea_admvs"`
+	InsuplcAdmdvs  string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
+	SecretKey      string `gorm:"column:secret_key" json:"secret_key" form:"secret_key"`
 }
 
 func (MedicalInsuranceOrgConfig) TableName() string {

service/gdyb_service.go

@@ -20,14 +20,14 @@ const (
 )
 
 // 人员基本信息
-func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code string) string {
+func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce)
+	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "1101"      // 交易编码
@@ -79,16 +79,16 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 }
 
 // 门诊挂号
-func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string) string {
+func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce)
+	signature := setSignature(timestamp, nonce, secret_key)
 	tempTime := time.Unix(timestamp, 0)
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2201"        // 交易编码
@@ -98,9 +98,9 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	inputData["mdtrt_cert_type"] = "02"   // 就诊凭证类型
 	inputData["mdtrt_cert_no"] = certNo   // 就诊凭证编号
 	inputData["ipt_otp_no"] = ipt_otp_no  // 住院/门诊号
-	inputData["atddr_no"] = "1002"        // 医师编码
+	inputData["atddr_no"] = doctor_id     // 医师编码
 	inputData["dr_name"] = doctor         // 医师姓名
-	inputData["dept_code"] = "3002"       // 科室编码
+	inputData["dept_code"] = dept_code    // 科室编码
 	inputData["dept_name"] = dept         // 科室名称
 	inputData["caty"] = "A03.06"          // 科别
 
@@ -145,14 +145,14 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 }
 
 // 门诊挂号撤销
-func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string, doctor string) string {
+func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce)
+	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "")
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "", insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2202"       // 交易编码
@@ -201,16 +201,16 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 }
 
 // 门诊就诊信息上传
-func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, diag string, org_name string, med_type string, doctor_id int64, fixmedins_code string) string {
+func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, diag string, org_name string, med_type string, doctor_id int64, fixmedins_code string, diag_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce)
+	signature := setSignature(timestamp, nonce, secret_key)
 	tempTime := time.Unix(timestamp, 0)
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	diseinfo := make([]map[string]interface{}, 0)
@@ -229,7 +229,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	diseinfo_sun := make(map[string]interface{})
 	diseinfo_sun["diag_type"] = "1"           // 诊断类别
 	diseinfo_sun["diag_srt_no"] = "1"         // 诊断排序号
-	diseinfo_sun["diag_code"] = "A04.902"     // 诊断代码
+	diseinfo_sun["diag_code"] = diag_code     // 诊断代码
 	diseinfo_sun["diag_name"] = diag          // 诊断名称
 	diseinfo_sun["diag_dept"] = department    // 诊断科室
 	diseinfo_sun["dise_dor_no"] = doctor_id   // 诊断医生编码
@@ -334,11 +334,11 @@ type Result struct {
 }
 
 //  门诊费用明细信息上传
-func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string) string {
+func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, 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) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce)
+	signature := setSignature(timestamp, nonce, secret_key)
 	tempTime := time.Unix(timestamp, 0)
 	//timeFormat := tempTime.Format("20060102150405")
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
@@ -398,7 +398,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	}
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	feedetail := make([]map[string]interface{}, 0)
 	inputMessage["infno"] = "2204" // 交易编码
@@ -423,9 +423,9 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["used_frqu_dscr"] = ""                         // 使用频次描述
 		feedetailInfo["prd_days"] = "0"                              // 周期天数
 		feedetailInfo["medc_way_dscr"] = ""                          // 用药途径描述
-		feedetailInfo["bilg_dept_codg"] = "3002"                     // 开单科室编码
+		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
 		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
-		feedetailInfo["bilg_dr_codg"] = "1002"                       // 开单医生编码
+		feedetailInfo["bilg_dr_codg"] = doctor_id                    // 开单医生编码
 		feedetailInfo["bilg_dr_name"] = doctor                       // 开单医师姓名
 		feedetailInfo["acord_dept_codg"] = ""                        // 受单科室编码
 		feedetailInfo["acord_dept_name"] = ""                        // 受单科室名称
@@ -484,14 +484,14 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 }
 
 //  门诊费用明细信息撤销
-func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string) string {
+func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce)
+	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "")
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "", insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2205" // 交易编码
@@ -544,14 +544,14 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 }
 
 //  门诊预结算
-func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string) string {
+func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, secret_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce)
+	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "")
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "", "", "")
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2206" // 交易编码
@@ -608,14 +608,14 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算
-func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string) string {
+func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce)
+	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2207" // 交易编码
@@ -673,14 +673,14 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算撤销
-func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string) string {
+func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce)
+	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "")
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "", "", "")
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2208" // 交易编码
@@ -924,8 +924,8 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 //}
 
 // 生成签名
-func setSignature(timestamp int64, nonce string) string {
-	str := strconv.FormatInt(timestamp, 10) + SceretKey + nonce + strconv.FormatInt(timestamp, 10)
+func setSignature(timestamp int64, nonce string, secret_key string) string {
+	str := strconv.FormatInt(timestamp, 10) + secret_key + nonce + strconv.FormatInt(timestamp, 10)
 	hash := sha256.New()
 	//输入数据
 	hash.Write([]byte(str))
@@ -950,7 +950,7 @@ func GetRandomString(l int) string {
 }
 
 // 生成基础报文
-func SetInputMessage(nonce string, timestamp int64, org_name string, doctor string, fixmedins_code string) map[string]interface{} {
+func SetInputMessage(nonce string, timestamp int64, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) map[string]interface{} {
 	// 生成签名
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
@@ -962,8 +962,8 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 
 	inputMessage["infno"] = "1101"                                                              // 交易编码
 	inputMessage["msgid"] = fixmedins_code + timeFormat + strconv.FormatInt(int64(randNum), 10) // 发送方报文 ID
-	inputMessage["mdtrtarea_admvs"] = "440200"                                                  // 就医地医保区划
-	inputMessage["insuplc_admdvs"] = "440200"                                                   // 参保地医保区划
+	inputMessage["mdtrtarea_admvs"] = mdtrtarea_admvs                                           // 就医地医保区划
+	inputMessage["insuplc_admdvs"] = insuplc_admdvs                                             // 参保地医保区划
 	inputMessage["recer_sys_code"] = "01"                                                       // 接收方系统代码
 	inputMessage["dev_no"] = ""                                                                 // 设备编号
 	inputMessage["dev_safe_info"] = ""                                                          // 设备安全信息
@@ -971,7 +971,7 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 	inputMessage["signtype"] = ""                                                               // 签名类型
 	inputMessage["infver"] = "V1.1"                                                             // 接收方系统代码
 	inputMessage["opter_type"] = "1"                                                            // 经办人类别
-	inputMessage["opter"] = "mockuser"                                                          // 经办人
+	inputMessage["opter"] = doctor                                                              // 经办人
 	inputMessage["opter_name"] = doctor                                                         // 经办人姓名
 	inputMessage["inf_time"] = timeFormatOne                                                    // 交易时间
 	inputMessage["fixmedins_code"] = fixmedins_code                                             // 定点医药机构编号
@@ -980,57 +980,57 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 	return inputMessage
 }
 
-func Gdyb1201(psnNo string, org_name string, doctor string) string {
-	// 生成签名
-	nonce := GetRandomString(32)
-	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce)
-
-	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "")
-	input := make(map[string]interface{})
-	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "1201"         // 交易编码
-	inputData["fixmedins_type"] = psnNo    // 人员编号 （来自1101接口返回）
-	inputData["fixmedins_name"] = org_name // 人员编号 （来自1101接口返回）
-	inputData["fixmedins_code"] = ""       // 人员编号 （来自1101接口返回）
-
-	input["medinsinfo"] = inputData
-	inputMessage["input"] = input //交易输入
-
-	bytesData, err := json.Marshal(inputMessage)
-	fmt.Println(string(bytesData))
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	reader := bytes.NewReader(bytesData)
-
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1201"
-	request, err := http.NewRequest("POST", url, reader)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-
-	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "test_hosp")
-	request.Header.Set("x-tif-signature", signature)
-	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
-	request.Header.Set("x-tif-nonce", nonce)
-
-	client := http.Client{}
-	resp, err := client.Do(request)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	respBytes, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	str := string(respBytes)
-	fmt.Println(str)
-	return str
-}
+//func Gdyb1201(psnNo string, org_name string, doctor string) string {
+//	// 生成签名
+//	nonce := GetRandomString(32)
+//	timestamp := time.Now().Unix()
+//	signature := setSignature(timestamp, nonce)
+//
+//	// 生成输入报文
+//	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "")
+//	input := make(map[string]interface{})
+//	inputData := make(map[string]interface{})
+//	inputMessage["infno"] = "1201"         // 交易编码
+//	inputData["fixmedins_type"] = psnNo    // 人员编号 （来自1101接口返回）
+//	inputData["fixmedins_name"] = org_name // 人员编号 （来自1101接口返回）
+//	inputData["fixmedins_code"] = ""       // 人员编号 （来自1101接口返回）
+//
+//	input["medinsinfo"] = inputData
+//	inputMessage["input"] = input //交易输入
+//
+//	bytesData, err := json.Marshal(inputMessage)
+//	fmt.Println(string(bytesData))
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	reader := bytes.NewReader(bytesData)
+//
+//	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1201"
+//	request, err := http.NewRequest("POST", url, reader)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//
+//	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+//	request.Header.Set("x-tif-paasid", "test_hosp")
+//	request.Header.Set("x-tif-signature", signature)
+//	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+//	request.Header.Set("x-tif-nonce", nonce)
+//
+//	client := http.Client{}
+//	resp, err := client.Do(request)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	respBytes, err := ioutil.ReadAll(resp.Body)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	str := string(respBytes)
+//	fmt.Println(str)
+//	return str
+//}