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

conf/app.conf

 
 
 [prod]
-org_id = 10106
+org_id = 10188
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/nm/nm_controller.go

 	secret_key := c.GetString("secret_key")
 	org_name := c.GetString("org_name")
 	fapiao_number := c.GetString("fapiao_number")
+	acct_used_flag := c.GetString("acct_used_flag")
 
-	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, fapiao_number)
+	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, fapiao_number, acct_used_flag)
 	saveJsLog(result, src_resquest, "2304", "住院结算", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(src_resquest), &dat2); err == nil {

controllers/sg/his_api_controller.go

 		})
 		return
 	} else {
-		if res.Output.Result.CheckStat == "0" {
+		if res.Output.Result.SscnoCheckStat == "0" {
 			var msg string
 			switch res.Output.Result.CardStat {
 			case "00":
 	Infcode     int64  `json:"infcode"`
 	Output      struct {
 		Result struct {
-			PsnNo     string `json:"psn_no"`
-			CardStat  string `json:"card_stat"`
-			Certno    string `json:"certno"`
-			PsnName   string `json:"psn_name"`
-			CheckStat string `json:"check_stat"`
+			PsnNo          string `json:"psn_no"`
+			CardStat       string `json:"card_stat"`
+			Certno         string `json:"certno"`
+			PsnName        string `json:"psn_name"`
+			CheckStat      string `json:"check_stat"`
+			SscnoCheckStat string `json:"sscno_check_stat"`
 		} `json:"result"`
 	} `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`

controllers/zh/zh_his_api_controller.go

 		} else {
 			mdtrt_cert_no = record.Certno
 		}
+		var acct_used_flag string
+		if pay_way == 5 {
+			acct_used_flag = "1"
+		} else {
+			acct_used_flag = "0"
+		}
+
 		//请求内网数据
 		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=" + record.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=" + mdtrt_cert_no + "&fapiao_number=" + fapiao_number
+			"&insuplc_admdvs=" + record.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=" + mdtrt_cert_no + "&fapiao_number=" + fapiao_number + "&acct_used_flag=" + acct_used_flag
 		resp, requestErr := http.Get(api)
 		if requestErr != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 
 	} 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, "")
+		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, "", "1")
 		saveLog(result, src_resquest, "2304", "住院结算")
 	}
 

main.go

 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	"gdyb/service"
+	//"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
 )
 
 func init() {
-	service.ConnectDB()
-	org_id, _ := beego.AppConfig.Int64("org_id")
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	CreateLog(miConfig)
-	UploadLog(miConfig)
+	//service.ConnectDB()
+	//org_id, _ := beego.AppConfig.Int64("org_id")
+	//
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	//CreateLog(miConfig)
+	//UploadLog(miConfig)
 
 	//UploadSettleList(org_id)
 }

service/jsyb_service.go

 	patientDtosinputData["fsi_encounter_dtos"] = fisEncounterDtosData
 	inputData["syscode"] = "LinkDialysis"
 	inputData["trig_scen"] = trig_scen
+	inputData["rule_ids"] = ""
+
 	inputData["patient_dtos"] = patientDtosinputData
 	input["data"] = inputData
 	inputMessage["infno"] = "3101"

service/zh_his_service.go

 }
 
 //  住院结算
-func ZHGdyb2304(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, mid_setl_flag string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, fapiao_number string) (string, string) {
+func ZHGdyb2304(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, mid_setl_flag string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, fapiao_number string, acct_used_flag string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 		}
 	}
 	inputData["mdtrt_cert_sn"] = ""
-	inputData["mid_setl_flag"] = mid_setl_flag // 中途退费标志
-	inputData["medfee_sumamt"] = total         // 医疗费总额
-	inputData["psn_setlway"] = "01"            // 个人结算方式 01 按项目结 02 按定额结算
-	inputData["mdtrt_id"] = mdtrtId            // 就诊 ID（来自2201接口返回）
-	inputData["acct_used_flag"] = "1"          // 个人账户使用标志 0否 1是
-	inputData["insutype"] = insutype           // 险种类型
-	inputData["invono"] = fapiao_number        // 发票号
+	inputData["mid_setl_flag"] = mid_setl_flag   // 中途退费标志
+	inputData["medfee_sumamt"] = total           // 医疗费总额
+	inputData["psn_setlway"] = "01"              // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId              // 就诊 ID（来自2201接口返回）
+	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype             // 险种类型
+	inputData["invono"] = fapiao_number          // 发票号
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入