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

controllers/sg/his_api_controller.go

@@ -9753,8 +9753,8 @@ func (c *HisApiController) GetSettleAccounts() {
 
 		} else {
 			result := service.Gdyb5203(baseParams, businessParams)
-			service.Gdyb5204(baseParams, businessParams)
-			service.Gdyb5302(businessParams.PsnNo, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs, baseParams.SecretKey)
+			//service.Gdyb5204(baseParams, businessParams)
+			//service.Gdyb5302(businessParams.PsnNo, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs, baseParams.SecretKey)
 
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {

service/gdyb_service.go

@@ -1833,7 +1833,7 @@ 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"] = businessParams.SetlOptins              // 结算经办机构
+	inputData["setl_optins"] = "440311"                               // 结算经办机构
 	inputData["stmt_begndate"] = businessParams.StmtBegndate          // 对帐开始时间
 	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间
 	inputData["medfee_sumamt"] = businessParams.MedfeeSumamt          //医疗费总额