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

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9532
 runmode = prod
 
 #
@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9990
+org_id = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,7 +53,8 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 url = "http://192.168.1.88:6666/szsi-portal/transData"
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-gdyb_paasid = "sg03_prd"
+#gdyb_paasid = "sg03_prd"
+gdyb_paasid = "jm_sc_yjyy"
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/sg/gdyb_controller.go

@@ -24,7 +24,7 @@ func GdybRegistRouters() {
 	beego.Router("/gdyb/six", &GdybController{}, "get:PostSix")
 	beego.Router("/gdyb/seven", &GdybController{}, "get:PostSeven")
 	beego.Router("/gdyb/eight", &GdybController{}, "get:PostEight")
-	beego.Router("/gdyb/nine", &GdybController{}, "get:PostNine")
+	//beego.Router("/gdyb/nine", &GdybController{}, "get:PostNine")
 	beego.Router("/gdyb/ten", &GdybController{}, "get:PostTen")
 	beego.Router("/gdyb/eleven", &GdybController{}, "get:PostEleven")
 	beego.Router("/gdyb/twelve", &GdybController{}, "get:PostTwelve")
@@ -71,19 +71,19 @@ func (c *GdybController) PostOne() {
 	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")
 	id_card_type, _ := c.GetInt64("id_card_type")
 	card_sn := c.GetString("card_sn")
+	certificates := c.GetString("certificates")
 
-	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn)
-
+	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificates)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
 	} else {
+
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -134,10 +134,13 @@ func (c *GdybController) PostThree() {
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
 	fixmedins_code := c.GetString("fixmedins_code")
-
 	result := service.Gdyb2202(psnNo, mdtrtId, iptOtpNo, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": result,
+		"pre": dat,
 	})
 }
 
@@ -323,7 +326,7 @@ func (c *GdybController) PostEight() {
 	preselfpay_amt, _ := c.GetFloat("preselfpay_amt")
 	inscp_scp_amt, _ := c.GetFloat("inscp_scp_amt")
 
-	result := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt)
+	result, srcRequest := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, 1)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -331,33 +334,33 @@ func (c *GdybController) PostEight() {
 		fmt.Println(err)
 	}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": dat,
-	})
-}
-
-func (c *GdybController) PostNine() {
-	psnNo := c.GetString("psn_no")
-	mdtrtId := c.GetString("mdtrt_id")
-	setlId := c.GetString("setl_id")
-	org_name := c.GetString("org_name")
-	doctor := c.GetString("doctor")
-	secret_key := c.GetString("secret_key")
-	fixmedins_code := c.GetString("fixmedins_code")
-	insuplc_admdvs := c.GetString("insuplc_admdvs")
-	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-	result := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-		fmt.Println(dat)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(srcRequest), &dat2); err == nil {
+		fmt.Println(dat2)
 	} else {
 		fmt.Println(err)
 	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": dat,
+		"pre":  dat,
+		"pre2": dat2,
 	})
 }
 
+//func (c *GdybController) PostNine() {
+//	psnNo := c.GetString("psn_no")
+//	mdtrtId := c.GetString("mdtrt_id")
+//	setlId := c.GetString("setl_id")
+//	org_name := c.GetString("org_name")
+//	doctor := c.GetString("doctor")
+//	secret_key := c.GetString("secret_key")
+//	fixmedins_code := c.GetString("fixmedins_code")
+//	insuplc_admdvs := c.GetString("insuplc_admdvs")
+//	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+//	//result, src_request := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+//
+//}
+
 func (c *GdybController) PostTen() {
 	fmt.Println("11222333-----")
 

controllers/sz/sz_his_api_controller.go

@@ -1004,6 +1004,10 @@ func (c *SZHisApiController) GetRegisterInfo() {
 							PatientInfo:            result001,
 						}
 						service.CreateHisPatientTwo(&his)
+						lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
+						if len(lists) == 1 {
+							service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
+						}
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg": "挂号成功",
 						})
@@ -1072,6 +1076,10 @@ func (c *SZHisApiController) GetRegisterInfo() {
 							PatientInfo:            result001,
 						}
 						service.CreateHisPatientTwo(&his)
+						lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
+						if len(lists) == 1 {
+							service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
+						}
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg": "挂号成功",
 						})
@@ -1139,6 +1147,10 @@ func (c *SZHisApiController) GetRegisterInfo() {
 							PatientInfo:            result001,
 						}
 						service.CreateHisPatientTwo(&his)
