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

controllers/sg/his_api_controller.go

@@ -2110,6 +2110,40 @@ type ResultFour struct {
 	Signtype    string `json:"signtype"`
 	WarnMsg     string `json:"warn_msg"`
 }
+type ResultFour10265 struct {
+	Cainfo      string `json:"cainfo"`
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     string `json:"infcode"`
+	Output      struct {
+		Result []struct {
+			BasMednFlag      string  `json:"bas_medn_flag"`
+			ChldMedcFlag     string  `json:"chld_medc_flag"`
+			ChrgitmLv        string  `json:"chrgitm_lv"`
+			Cnt              float64 `json:"cnt"`
+			DetItemFeeSumamt float64 `json:"det_item_fee_sumamt"`
+			DrtReimFlag      string  `json:"drt_reim_flag"`
+			FeedetlSn        string  `json:"feedetl_sn"`
+			FulamtOwnpayAmt  float64 `json:"fulamt_ownpay_amt"`
+			HiNegoDrugFlag   string  `json:"hi_nego_drug_flag"`
+			InscpScpAmt      float64 `json:"inscp_scp_amt"`
+			ListSpItemFlag   string  `json:"list_sp_item_flag"`
+			LmtUsedFlag      string  `json:"lmt_used_flag"`
+			MedChrgitmType   string  `json:"med_chrgitm_type"`
+			Memo             string  `json:"memo"`
+			OverlmtAmt       float64 `json:"overlmt_amt"`
+			PreselfpayAmt    float64 `json:"preselfpay_amt"`
+			Pric             float64 `json:"pric"`
+			PricUplmtAmt     float64 `json:"pric_uplmt_amt"`
+			SelfpayProp      float64 `json:"selfpay_prop"`
+		} `json:"result"`
+	} `json:"output"`
+	RefmsgTime  string `json:"refmsg_time"`
+	RespondTime string `json:"respond_time"`
+	Signtype    string `json:"signtype"`
+	WarnMsg     string `json:"warn_msg"`
+}
+
 type ResultFive struct {
 	Balc                   float64 `json:"balc"`
 	CvlservFlag            string  `json:"cvlserv_flag"`
@@ -2134,6 +2168,20 @@ type ResultSix struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
+
+type ResultSix10265 struct {
+	Cainfo      interface{} `json:"cainfo"`
+	ErrMsg      string      `json:"err_msg"`
+	InfRefmsgid string      `json:"inf_refmsgid"`
+	Infcode     string      `json:"infcode"`
+	Output      struct {
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
+
 type ResultSeven struct {
 	Cainfo      string `json:"cainfo"`
 	ErrMsg      string `json:"err_msg"`
@@ -2191,6 +2239,64 @@ type ResultSeven struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
+type ResultSeven10265 struct {
+	Cainfo      string `json:"cainfo"`
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     string `json:"infcode"`
+	Output      struct {
+		Setldetail []interface{} `json:"setldetail"`
+		Setlinfo   struct {
+			AcctMulaidPay   float64 `json:"acct_mulaid_pay"`
+			AcctPay         float64 `json:"acct_pay"`
+			ActPayDedc      float64 `json:"act_pay_dedc"`
+			Age             float64 `json:"age"`
+			Balc            float64 `json:"balc"`
+			Brdy            string  `json:"brdy"`
+			Certno          string  `json:"certno"`
+			ClrOptins       string  `json:"clr_optins"`
+			ClrType         string  `json:"clr_type"`
+			ClrWay          string  `json:"clr_way"`
+			CvlservFlag     string  `json:"cvlserv_flag"`
+			CvlservPay      float64 `json:"cvlserv_pay"`
+			FulamtOwnpayAmt float64 `json:"fulamt_ownpay_amt"`
+			FundPaySumamt   float64 `json:"fund_pay_sumamt"`
+			Gend            string  `json:"gend"`
+			HifesPay        float64 `json:"hifes_pay"`
+			HifmiPay        float64 `json:"hifmi_pay"`
+			HifpPay         float64 `json:"hifp_pay"`
+			HospPartAmt     float64 `json:"hosp_part_amt"`
+			InscpScpAmt     float64 `json:"inscp_scp_amt"`
+			Insutype        string  `json:"insutype"`
+			MafPay          float64 `json:"maf_pay"`
+			MdtrtCertType   string  `json:"mdtrt_cert_type"`
+			HifobPay        float64 `json:"hifob_pay"`
+
+			MdtrtID         string  `json:"mdtrt_id"`
+			MedType         string  `json:"med_type"`
+			MedfeeSumamt    float64 `json:"medfee_sumamt"`
+			MedinsSetlID    string  `json:"medins_setl_id"`
+			Naty            string  `json:"naty"`
+			OthPay          float64 `json:"oth_pay"`
+			OverlmtSelfpay  float64 `json:"overlmt_selfpay"`
+			PoolPropSelfpay float64 `json:"pool_prop_selfpay"`
+			PreselfpayAmt   float64 `json:"preselfpay_amt"`
+			PsnCashPay      float64 `json:"psn_cash_pay"`
+			PsnCertType     string  `json:"psn_cert_type"`
+			PsnName         string  `json:"psn_name"`
+			PsnNo           string  `json:"psn_no"`
+			PsnPartAmt      float64 `json:"psn_part_amt"`
+			PsnType         string  `json:"psn_type"`
+			SetlID          string  `json:"setl_id"`
+			SetlTime        string  `json:"setl_time"`
+		} `json:"setlinfo"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
+
 type ResultEight struct {
 	Cainfo      string `json:"cainfo"`
 	ErrMsg      string `json:"err_msg"`
@@ -2399,6 +2505,82 @@ type ResultEleven struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
+type ResultEleven10265 struct {
+	Cainfo      string `json:"cainfo"`
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     string `json:"infcode"`
+	Output      struct {
+		Setlinfo struct {
+			SetlTime          string      `json:"setl_time"`
+			CvlservPay        float64     `json:"cvlserv_pay"`
+			Year              string      `json:"year"`
+			MedType           string      `json:"med_type"`
+			PsnPay            float64     `json:"psn_pay"`
+			OpterID           string      `json:"opter_id"`
+			Begndate          string      `json:"begndate"`
+			FlxempeFlag       string      `json:"flxempe_flag"`
+			HifmiPay          float64     `json:"hifmi_pay"`
+			PsnNo             string      `json:"psn_no"`
+			ActPayDedc        float64     `json:"act_pay_dedc"`
+			MedinsSetlID      interface{} `json:"medins_setl_id"`
+			AcctMulaidPay     interface{} `json:"acct_mulaid_pay"`
+			ClrWay            string      `json:"clr_way"`
+			OthPay            float64     `json:"oth_pay"`
+			Gend              string      `json:"gend"`
+			MdtrtID           string      `json:"mdtrt_id"`
+			AcctPay           float64     `json:"acct_pay"`
+			InscpScpAmt       float64     `json:"inscp_scp_amt"`
+			Insutype          string      `json:"insutype"`
+			Invono            interface{} `json:"invono"`
+			Enddate           string      `json:"enddate"`
+			CashPayamt        float64     `json:"cash_payamt"`
+			PsnType           string      `json:"psn_type"`
+			FixmedinsName     string      `json:"fixmedins_name"`
+			HifpPay           float64     `json:"hifp_pay"`
+			NewFlag           interface{} `json:"new_flag"`
+			OverlmtSelfpay    float64     `json:"overlmt_selfpay"`
+			PreselfpayAmt     float64     `json:"preselfpay_amt"`
+			PayLoc            string      `json:"pay_loc"`
+			ClrType           string      `json:"clr_type"`
+			RefdSetlFlag      string      `json:"refd_setl_flag"`
+			CvlservFlag       string      `json:"cvlserv_flag"`
+			EmpName           string      `json:"emp_name"`
+			Brdy              string      `json:"brdy"`
+			Naty              string      `json:"naty"`
+			Certno            string      `json:"certno"`
+			DiseCode          string      `json:"dise_code"`
+			FixmedinsCode     string      `json:"fixmedins_code"`
+			DedcHospLv        string      `json:"dedc_hosp_lv"`
+			OpterName         string      `json:"opter_name"`
+			Balc              float64     `json:"balc"`
+			FixmedinsPoolarea string      `json:"fixmedins_poolarea"`
+			PsnCertType       string      `json:"psn_cert_type"`
+			HifobPay          float64     `json:"hifob_pay"`
+			MedfeeSumamt      float64     `json:"medfee_sumamt"`
+			HifesPay          float64     `json:"hifes_pay"`
+			FundPaySumamt     float64     `json:"fund_pay_sumamt"`
+			OptTime           string      `json:"opt_time"`
+			FulamtOwnpayAmt   float64     `json:"fulamt_ownpay_amt"`
+			SetlID            string      `json:"setl_id"`
+			MafPay            float64     `json:"maf_pay"`
+			PsnName           string      `json:"psn_name"`
+			InsuOptins        interface{} `json:"insu_optins"`
+			PrefFundPay       interface{} `json:"pref_fund_pay"`
+			ClrOptins         string      `json:"clr_optins"`
+			PoolPropSelfpay   float64     `json:"pool_prop_selfpay"`
+			DiseName          string      `json:"dise_name"`
+			LmtpricHospLv     string      `json:"lmtpric_hosp_lv"`
+			Age               float64     `json:"age"`
+			DtrtCertType      string      `json:"dtrt_cert_type"`
+			HospLv            string      `json:"hosp_lv"`
+		} `json:"setlinfo"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
 
 type ResultTwelve struct {
 	Cainfo      string `json:"cainfo"`
@@ -2485,6 +2667,48 @@ type ResultSixteen struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
+type ResultSixteen10265 struct {
+	Cainfo      string `json:"cainfo"`
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     string `json:"infcode"`
+	Output      struct {
+		Setldetail []interface{} `json:"setldetail"`
+		Setlinfo   struct {
+			MdtrtID         string  `json:"mdtrt_id"`
+			SetlID          string  `json:"setl_id"`
+			ClrOptins       string  `json:"clr_optins"`
+			SetlTime        string  `json:"setl_time"`
+			MedfeeSumamt    float64 `json:"medfee_sumamt"`
+			FulamtOwnpayAmt float64 `json:"fulamt_ownpay_amt"`
+			OverlmtSelfpay  float64 `json:"overlmt_selfpay"`
+			PreselfpayAmt   float64 `json:"preselfpay_amt"`
+			InscpScpAmt     float64 `json:"inscp_scp_amt"`
+			ActPayDedc      float64 `json:"act_pay_dedc"`
+			HifpPay         float64 `json:"hifp_pay"`
+			PoolPropSe      float64 `json:"pool_prop_selfpay"`
+			Lfpay           float64 `json:"selfpay"`
+			CvlservPay      float64 `json:"cvlserv_pay"`
+			HifesPay        float64 `json:"hifes_pay"`
+			HifmiPay        float64 `json:"hifmi_pay"`
+			HifobPay        float64 `json:"hifob_pay"`
+			MafPay          float64 `json:"maf_pay"`
+			OthPay          float64 `json:"oth_pay"`
+			FundPaySumamt   float64 `json:"fund_pay_sumamt"`
+			PsnPartAmt      float64 `json:"psn_part_amt"`
+			AcctPay         float64 `json:"acct_pay"`
+			Balc            float64 `json:"balc"`
+			AcctMulaidPay   float64 `json:"acct_mulaid_pay"`
+			HospPartAmt     float64 `json:"hosp_part_amt"`
+			MedinsSetlID    string  `json:"medins_setl_id"`
+			PdnCashPay      string  `json:"pdn_cash_pay"`
+		} `json:"setlinfo"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
 
 type ResultSeventeen struct {
 	ErrMsg      string `json:"err_msg"`
@@ -3043,6 +3267,7 @@ func (c *HisApiController) GetUploadInfo() {
 		var result string
 		var requestLog string
 		var res2 ResultSix
+		var ressix10265 ResultSix10265
 
 		if miConfig.InsuplcAdmdvs == "421300" {
 
@@ -3097,6 +3322,7 @@ func (c *HisApiController) GetUploadInfo() {
 			} else {
 				result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 			}
+
 			saveLog(result, requestLog, "2203", "上传就诊信息")
 			var respJSON2 map[string]interface{}
 			if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
@@ -3105,13 +3331,26 @@ func (c *HisApiController) GetUploadInfo() {
 				return
 			}
 			userJSONBytes2, _ := json.Marshal(respJSON2)
-
-			if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+			if miConfig.Code == "H15049901371" {
+				if err := json.Unmarshal(userJSONBytes2, &ressix10265); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				res2.InfRefmsgid = ressix10265.InfRefmsgid
+				res2.Output = ressix10265.Output
+				res2.ErrMsg = ressix10265.ErrMsg
+				res2.Cainfo = ressix10265.Cainfo
+				res2.WarnMsg = ressix10265.WarnMsg
+				infocode, _ := strconv.ParseInt(ressix10265.Infcode, 10, 64)
+				res2.Infcode = infocode
+			} else {
+				if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 			}
-
 		}
 
 		if res2.Infcode != 0 {
@@ -3214,6 +3453,8 @@ func (c *HisApiController) GetUploadInfo() {
 			config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 			if config.IsOpen == 1 { //对接了医保，走医保流程
 				var res ResultFour
+				var resFour10265 ResultFour10265
+
 				if miConfig.MdtrtareaAdmvs == "421300" {
 
 					bytesData, _ := json.Marshal(data)
@@ -3254,11 +3495,31 @@ func (c *HisApiController) GetUploadInfo() {
 					saveLog(result, request_log, "2204", "上传费用明细")
 					userJSONBytes, _ := json.Marshal(dat)
 
-					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
+					if miConfig.Code == "H15049901371" {
+						if err := json.Unmarshal(userJSONBytes, &resFour10265); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+
+						res.InfRefmsgid = resFour10265.InfRefmsgid
+						res.Output = resFour10265.Output
+						res.ErrMsg = resFour10265.ErrMsg
+						res.Cainfo = resFour10265.Cainfo
+						res.WarnMsg = resFour10265.WarnMsg
+						infocode, _ := strconv.ParseInt(resFour10265.Infcode, 10, 64)
+						res.Infcode = infocode
+
+					} else {
+
+						if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+
 					}
+
 				}
 
 				if res.Infcode == 0 {
@@ -3450,6 +3711,8 @@ func (c *HisApiController) GetUploadInfo() {
 
 						}
 						var res ResultSeven
+						var resSeven10265 ResultSeven10265
+
 						var src_resquest string
 						var result2 string
 						var acct_used_flag string
@@ -3494,10 +3757,29 @@ func (c *HisApiController) GetUploadInfo() {
 							respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 							result, _ := json.Marshal(respJSON)
 
-							if err := json.Unmarshal([]byte(result), &res); err != nil {
-								utils.ErrorLog("解析失败：%v", err)
-								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-								return
+							if miConfig.Code == "H15049901371" {
+								if err := json.Unmarshal([]byte(result), &resSeven10265); err != nil {
+									utils.ErrorLog("解析失败：%v", err)
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+									return
+								}
+
+								res.InfRefmsgid = resSeven10265.InfRefmsgid
+								res.Output = resSeven10265.Output
+								res.ErrMsg = resSeven10265.ErrMsg
+								res.Cainfo = resSeven10265.Cainfo
+								res.WarnMsg = resSeven10265.WarnMsg
+								infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+								res.Infcode = infocode
+
+							} else {
+
+								if err := json.Unmarshal([]byte(result), &res); err != nil {
+									utils.ErrorLog("解析失败：%v", err)
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+									return
+								}
+
 							}
 
 						} else {
@@ -3512,11 +3794,30 @@ func (c *HisApiController) GetUploadInfo() {
 							saveLog(result2, src_resquest, "2207", "结算")
 
 							userJSONBytes, _ := json.Marshal(dat)
+							if miConfig.Code == "H15049901371" {
+
+								if err := json.Unmarshal(userJSONBytes, &resSeven10265); err != nil {
+									utils.ErrorLog("解析失败：%v", err)
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+									return
+								}
+
+								res.InfRefmsgid = resSeven10265.InfRefmsgid
+								res.Output = resSeven10265.Output
+								res.ErrMsg = resSeven10265.ErrMsg
+								res.Cainfo = resSeven10265.Cainfo
+								res.WarnMsg = resSeven10265.WarnMsg
+								infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+								res.Infcode = infocode
+
+							} else {
+
+								if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+									utils.ErrorLog("解析失败：%v", err)
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+									return
+								}
 
-							if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-								utils.ErrorLog("解析失败：%v", err)
-								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-								return
 							}
 
 						}
@@ -3706,6 +4007,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 			}
 			var res ResultSeven
+			var resSeven10265 ResultSeven10265
 			var src_resquest string
 			var result2 string
 			var acct_used_flag string
@@ -3757,7 +4059,6 @@ func (c *HisApiController) GetUploadInfo() {
 				}
 
 			} else {
-
 				result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
@@ -3765,17 +4066,32 @@ func (c *HisApiController) GetUploadInfo() {
 				} else {
 					fmt.Println(err)
 				}
-
 				saveLog(result2, src_resquest, "2207", "结算")
-
 				userJSONBytes, _ := json.Marshal(dat)
+				if miConfig.Code == "H15049901371" {
 
-				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
+					if err := json.Unmarshal(userJSONBytes, &resSeven10265); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					res.InfRefmsgid = resSeven10265.InfRefmsgid
+					res.Output = resSeven10265.Output
+					res.ErrMsg = resSeven10265.ErrMsg
+					res.Cainfo = resSeven10265.Cainfo
+					res.WarnMsg = resSeven10265.WarnMsg
+					infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+					res.Infcode = infocode
 
+				} else {
+
+					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+
+				}
 			}
 
 			if res.Infcode != 0 {
@@ -4450,6 +4766,8 @@ func (c *HisApiController) GetPreUploadInfo() {
 	strconv.FormatInt(his.PatientId, 10)
 
 	var res2 ResultSix
+	var resSix10265 ResultSix10265
+
 	if miConfig.InsuplcAdmdvs == "421300" {
 		data := make(map[string]interface{})
 		client := &http.Client{}
@@ -4512,11 +4830,33 @@ func (c *HisApiController) GetPreUploadInfo() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
+			//userJSONBytes2, _ := json.Marshal(respJSON2)
+			//if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+			//	utils.ErrorLog("解析失败：%v", err)
+			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			//	return
+			//}
+
 			userJSONBytes2, _ := json.Marshal(respJSON2)
-			if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+			if miConfig.Code == "H15049901371" {
+				if err := json.Unmarshal(userJSONBytes2, &resSix10265); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				res2.InfRefmsgid = resSix10265.InfRefmsgid
+				res2.Output = resSix10265.Output
+				res2.ErrMsg = resSix10265.ErrMsg
+				res2.Cainfo = resSix10265.Cainfo
+				res2.WarnMsg = resSix10265.WarnMsg
+				infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
+				res2.Infcode = infocode
+			} else {
+				if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 			}
 		}
 
@@ -4606,6 +4946,8 @@ func (c *HisApiController) GetPreUploadInfo() {
 		config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 		if config.IsOpen == 1 { //对接了医保，走医保流程
 			var res ResultFour
+			var resFour10265 ResultFour10265
+
 			if miConfig.MdtrtareaAdmvs == "421300" {
 				bytesData, _ := json.Marshal(data)
 				req, _ := http.NewRequest("POST", "http://192.168.124.4:9532/"+"hbyb/2204", bytes.NewReader(bytesData))
@@ -4644,12 +4986,34 @@ func (c *HisApiController) GetPreUploadInfo() {
 					fmt.Println(err)
 				}
 				saveLog(result, request_log, "2204", "上传费用明细")
+
 				userJSONBytes, _ := json.Marshal(dat)
-				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
+
+				if miConfig.Code == "H15049901371" {
+					if err := json.Unmarshal(userJSONBytes, &resFour10265); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+
+					res.InfRefmsgid = resFour10265.InfRefmsgid
+					res.Output = resFour10265.Output
+					res.ErrMsg = resFour10265.ErrMsg
+					res.Cainfo = resFour10265.Cainfo
+					res.WarnMsg = resFour10265.WarnMsg
+					infocode, _ := strconv.ParseInt(resFour10265.Infcode, 10, 64)
+					res.Infcode = infocode
+
+				} else {
+
+					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+
 				}
+
 			}
 
 			if res.Infcode == 0 {
@@ -4821,6 +5185,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 					}
 					var res ResultSeven
+					var resSeven10265 ResultSeven10265
 
 					if miConfig.MdtrtareaAdmvs == "421300" {
 
@@ -4870,12 +5235,34 @@ func (c *HisApiController) GetPreUploadInfo() {
 							fmt.Println(err)
 						}
 						saveLog(result, request_log, "2206", "预结算")
-						userJSONBytes, _ := json.Marshal(dat)
+						//userJSONBytes, _ := json.Marshal(dat)
+						//
+						//if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+						//	utils.ErrorLog("解析失败：%v", err)
+						//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						//	return
+						//}
 
-						if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-							utils.ErrorLog("解析失败：%v", err)
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-							return
+						userJSONBytes, _ := json.Marshal(dat)
+						if miConfig.Code == "H15049901371" {
+							if err := json.Unmarshal(userJSONBytes, &resSeven10265); err != nil {
+								utils.ErrorLog("解析失败：%v", err)
+								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+								return
+							}
+							res.InfRefmsgid = resSeven10265.InfRefmsgid
+							res.Output = resSeven10265.Output
+							res.ErrMsg = resSeven10265.ErrMsg
+							res.Cainfo = resSeven10265.Cainfo
+							res.WarnMsg = resSeven10265.WarnMsg
+							infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+							res.Infcode = infocode
+						} else {
+							if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+								utils.ErrorLog("解析失败：%v", err)
+								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+								return
+							}
 						}
 					}
 
@@ -5237,6 +5624,7 @@ func (c *HisApiController) Refund() {
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 		var res ResultSixteen
+		var resSixteen10265 ResultSixteen10265
 		var src_resquest string
 		var result string
 
@@ -5281,16 +5669,35 @@ func (c *HisApiController) Refund() {
 				fmt.Println(err)
 			}
 			saveLog(result, src_resquest, "2208", "退费")
+
 			userJSONBytes, _ := json.Marshal(dat)
-			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+			if miConfig.Code == "H15049901371" {
+				if err := json.Unmarshal(userJSONBytes, &resSixteen10265); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				res.InfRefmsgid = resSixteen10265.InfRefmsgid
+				res.Output = resSixteen10265.Output
+				res.ErrMsg = resSixteen10265.ErrMsg
+				res.Cainfo = resSixteen10265.Cainfo
+				res.WarnMsg = resSixteen10265.WarnMsg
+				infocode, _ := strconv.ParseInt(resSixteen10265.Infcode, 10, 64)
+				res.Infcode = infocode
+			} else {
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
 			}
+
 		}
 
 		if res.Infcode == 0 {
 			var res2 ResultSix
+			var resSix10265 ResultSix10265
 
 			if miConfig.MdtrtareaAdmvs == "421300" {
 
@@ -5336,13 +5743,27 @@ func (c *HisApiController) Refund() {
 				}
 
 				saveLog(result2, src_request, "2205", "撤销明细")
-
 				userJSONBytes, _ := json.Marshal(dat)
+				if miConfig.Code == "H15049901371" {
+					if err := json.Unmarshal(userJSONBytes, &resSix10265); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					res2.InfRefmsgid = resSix10265.InfRefmsgid
+					res2.Output = resSix10265.Output
+					res2.ErrMsg = resSix10265.ErrMsg
+					res2.Cainfo = resSix10265.Cainfo
+					res2.WarnMsg = resSix10265.WarnMsg
+					infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
+					res2.Infcode = infocode
+				} else {
+					if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
 
-				if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
 				}
 
 			}
@@ -5406,6 +5827,8 @@ func (c *HisApiController) RefundNumber() {
 
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 		var res2 ResultSix
+		var resSix10265 ResultSix10265
+
 		if miConfig.MdtrtareaAdmvs == "421300" {
 
 			api3 := "http://192.168.124.4:9532/" + "hbyb/2202?psn_no=" + his.PsnNo +
@@ -5467,10 +5890,26 @@ func (c *HisApiController) RefundNumber() {
 			respJSON3 = respJSON3["data"].(map[string]interface{})["pre"].(map[string]interface{})
 			userJSONBytes3, _ := json.Marshal(respJSON3)
 
-			if err := json.Unmarshal(userJSONBytes3, &res2); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+			if miConfig.Code == "H15049901371" {
+				if err := json.Unmarshal(userJSONBytes3, &resSix10265); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				res2.InfRefmsgid = resSix10265.InfRefmsgid
+				res2.Output = resSix10265.Output
+				res2.ErrMsg = resSix10265.ErrMsg
+				res2.Cainfo = resSix10265.Cainfo
+				res2.WarnMsg = resSix10265.WarnMsg
+				infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
+				res2.Infcode = infocode
+			} else {
+
+				if err := json.Unmarshal(userJSONBytes3, &res2); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 			}
 
 		}
@@ -6186,6 +6625,8 @@ func (c *HisApiController) GetSettleAccounts() {
 		SetlId:  order.SetlId,
 	}
 	var res ResultEleven
+	var resEleven10265 ResultEleven10265
+
 	if config.IsOpen == 1 {
 		if miConfig.MdtrtareaAdmvs == "421300" {
 
@@ -6230,10 +6671,27 @@ func (c *HisApiController) GetSettleAccounts() {
 				fmt.Println(err)
 			}
 			userJSONBytes, _ := json.Marshal(dat)
-			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+
+			if miConfig.Code == "H15049901371" {
+				if err := json.Unmarshal(userJSONBytes, &resEleven10265); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				res.InfRefmsgid = resEleven10265.InfRefmsgid
+				res.Output = resEleven10265.Output
+				res.ErrMsg = resEleven10265.ErrMsg
+				res.Cainfo = resEleven10265.Cainfo
+				res.WarnMsg = resEleven10265.WarnMsg
+				infocode, _ := strconv.ParseInt(resEleven10265.Infcode, 10, 64)
+				res.Infcode = infocode
+			} else {
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
 			}
 		}