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

controllers/sg/his_api_controller.go

@@ -2617,6 +2617,12 @@ func (c *HisApiController) GetUploadInfo() {
 						var res ResultSeven
 						var src_resquest string
 						var result2 string
+						var acct_used_flag string
+						if pay_way == 5 {
+							acct_used_flag = "1"
+						} else {
+							acct_used_flag = "0"
+						}
 						if miConfig.MdtrtareaAdmvs == "421300" {
 
 							api := "http://192.168.124.4:9532/" + "hbyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
@@ -2625,7 +2631,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10)
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -2656,7 +2662,7 @@ func (c *HisApiController) GetUploadInfo() {
 							}
 
 						} else {
-							result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType)
+							result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, acct_used_flag)
 							var dat map[string]interface{}
 							if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 								fmt.Println(dat)
@@ -2859,6 +2865,13 @@ func (c *HisApiController) GetUploadInfo() {
 			var res ResultSeven
 			var src_resquest string
 			var result2 string
+			var acct_used_flag string
+
+			if pay_way == 5 {
+				acct_used_flag = "1"
+			} else {
+				acct_used_flag = "0"
+			}
 
 			if miConfig.MdtrtareaAdmvs == "421300" {
 				api := "http://192.168.124.4:9532/" + "hbyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
@@ -2867,7 +2880,7 @@ func (c *HisApiController) GetUploadInfo() {
 					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10)
+					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag
 
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
@@ -2900,7 +2913,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 			} else {
 
-				result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType)
+				result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 					fmt.Println(dat)
@@ -4056,7 +4069,12 @@ func (c *HisApiController) GetPreUploadInfo() {
 						order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
 						order.SetlTime = res.Output.Setlinfo.SetlTime
 						order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
-						order.MedType = res.Output.Setlinfo.MedType
+						if res.Output.Setlinfo.MedType == "140101" {
+							order.MedType = "14"
+
+						} else {
+							order.MedType = res.Output.Setlinfo.MedType
+						}
 						order.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
 						order.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
 						order.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay

main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
+	"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -14,7 +15,7 @@ import (
 )
 
 func init() {
-	//service.ConnectDB()
+	service.ConnectDB()
 	//org_id, _ := beego.AppConfig.Int64("org_id")
 	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
 	//CreateLog(miConfig)

service/gdyb_service.go

@@ -1198,7 +1198,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, certificates int64) (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, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1232,13 +1232,13 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	} else {
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
 	}
-	inputData["medfee_sumamt"] = total  // 医疗费总额
-	inputData["psn_setlway"] = "01"     // 个人结算方式 01 按项目结 02 按定额结算
-	inputData["mdtrt_id"] = mdtrtId     // 就诊 ID（来自2201接口返回）
-	inputData["chrg_bchno"] = chrgBchno // 收费批次号(来自2204生成的)
-	inputData["acct_used_flag"] = "0"   // 个人账户使用标志 0否 1是
-	inputData["insutype"] = insutype    // 险种类型
-	inputData["invono"] = ""            // 发票号
+	inputData["medfee_sumamt"] = total           // 医疗费总额
+	inputData["psn_setlway"] = "01"              // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId              // 就诊 ID（来自2201接口返回）
+	inputData["chrg_bchno"] = chrgBchno          // 收费批次号(来自2204生成的)
+	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype             // 险种类型
+	inputData["invono"] = ""                     // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //