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 = 10188
 
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -6322,7 +6322,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 				} else if miConfig.MdtrtareaAdmvs == "350500" {
 
-					result, request_log, _ := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+					result, request_log, _ := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, sickConfig.CountryCode)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(result), &dat); err == nil {
 						fmt.Println(dat)
@@ -8315,7 +8315,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 			} else if miConfig.MdtrtareaAdmvs == "350500" {
 
-				result, request_log, _ := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+				result, request_log, _ := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, sickConfig.CountryCode)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result), &dat); err == nil {
 					fmt.Println(dat)
@@ -9854,6 +9854,18 @@ func (c *HisApiController) GetCheckAccount() {
 			infocode, _ := strconv.ParseInt(res10188.Infcode, 10, 64)
 			res.Infcode = infocode
 
+		} else if miConfig.MdtrtareaAdmvs == "350500" {
+			var baseParams models.BaseParams
+			baseParams.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+			baseParams.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+			baseParams.SecretKey = miConfig.SecretKey
+			baseParams.OrgName = miConfig.OrgName
+			baseParams.EncKey = miConfig.EncKey
+			baseParams.AppSecret = miConfig.AppSecret
+			baseParams.SignKey = miConfig.SignKey
+
+			service.FJyb3201(baseParams)
+
 		} else {
 			api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
 				"insutype=" + insutype +

main.go

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

models/his_models.go

@@ -1009,6 +1009,10 @@ type BaseParams struct {
 	RequestUrl     string
 	AccessKey      string
 	Cainfo         string
+	AppID          string
+	AppSecret      string
+	SignKey        string
+	EncKey         string
 }
 
 type BusinessParams struct {

service/fj_service.go

@@ -248,7 +248,7 @@ func FJyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 }
 
 //  门诊费用明细信息上传
-func FJyb2204(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, balance_accounts_type string, opter string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
+func FJyb2204(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, balance_accounts_type string, opter string, url string, app_id string, app_secret string, sign_key string, enc_key string, dise_code string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -354,7 +354,7 @@ func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["mdtrt_id"] = mdtrtId                          // 就诊 ID（来自2201接口返回）
 		feedetailInfo["psn_no"] = psnNo                              // 人员编号 （来自1101接口返回）
 		feedetailInfo["chrg_bchno"] = chrg_bchno                     // 收费批次号
-		feedetailInfo["dise_codg"] = ""                              // 病种编码
+		feedetailInfo["dise_codg"] = dise_code                       // 病种编码
 		feedetailInfo["rxno"] = ""                                   // 处方号
 		feedetailInfo["rx_circ_flag"] = "0"                          // 外购处方标志
 		feedetailInfo["fee_ocur_time"] = item.FeeOcurTime            // 费用发生时间

service/jsyb_service.go

@@ -300,7 +300,7 @@ func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 	inputData["dept_code"] = dept_code   // 科室编码
 	inputData["dept_name"] = dept        // 科室名称
 	inputData["caty"] = "A03.06"         // 科别
-	inputData["expContent"] = ""         //
+	inputData["exp_content"] = ""        //
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -332,7 +332,7 @@ func Jsyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	inputData["mdtrt_id"] = mdtrtId      // 就诊 ID（来自2201接口返回）
 	inputData["ipt_otp_no"] = ipt_otp_no // 住院/门诊号
 	//inputData["exp_content"] = ""        // 人员编号 （来自1101接口返回）
-	inputData["expContent"] = "" //
+	inputData["exp_content"] = "" //
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -393,7 +393,7 @@ func Jsyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		diseinfo = append(diseinfo, diseinfo_sun)
 	}
 	//inputData["exp_content"] = "" // 人员编号 （来自1101接口返回）
-	inputData["expContent"] = "" //
+	inputData["exp_content"] = "" //
 
 	input["diseinfo"] = diseinfo
 	input["mdtrtinfo"] = inputData
@@ -644,7 +644,7 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["matn_fee_flag"] = ""    // 生育费用标志
 		subfeedetailInfo["tcmherb_prov_code"] = item.ProvinceDrugMedListCodg
 		subfeedetailInfo["mcs_prov_code"] = item.ProvinceGoodMedListCodg
-		feedetailInfo["expContent"] = subfeedetailInfo
+		feedetailInfo["exp_content"] = subfeedetailInfo
 		feedetail = append(feedetail, feedetailInfo)
 	}
 
@@ -680,8 +680,8 @@ func Jsyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	inputData["mdtrt_id"] = mdtrtId  // 就诊 ID（来自2201接口返回）
 	inputData["chrg_bchno"] = "0000" // 收费批次号(来自2204生成的)
 
-	inputData["psn_no"] = psnNo  // 人员编号 （来自1101接口返回）
-	inputData["expContent"] = "" // 人员编号 （来自1101接口返回）
+	inputData["psn_no"] = psnNo   // 人员编号 （来自1101接口返回）
+	inputData["exp_content"] = "" // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -746,7 +746,7 @@ func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["acct_used_flag"] = "0"   // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype    // 险种类型
 	inputData["invono"] = ""            // 发票号
-	inputData["expContent"] = ""        // 人员编号 （来自1101接口返回）
+	inputData["exp_content"] = ""       // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -820,7 +820,7 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //
 	inputData["preselfpay_amt"] = preselfpay_amt       //
 	inputData["inscp_scp_amt"] = inscp_scp_amt         //
-	inputData["expContent"] = ""                       // 人员编号 （来自1101接口返回）
+	inputData["exp_content"] = ""                      // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -911,7 +911,7 @@ func Jsyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	inputData["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
 	inputData["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
 	inputData["setl_id"] = setlId   // 结算 ID
-	inputData["expContent"] = ""    // 人员编号 （来自1101接口返回）
+	inputData["exp_content"] = ""   // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入