Browse Source

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

陈少旭 3 weeks ago
parent
commit
d492c9ecf4
2 changed files with 10 additions and 2 deletions
  1. 8 0
      controllers/sg/his_api_controller.go
  2. 2 2
      service/hbyb_service.go

+ 8 - 0
controllers/sg/his_api_controller.go View File

27085
 						}
27085
 						}
27086
 
27086
 
27087
 						for _, item := range rf {
27087
 						for _, item := range rf {
27088
+
27089
+							utils.ErrorLog("解析失败:%v", item.Insutype)
27090
+							utils.ErrorLog("解析失败:%v", insutype)
27091
+
27092
+
27088
 							if item.Insutype == insutype {
27093
 							if item.Insutype == insutype {
27089
 								insuplc_admdvs_temp = item.InsuplcAdmdvs
27094
 								insuplc_admdvs_temp = item.InsuplcAdmdvs
27095
+								utils.ErrorLog("解析失败:%v", insuplc_admdvs_temp)
27096
+
27090
 							}
27097
 							}
27091
 
27098
 
27092
 						}
27099
 						}
27093
 
27100
 
27101
+
27094
 						result, requestLog = service.Gdyb2201A(psn_info.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time_two, psn_info.VerifyNumber, admin_user_id)
27102
 						result, requestLog = service.Gdyb2201A(psn_info.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time_two, psn_info.VerifyNumber, admin_user_id)
27095
 						saveLog(result, requestLog, "2201A", "挂号")
27103
 						saveLog(result, requestLog, "2201A", "挂号")
27096
 					}
27104
 					}

+ 2 - 2
service/hbyb_service.go View File

1093
 		inputData := make(map[string]interface{})
1093
 		inputData := make(map[string]interface{})
1094
 		inputData["insutype"] = ""                        // 险种
1094
 		inputData["insutype"] = ""                        // 险种
1095
 		inputData["clr_type"] = ""                        // 就诊 ID(来自2201接口返回)
1095
 		inputData["clr_type"] = ""                        // 就诊 ID(来自2201接口返回)
1096
-		inputData["setl_optins"] = "420922"                     // 结算经办机构
1096
+		inputData["setl_optins"] = ""                     // 结算经办机构
1097
 		inputData["stmt_begndate"] = item.StmtBegndate    // 对帐开始时间
1097
 		inputData["stmt_begndate"] = item.StmtBegndate    // 对帐开始时间
1098
 		inputData["stmt_enddate"] = item.StmtEnddate      //对帐结束时间
1098
 		inputData["stmt_enddate"] = item.StmtEnddate      //对帐结束时间
1099
 		inputData["fund_pay_sumamt"] = item.FundPaySumamt //基金支付总额
1099
 		inputData["fund_pay_sumamt"] = item.FundPaySumamt //基金支付总额
1100
 		inputData["acct_pay"] = item.AcctPay              //个人账户支付金额
1100
 		inputData["acct_pay"] = item.AcctPay              //个人账户支付金额
1101
-		inputData["med_type"] = "14"                        //个人账户支付金额
1101
+		inputData["med_type"] = ""                        //个人账户支付金额
1102
 		inputDatas = append(inputDatas, inputData)
1102
 		inputDatas = append(inputDatas, inputData)
1103
 	}
1103
 	}
1104
 	input["clrdata"] = inputDatas
1104
 	input["clrdata"] = inputDatas