Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/gdyb_controller.go

@@ -328,6 +328,8 @@ func (c *GdybController) PostNine() {
 }
 
 func (c *GdybController) PostTen() {
+	fmt.Println("11222333-----")
+
 	insutype := c.GetString("insutype")
 	clrType := c.GetString("clr_type")
 	setlOptins := c.GetString("setl_optins")
@@ -344,6 +346,13 @@ func (c *GdybController) PostTen() {
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
 
+	fmt.Println(insutype)
+	fmt.Println(clrType)
+	fmt.Println(setlOptins)
+	fmt.Println(stmtBegndate)
+	fmt.Println(stmtEnddate)
+	fmt.Println(medfeeSumamt)
+
 	baseParams := models.BaseParams{
 		SecretKey:      secret_key,
 		FixmedinsCode:  fixmedins_code,
@@ -363,8 +372,14 @@ func (c *GdybController) PostTen() {
 		AcctPay:          acctPay,
 		FixmedinsSetlCnt: fixmedinsSetlCnt,
 	}
+	fmt.Println(baseParams)
+	fmt.Println(businessParams)
+
+	fmt.Println("11222333--33333---")
 
 	result := service.Gdyb3201(baseParams, businessParams)
+	fmt.Println("11222333--33333---555555")
+
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -377,6 +392,8 @@ func (c *GdybController) PostTen() {
 }
 
 func (c *GdybController) PostEleven() {
+	fmt.Println("777777666666-----")
+
 	file_byte := c.GetString("file_byte")
 	file_name := c.GetString("file_name")
 	fixmedins_code := c.GetString("fixmedins_code")

controllers/his_api_controller.go

@@ -1621,7 +1621,7 @@ func (c *HisApiController) GetUploadInfo() {
 	data["chrg_bchno"] = chrg_bchno
 	data["org_name"] = miConfig.OrgName
 	data["doctor"] = patientPrescription.Doctor
-	data["doctor_id"] = patientPrescription.DoctorId
+	data["doctor_id"] = strconv.FormatInt(patientPrescription.DoctorId, 10)
 
 	data["dept"] = strconv.FormatInt(patientPrescription.Departments, 10)
 
@@ -1783,7 +1783,7 @@ func (c *HisApiController) GetUploadInfo() {
 					}
 				}
 			}
-			org, _ := service.GetOrgById(adminUser.CurrentOrgId)
+			//org, _ := service.GetOrgById(adminUser.CurrentOrgId)
 			patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, id, recordDateTime)
 			allTotal := fmt.Sprintf("%.2f", total)
 			if res.Infcode == 0 {
@@ -1794,9 +1794,9 @@ func (c *HisApiController) GetUploadInfo() {
 				chrg_bchno := chrg_bchno
 				cert_no := his.Certno
 				insutype := rf[0].Insutype
-				api := "http://127.0.0.1:9531/" + "gdyb/eight?cert_no=" + cert_no + "&insutype=" +
+				api := "http://127.0.0.1:9532/" + "gdyb/eight?cert_no=" + cert_no + "&insutype=" +
 					insutype + "&psn_no=" + psn_no + "&chrg_bchno=" + chrg_bchno + "&mdtrt_id=" + mdtrt_id +
-					"&total=" + allTotal + "&org_name=" + org.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+					"&total=" + allTotal + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 				resp, requestErr := http.Get(api)
 
 				if requestErr != nil {
@@ -2073,6 +2073,7 @@ func (c *HisApiController) Refund() {
 
 	adminUser := c.GetAdminUserInfo()
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+	fmt.Println(err)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -2086,7 +2087,7 @@ func (c *HisApiController) Refund() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
-		api := "http://127.0.0.1:9531/" + "gdyb/nine?psn_no=" + his.PsnNo +
+		api := "http://127.0.0.1:9532/" + "gdyb/nine?psn_no=" + his.PsnNo +
 			"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&setl_id=" + order.SetlId + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
 			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 		resp, requestErr := http.Get(api)
@@ -2111,7 +2112,7 @@ func (c *HisApiController) Refund() {
 		fmt.Println(respJSON)
 		fmt.Println(userJSONBytes)
 
-		api2 := "http://127.0.0.1:9531/" + "gdyb/six?psn_no=" + his.PsnNo +
+		api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + his.PsnNo +
 			"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
 			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 		resp2, requestErr2 := http.Get(api2)
@@ -2183,28 +2184,31 @@ func (c *HisApiController) GetCheckAccount() {
 	}
 
 	if config.IsOpen == 1 {
-		api := "http://127.0.0.1:9532/" + "gdyb/ten?insutype=" + insutype +
+		api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
+			"insutype=" + insutype +
 			"&clr_type=" + clr_type +
 			"&setl_optins=" + miConfig.OrgName +
 			"&stmt_begndate=" + start_time +
 			"&stm_enddate=" + end_time +
-			"&medfee_sumamt=" + fmt.Sprintf("%2f", medfee_sumamt) +
-			"&fund_pay_sumamt=" + fmt.Sprintf("%2f", fund_pay_sumamt) +
-			"&acct_pay=" + fmt.Sprintf("%2f", acct_pay) +
+			"&medfee_sumamt=" + fmt.Sprintf("%.2f", medfee_sumamt) +
+			"&fund_pay_sumamt=" + fmt.Sprintf("%.2f", fund_pay_sumamt) +
+			"&acct_pay=" + fmt.Sprintf("%.2f", acct_pay) +
 			"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
 			"&fixmedins_code=" + miConfig.Code +
 			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
 			"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 			"&secret_key=" + miConfig.SecretKey +
 			"&org_name=" + miConfig.OrgName +
-			"&doctor="
+			"&doctor=某人"
 
+		fmt.Println(api)
 		resp, requestErr := http.Get(api)
 		if requestErr != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
 		body, ioErr := ioutil.ReadAll(resp.Body)
+		fmt.Println(body)
 		if ioErr != nil {
 			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -2216,6 +2220,7 @@ func (c *HisApiController) GetCheckAccount() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
+
 		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 		userJSONBytes, _ := json.Marshal(respJSON)
 
@@ -2285,9 +2290,9 @@ func (c *HisApiController) GetCheckDetailAccount() {
 			str = item.SetlId + "	" +
 				item.MdtrtId + "	" +
 				item.PsnNo + "	" +
-				fmt.Sprintf("%2f", item.MedfeeSumamt) + "	" +
-				fmt.Sprintf("%2f", item.FundPaySumamt) + "	" +
-				fmt.Sprintf("%2f", item.AcctPay) + "	" + refd_setl_flag + "\n"
+				fmt.Sprintf("%.2f", item.MedfeeSumamt) + "	" +
+				fmt.Sprintf("%.2f", item.FundPaySumamt) + "	" +
+				fmt.Sprintf("%.2f", item.AcctPay) + "	" + refd_setl_flag + "\n"
 			_, err = f.Write([]byte(str))
 		}
 
@@ -2302,7 +2307,7 @@ func (c *HisApiController) GetCheckDetailAccount() {
 			"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 			"&secret_key=" + miConfig.SecretKey +
 			"&org_name=" + miConfig.OrgName +
-			"&doctor="
+			"&doctor=某人"
 
 		resp, requestErr := http.Get(api)
 		if requestErr != nil {
@@ -2337,9 +2342,9 @@ func (c *HisApiController) GetCheckDetailAccount() {
 				"&setl_optins=" + miConfig.OrgName +
 				"&stmt_begndate=" + start_time +
 				"&stm_enddate=" + end_time +
-				"&medfee_sumamt=" + fmt.Sprintf("%2f", medfee_sumamt) +
-				"&fund_pay_sumamt=" + fmt.Sprintf("%2f", fund_pay_sumamt) +
-				"&cash_payamt=" + fmt.Sprintf("%2f", psn_cash_pay) +
+				"&medfee_sumamt=" + fmt.Sprintf("%.2f", medfee_sumamt) +
+				"&fund_pay_sumamt=" + fmt.Sprintf("%.2f", fund_pay_sumamt) +
+				"&cash_payamt=" + fmt.Sprintf("%.2f", psn_cash_pay) +
 				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
 				"&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +

service/gdyb_service.go

@@ -622,7 +622,7 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 
 	inputData["psn_no"] = psnNo         // 人员编号 （来自1101接口返回）
 	inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
-	inputData["mdtrt_cert_no"] = ""     // 就诊凭证编号
+	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	inputData["med_type"] = "11"        // 医疗类别 11 普通门诊  12 门诊挂号
 	inputData["medfee_sumamt"] = total  // 医疗费总额
 	inputData["psn_setlway"] = "01"     // 个人结算方式 01 按项目结 02 按定额结算
@@ -731,6 +731,10 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 
 //  医药机构费用结算对总账 func Gdyb3201( org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
 func Gdyb3201(baseParams models.BaseParams, businessParams models.BusinessParams) string {
+	fmt.Println("11222333-----")
+
+	fmt.Println(baseParams)
+	fmt.Println(businessParams)
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -746,8 +750,8 @@ func Gdyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData["setl_optins"] = baseParams.OrgName                     // 结算经办机构
 	inputData["stmt_begndate"] = businessParams.StmtBegndate          // 对帐开始时间
 	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间
-	inputData["medfee_sumamt"] = businessParams.StmtEnddate           //医疗费总额
-	inputData["fund_pay_sumamt"] = businessParams.StmtEnddate         //基金支付总额
+	inputData["medfee_sumamt"] = businessParams.MedfeeSumamt          //医疗费总额
+	inputData["fund_pay_sumamt"] = businessParams.FundPaySumamt       //基金支付总额
 	inputData["acct_pay"] = businessParams.AcctPay                    //个人账户支付金额
 	inputData["fixmedins_setl_cnt"] = businessParams.FixmedinsSetlCnt //定点医药机构结算笔数
 
@@ -762,7 +766,7 @@ func Gdyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	}
 	reader := bytes.NewReader(bytesData)
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3102"
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3201"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -802,7 +806,7 @@ func Gdyb9101(baseParams models.BaseParams, file_name string, file_byte []byte)
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["in"] = "3201"                            // 交易编码
+	inputMessage["infno"] = "9101"                         // 交易编码
 	inputData["file_name"] = file_name                     //文件名
 	inputData["in"] = file_byte                            //文件数据
 	inputData["fixmedins_code"] = baseParams.FixmedinsCode //编码
@@ -857,7 +861,7 @@ func Gdyb3202(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3201"                                    // 交易编码
+	inputMessage["infno"] = "3202"                                    // 交易编码
 	inputData["file_qury_no"] = businessParams.FileQuryNo             // 险种
 	inputData["setl_optins"] = baseParams.OrgName                     // 结算经办机构
 	inputData["stmt_begndate"] = businessParams.StmtBegndate          // 对帐开始时间