+						lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
+						if len(lists) == 1 {
+							service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
+						}
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg": "挂号成功",
 						})
@@ -1202,6 +1214,10 @@ func (c *SZHisApiController) GetRegisterInfo() {
 							PatientInfo:            result001,
 						}
 						service.CreateHisPatientTwo(&his)
+						lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
+						if len(lists) == 1 {
+							service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
+						}
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg": "挂号成功",
 						})
@@ -2108,6 +2124,7 @@ func (c *SZHisApiController) RefundNumber() {
 
 //上传明细----结算----确认订单
 func (c *SZHisApiController) GetSettleInfo() {
+
 	pay_way, _ := c.GetInt64("pay_way")
 	pay_price, _ := c.GetFloat("pay_price")
 	pay_card_no := c.GetString("pay_card_no")
@@ -2121,6 +2138,9 @@ func (c *SZHisApiController) GetSettleInfo() {
 	patient_id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
@@ -2192,7 +2212,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 	adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
 
 	adminRole, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	his, err := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	his, err := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 	mz_number := his.Number
 	number := miConfig.Code + year + month + day +
 		fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
@@ -2388,6 +2408,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 			Creator:             admin_user_id,
 			Modify:              admin_user_id,
 			OrgSetlNumber:       number,
+			MdtrtId:             mz_number,
 		}
 		data, _ := json.Marshal(ress)
 		order.DetailLog = string(data)

main.go

@@ -12,6 +12,7 @@ func init() {
 }
 
 func main() {
+
 	beego.Run()
 
 }

models/his_models.go

@@ -675,6 +675,9 @@ type HisOrder struct {
 	RefundLog string `gorm:"column:refund_log" json:"refund_log" form:"refund_log"`
 	DetailLog string `gorm:"column:detail_log" json:"detail_log" form:"detail_log"`
 
+	RequestLog       string `gorm:"column:request_log" json:"request_log" form:"request_log"`
+	RefundRequestLog string `gorm:"column:refund_request_log" json:"refund_request_log" form:"refund_request_log"`
+
 	HisOrderInfo        HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient          HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`

routers/router.go

@@ -1,7 +1,8 @@
 package routers
 
 import (
-	"gdyb/controllers/sz"
+	"gdyb/controllers/sg"
+	//"gdyb/controllers/sz"
 
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
@@ -21,8 +22,8 @@ func init() {
 		AllowCredentials: true,
 	}))
 
-	//sg.HisManagerApiRegistRouters()
-	//sg.GdybRegistRouters()
-	sz.SZHisManagerApiRegistRouters()
+	sg.HisManagerApiRegistRouters()
+	sg.GdybRegistRouters()
+	//sz.SZHisManagerApiRegistRouters()
 
 }

service/gdyb_service.go

@@ -87,7 +87,7 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 }
 
 // 人员基本信息
-func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string) string {
+func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string) string {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -98,16 +98,26 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "1101" // 交易编码
 
-	if id_card_type == 1 {
-		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
-		inputData["card_sn"] = card_sn      // 卡识别码
+	if certificates == "3" {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
 		inputData["certno"] = certNo        // 证件号码
+		inputData["psn_cert_type"] = "99"   // 人员证件类型
+
 	} else {
-		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
-		inputData["card_sn"] = ""           // 卡识别码
-		inputData["certno"] = certNo        // 证件号码
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["card_sn"] = card_sn      // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "1"    // 人员证件类型
+
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "1"    // 人员证件类型
+		}
 	}
-	inputData["psn_cert_type"] = "1"    // 人员证件类型
+
 	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	inputData["begntime"] = ""          // 开始时间
 	inputData["psn_name"] = ""          // 人员姓名
@@ -919,7 +929,7 @@ 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, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64) 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, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -930,15 +940,18 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2207" // 交易编码
-
-	inputData["psn_no"] = psnNo // 人员编号 （来自1101接口返回）
-
-	if id_card_type == 1 {
-		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	} else {
-		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		}
 	}
 
 	inputData["med_type"] = med_type    // 医疗类别 11 普通门诊  12 门诊挂号
@@ -962,7 +975,7 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 	gdyb_url := beego.AppConfig.String("gdyb_url")
@@ -978,7 +991,7 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -991,20 +1004,23 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	mjson, _ := json.Marshal(inputMessage)
+	str2 := string(mjson)
+
+	return str, str2
 }
 
 //  门诊结算撤销
-func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
+func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1027,7 +1043,7 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 	gdyb_url := beego.AppConfig.String("gdyb_url")
@@ -1043,7 +1059,7 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -1056,16 +1072,18 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	mjson, _ := json.Marshal(inputMessage)
+	str2 := string(mjson)
+	return str, str2
 }
 
 //确认订单
@@ -1175,13 +1193,14 @@ func Gdyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputMessage["infno"] = "3201"                                    // 交易编码
 	inputData["insutype"] = businessParams.Insutype                   // 险种
 	inputData["clr_type"] = businessParams.ClrType                    // 就诊 ID（来自2201接口返回）
-	inputData["setl_optins"] = "定点医保中心"                               // 结算经办机构
+	inputData["setl_optins"] = "440229"                               // 结算经办机构
 	inputData["stmt_begndate"] = businessParams.StmtBegndate          // 对帐开始时间
 	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间
 	inputData["medfee_sumamt"] = businessParams.MedfeeSumamt          //医疗费总额
 	inputData["fund_pay_sumamt"] = businessParams.FundPaySumamt       //基金支付总额
 	inputData["acct_pay"] = businessParams.AcctPay                    //个人账户支付金额
 	inputData["fixmedins_setl_cnt"] = businessParams.FixmedinsSetlCnt //定点医药机构结算笔数
+	inputData["refd_setl_flag"] = 0                                   // 就诊 ID（来自2201接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -1254,7 +1273,7 @@ func Gdyb9101(baseParams models.BaseParams, file_name string, file_byte []byte)
 
 	inputMessage["infno"] = "9101"                         // 交易编码
 	inputData["file_name"] = file_name                     //文件名
-	inputData["in"] = bytes.NewBuffer(file_byte).Bytes()   //文件数据
+	inputData["in"] = file_byte                            //文件数据
 	inputData["fixmedins_code"] = baseParams.FixmedinsCode //编码
 
 	input["fsUploadIn"] = inputData
@@ -1313,9 +1332,10 @@ func Gdyb9102(baseParams models.BaseParams, file_name string, file_qury_no strin
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "9102"                         // 交易编码
-	inputData["file_name"] = file_name                     //文件名
-	inputData["file_qury_no"] = file_qury_no               //文件数据
+	inputMessage["infno"] = "9102"           // 交易编码
+	inputData["file_name"] = file_name       //文件名
+	inputData["file_qury_no"] = file_qury_no //文件数据
+
 	inputData["fixmedins_code"] = baseParams.FixmedinsCode //编码
 	input["fsDownloadIn"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -1375,15 +1395,17 @@ func Gdyb3202(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3202"                                              // 交易编码
-	inputData["file_qury_no"] = "fsi/H44022900158/" + businessParams.FileQuryNo // 险种
-	inputData["setl_optins"] = "定点医保中心"                                         // 结算经办机构
-	inputData["stmt_begndate"] = businessParams.StmtBegndate                    // 对帐开始时间
-	inputData["stmt_enddate"] = businessParams.StmtEnddate                      //对帐结束时间
-	inputData["medfee_sumamt"] = businessParams.MedfeeSumamt                    //医疗费总额
-	inputData["fund_pay_sumamt"] = businessParams.FundPaySumamt                 //基金支付总额
-	inputData["cash_payamt"] = businessParams.CashPayamt                        //现金支付金额
-	inputData["fixmedins_setl_cnt"] = businessParams.FixmedinsSetlCnt           //定点医药机构结算笔数
+	inputMessage["infno"] = "3202"                                    // 交易编码
+	inputData["file_qury_no"] = businessParams.FileQuryNo             // 险种
+	inputData["setl_optins"] = "440229"                               // 结算经办机构
+	inputData["stmt_begndate"] = businessParams.StmtBegndate          // 对帐开始时间
+	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间
+	inputData["medfee_sumamt"] = businessParams.MedfeeSumamt          //医疗费总额
+	inputData["fund_pay_sumamt"] = businessParams.FundPaySumamt       //基金支付总额
+	inputData["cash_payamt"] = businessParams.CashPayamt              //现金支付金额
+	inputData["fixmedins_setl_cnt"] = businessParams.FixmedinsSetlCnt //定点医药机构结算笔数
+	inputData["clr_type"] = "11"                                      // 就诊 ID（来自2201接口返回）
+	inputData["refd_setl_flag"] = 1                                   // 就诊 ID（来自2201接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -1625,12 +1647,10 @@ func Gdyb3302(baseParams *models.BaseParams, name string, codg string, list_type
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3302" // 交易编码
+	inputData["fixmedins_code"] = baseParams.FixmedinsCode
 	inputData["fixmedins_hilist_id"] = codg
-	inputData["fixmedins_hilist_name"] = name
 	inputData["list_type"] = list_type_code
 	inputData["med_list_codg"] = codg
-	inputData["begndate"] = "2021-01-01"
-	inputData["enddate"] = "2099-01-07"
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -2531,3 +2551,57 @@ func GetPatientsByIds(ids []string, current_org_id int64) (patients []*models.Pa
 	err = readDb.Model(&models.Patients{}).Where("id IN (?) AND user_org_id = ?", ids, current_org_id).Find(&patients).Error
 	return
 }
+
+func Gdyb2601(psnNo string, omsgid string, oinfno 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, secret_key)
+
+	// 生成输入报文
+	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"] = "2601" // 交易编码
+	inputData["psn_no"] = psnNo
+	inputData["omsgid"] = omsgid
+	inputData["oinfno"] = oinfno
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	url := gdyb_url + "2601"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}

service/his_service.go

@@ -190,6 +190,11 @@ func GetHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info
 	return
 }
 
+func GetNewHisPatientInfo(org_id int64, id int64, record_date int64) (info models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND id = ?", org_id, record_date, id).First(&info).Error
+	return
+}
+
 func GetXTPatientInfo(org_id int64, patient_id int64) (info models.Patients, err error) {
 	err = readDb.Model(&models.Patients{}).Where("user_org_id = ? AND status = 1  AND id = ?", org_id, patient_id).First(&info).Error
 	return
@@ -456,6 +461,16 @@ func GetVMHisPatientInfo(org_id int64, patient_id int64, record_date int64) (inf
 	return
 }
 
+func GetNewVMHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info models.VMHisPatient, err error) {
+	err = readDb.Model(&models.VMHisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND id = ?", org_id, record_date, patient_id).First(&info).Error
+	return
+}
+
+func GetHisPatientRecord(org_id int64, id int64) (info models.VMHisPatient, err error) {
+	err = readDb.Model(&models.VMHisPatient{}).Where("user_org_id = ? AND status = 1 AND id = ?", org_id, id).First(&info).Error
+	return
+}
+
 func CreateOrder(order *models.HisOrder) (err error) {
 	err = writeDb.Create(&order).Error
 	return
@@ -660,8 +675,8 @@ func GetMedicalInsuranceConfig(org_id int64) (medicalInsuranceConfig models.Medi
 
 }
 
-func UpdataOrderStatus(id int64, number string, user_org_id int64) (err error) {
-	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix()}).Error
+func UpdataOrderStatus(id int64, number string, user_org_id int64, log string, result string) (err error) {
+	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix(), "refund_request_log": log, "refund_log": result}).Error
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
 	return
@@ -672,6 +687,11 @@ func UpdataRegStatus(patient_id int64, record_time int64, org_id int64) {
 	writeDb.Model(&models.HisPatient{}).Where("patient_id = ? AND status = 1 AND record_date =? AND user_org_id = ?", patient_id, record_time, org_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
 
 }
+
+func UpdataRegStatus2(id int64) error {
+	err := writeDb.Model(&models.HisPatient{}).Where("id = ?", id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return err
+}
 func GetAdminUserInfoByID(org_id int64, admin_user_id int64) (role models.UserAdminRole, err error) {
 	err = readUserDb.Model(&models.UserAdminRole{}).Where("org_id = ? AND status = 1 AND admin_user_id = ?", org_id, admin_user_id).First(&role).Error
 	return
@@ -1104,3 +1124,13 @@ func GetAllPatient(org_id int64) (patients []*models.Patients, err error) {
 	err = readDb.Model(&models.Patients{}).Where("user_org_id = ? AND status = 1 AND lapseto = 1", org_id).Find(&patients).Error
 	return
 }
+
+func UpdateHisPrescriptionHisID(his_patient_id int64, patient_id int64, record_time int64, org_id int64) {
+	XTWriteDB().Model(&models.HisPrescription{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ?", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
+	return
+}
+
+func GetHisPatientInfoList(org_id int64, patient_id int64, record_date int64) (info []*models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).Find(&info).Error
+	return
+}