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

conf/app.conf

@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9919
+org_id = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,7 +53,7 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 url = "http://192.168.1.88:6666/szsi-portal/transData"
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-gdyb_paasid = "sg03_prd"
+gdyb_paasid = "jm_sc_yjyy"
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/sg/gdyb_controller.go

@@ -323,7 +323,7 @@ func (c *GdybController) PostEight() {
 	preselfpay_amt, _ := c.GetFloat("preselfpay_amt")
 	inscp_scp_amt, _ := c.GetFloat("inscp_scp_amt")
 
-	result := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt)
+	result, srcRequest := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -331,8 +331,16 @@ func (c *GdybController) PostEight() {
 		fmt.Println(err)
 	}
 
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(srcRequest), &dat2); err == nil {
+		fmt.Println(dat2)
+	} else {
+		fmt.Println(err)
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": dat,
+		"pre":  dat,
+		"pre2": dat2,
 	})
 }
 
@@ -346,15 +354,23 @@ func (c *GdybController) PostNine() {
 	fixmedins_code := c.GetString("fixmedins_code")
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-	result := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	result, src_request := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
 	} else {
 		fmt.Println(err)
 	}
+
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(src_request), &dat2); err == nil {
+		fmt.Println(dat2)
+	} else {
+		fmt.Println(err)
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": dat,
+		"pre":  dat,
+		"pre2": dat2,
 	})
 }
 

controllers/sg/his_api_controller.go

@@ -821,6 +821,64 @@ type ResultFourteen struct {
 	WarnInfo    interface{} `json:"warn_info"`
 }
 
+type ResultSixteen struct {
+	Cainfo      string `json:"cainfo"`
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     int64  `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"`
+			Age             float64 `json:"age"`
+			Brdy            string  `json:"brdy"`
+			Certno          string  `json:"certno"`
+			ClrType         string  `json:"clr_type"`
+			ClrWay          string  `json:"clr_way"`
+			CvlservFlag     string  `json:"cvlserv_flag"`
+			Gend            string  `json:"gend"`
+			Insutype        string  `json:"insutype"`
+			MdtrtCertType   string  `json:"mdtrt_cert_type"`
+			MedType         string  `json:"med_type"`
+			Naty            string  `json:"naty"`
+			PsnCashPay      float64 `json:"psn_cash_pay"`
+			PsnCertType     string  `json:"psn_cert_type"`
+			PsnName         string  `json:"psn_name"`
+			PsnNo           string  `json:"psn_no"`
+			PsnType         string  `json:"psn_type"`
+		} `json:"setlinfo"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
+
 type Custom struct {
 	DetItemFeeSumamt string
 	Cut              string
@@ -976,7 +1034,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			timeFormat := tempTime.Format("20060102150405")
 			chrgBchno := rand.Intn(100000) + 10000
 			ipt_otp_no := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
-			count, _ := service.FindHisRegisterRecord(theTime.Unix(), patient.ID, adminInfo.CurrentOrgId)
+			//count, _ := service.FindHisRegisterRecord(theTime.Unix(), patient.ID, adminInfo.CurrentOrgId)
 			department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 			doctor_id := strconv.FormatInt(patientPrescription.DoctorId, 10)
 
@@ -992,13 +1050,11 @@ func (c *HisApiController) GetRegisterInfo() {
 			var insutype string
 			var is390 int = 0
 			var is310 int = 0
-
 			for _, item := range res.Output.Iinfo {
 				if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
 					insutypes = append(insutypes, item.Insutype)
 				}
 			}
-
 			if len(insutypes) == 1 {
 				insutype = insutypes[0]
 			} else {
@@ -1018,138 +1074,131 @@ func (c *HisApiController) GetRegisterInfo() {
 			if is310 == 1 {
 				insutype = "310"
 			}
-			fmt.Println(insutype)
+			api := "http://127.0.0.1:9532/" + "gdyb/two?cert_no=" + IdCardNo + "&insutype=" +
+				insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
+				"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
+				"&dept=" + department.Name + "&fixmedins_code=" + miConfig.Code + "&dept_code=" + department.Number + "&doctor_id=" + doctor_id + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10)
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			defer resp.Body.Close()
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
-			if count <= 0 {
-				api := "http://127.0.0.1:9532/" + "gdyb/two?cert_no=" + IdCardNo + "&insutype=" +
-					insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
-					"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
-					"&dept=" + department.Name + "&fixmedins_code=" + miConfig.Code + "&dept_code=" + department.Number + "&doctor_id=" + doctor_id + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10)
-				resp, requestErr := http.Get(api)
-				if requestErr != nil {
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			userJSONBytes, _ := json.Marshal(respJSON)
+			var res ResultThree
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res.Infcode == -1 {
+				adminUser := c.GetAdminUserInfo()
+				errlog := &models.HisOrderError{
+					UserOrgId:  adminUser.CurrentOrgId,
+					Ctime:      time.Now().Unix(),
+					Mtime:      time.Now().Unix(),
+					ErrMsg:     res.ErrMsg,
+					Status:     1,
+					PatientId:  id,
+					RecordTime: recordDateTime,
+					Stage:      2,
+				}
+				service.CreateErrMsgLog(errlog)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.ErrMsg,
+				})
+				return
+				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterTwoException)
+				//return
+			}
+
+			his.Number = res.Output.Data.MdtrtID
+			his.PsnNo = res.Output.Data.PsnNo
+			his.IptOtpNo = res.Output.Data.IptOtpNo
+			his.IdCardNo = patient.IdCardNo
+			his.PhoneNumber = patient.Phone
+			his.UserOrgId = adminInfo.CurrentOrgId
+			his.Ctime = time.Now().Unix()
+			his.Mtime = time.Now().Unix()
+			his.Status = 1
+			err := service.CreateHisPatientTwo(&his)
+			if err == nil {
+				api2 := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
+					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
+					"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + reg_type + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.CountryCode + "&sick_name=" + sickConfig.ClassName
+				resp2, requestErr2 := http.Get(api2)
+				if requestErr2 != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
-				defer resp.Body.Close()
-				body, ioErr := ioutil.ReadAll(resp.Body)
-				if ioErr != nil {
-					utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				body2, ioErr2 := ioutil.ReadAll(resp2.Body)
+				if ioErr2 != nil {
+					utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
-				var respJSON map[string]interface{}
-				if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				var respJSON2 map[string]interface{}
+				if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
 					utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
+				respJSON2 = respJSON2["data"].(map[string]interface{})["pre"].(map[string]interface{})
+				userJSONBytes2, _ := json.Marshal(respJSON2)
 
-				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-				userJSONBytes, _ := json.Marshal(respJSON)
-				var res ResultThree
-				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				var res2 ResultSix
+				if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
-				if res.Infcode == -1 {
+				if res2.Infcode == -1 {
 					adminUser := c.GetAdminUserInfo()
 					errlog := &models.HisOrderError{
 						UserOrgId:  adminUser.CurrentOrgId,
 						Ctime:      time.Now().Unix(),
 						Mtime:      time.Now().Unix(),
-						ErrMsg:     res.ErrMsg,
+						ErrMsg:     res2.ErrMsg,
 						Status:     1,
 						PatientId:  id,
 						RecordTime: recordDateTime,
-						Stage:      2,
+						Stage:      3,
 					}
 					service.CreateErrMsgLog(errlog)
 					c.ServeSuccessJSON(map[string]interface{}{
 						"failed_code": -10,
-						"msg":         res.ErrMsg,
+						"msg":         res2.ErrMsg,
 					})
 					return
-					//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterTwoException)
-					//return
-				}
-
-				his.Number = res.Output.Data.MdtrtID
-				his.PsnNo = res.Output.Data.PsnNo
-				his.IptOtpNo = res.Output.Data.IptOtpNo
-				his.IdCardNo = patient.IdCardNo
-				his.PhoneNumber = patient.Phone
-				his.UserOrgId = adminInfo.CurrentOrgId
-				his.Ctime = time.Now().Unix()
-				his.Mtime = time.Now().Unix()
-				his.Status = 1
-				err := service.CreateHisPatientTwo(&his)
-				if err == nil {
-					api2 := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
-						"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
-						"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + reg_type + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
-						"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.CountryCode + "&sick_name=" + sickConfig.ClassName
-					resp2, requestErr2 := http.Get(api2)
-					if requestErr2 != nil {
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					body2, ioErr2 := ioutil.ReadAll(resp2.Body)
-					if ioErr2 != nil {
-						utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					var respJSON2 map[string]interface{}
-					if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
-						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					respJSON2 = respJSON2["data"].(map[string]interface{})["pre"].(map[string]interface{})
-					userJSONBytes2, _ := json.Marshal(respJSON2)
-
-					var res2 ResultSix
-					if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					if res2.Infcode == -1 {
-						adminUser := c.GetAdminUserInfo()
-						errlog := &models.HisOrderError{
-							UserOrgId:  adminUser.CurrentOrgId,
-							Ctime:      time.Now().Unix(),
-							Mtime:      time.Now().Unix(),
-							ErrMsg:     res2.ErrMsg,
-							Status:     1,
-							PatientId:  id,
-							RecordTime: recordDateTime,
-							Stage:      3,
-						}
-						service.CreateErrMsgLog(errlog)
-						c.ServeSuccessJSON(map[string]interface{}{
-							"failed_code": -10,
-							"msg":         res2.ErrMsg,
-						})
-						return
-
-					} else {
-
-						c.ServeSuccessJSON(map[string]interface{}{
-							"his_info": his,
-						})
-					}
 
 				} else {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-					return
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"his_info": his,
+					})
 				}
 
 			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 				return
 			}
+
 		} else {
 			adminUser := c.GetAdminUserInfo()
 			errlog := &models.HisOrderError{
@@ -1368,8 +1417,8 @@ func (c *HisApiController) GetUploadInfo() {
 				SettleType:            settle_accounts_type,
 				SettleStartTime:       start_time,
 				SettleEndTime:         end_time,
-				Creator:               roles.ID,
-				Modify:                roles.ID,
+				Creator:               roles.AdminUserId,
+				Modify:                roles.AdminUserId,
 			}
 			err = service.CreateOrder(order)
 			if err != nil {
@@ -1529,6 +1578,12 @@ func (c *HisApiController) GetUploadInfo() {
 				fmt.Println(respJSON)
 				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 				userJSONBytes, _ := json.Marshal(respJSON)
+
+				respJSON2 := respJSON["data"].(map[string]interface{})["pre2"].(map[string]interface{})
+				userJSONBytes2, _ := json.Marshal(respJSON2)
+
+				src_request := string(userJSONBytes2)
+
 				var res ResultSeven
 				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
@@ -1595,7 +1650,8 @@ func (c *HisApiController) GetUploadInfo() {
 					order.ClrOptins = res.Output.Setlinfo.ClrOptins
 					order.ClrWay = res.Output.Setlinfo.ClrWay
 					order.Creator = order.Creator
-					order.Modify = roles.ID
+					order.Modify = roles.AdminUserId
+					order.RequestLog = src_request
 					setlDetail, _ := json.Marshal(res.Output.Setldetail)
 					detailStr := string(setlDetail)
 					order.SetlDetail = detailStr
@@ -2560,35 +2616,26 @@ func (c *HisApiController) GetSettleInfo() {
 func (c *HisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-
-	number := c.GetString("number")
 	record_time := c.GetString("record_time")
 	patient_id, _ := c.GetInt64("patient_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	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
 	}
 	recordDateTime := theTime.Unix()
 	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
-	//patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 	var order models.HisOrder
 	order, _ = service.GetHisOrderByID(order_id)
-
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-
 	if order.ID == 0 {
 		order, _ = service.GetHisOrderThree(recordDateTime, patient_id, adminUser.CurrentOrgId)
-
 	}
-
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
-
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 		api := "http://127.0.0.1:9532/" + "gdyb/nine?psn_no=" + his.PsnNo +
 			"&mdtrt_id=" + his.Number + "&doctor=" + roles.UserName + "&setl_id=" + order.SetlId + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
@@ -2612,65 +2659,69 @@ func (c *HisApiController) Refund() {
 		}
 		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 		userJSONBytes, _ := json.Marshal(respJSON)
-		fmt.Println(respJSON)
-		fmt.Println(userJSONBytes)
 
-		api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + his.PsnNo +
-			"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&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)
-		if requestErr2 != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
+		respJSON2 := respJSON["data"].(map[string]interface{})["pre2"].(map[string]interface{})
+		userJSONBytes2, _ := json.Marshal(respJSON2)
 
-		body2, ioErr2 := ioutil.ReadAll(resp2.Body)
-		if ioErr2 != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		var respJSON2 map[string]interface{}
-		if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		var res ResultSixteen
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-
-		//api3 := "http://127.0.0.1:9532/" + "gdyb/three?psn_no=" + his.PsnNo +
-		//	"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-		//	"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
-		//resp3, requestErr3 := http.Get(api3)
-		//if requestErr3 != nil {
-		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//	return
-		//}
-		//
-		//body3, ioErr3 := ioutil.ReadAll(resp3.Body)
-		//if ioErr3 != nil {
-		//	utils.ErrorLog("接口返回数据读取失败: %v", ioErr3)
-		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//	return
-		//}
-		//var respJSON3 map[string]interface{}
-		//if err := json.Unmarshal([]byte(string(body3)), &respJSON3); err != nil {
-		//	utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//	return
-		//}
-		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
-		//service.UpdataRegStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
-
-		if err == nil {
+		if res.Infcode == 0 {
+			api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + his.PsnNo +
+				"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&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)
+			if requestErr2 != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			body2, ioErr2 := ioutil.ReadAll(resp2.Body)
+			if ioErr2 != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON2 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			userJSONBytes, _ := json.Marshal(respJSON)
+			var res2 ResultSix
+			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res2.Infcode == 0 {
+				err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, string(userJSONBytes2))
+				if err == nil {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "退费成功",
+					})
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"code": -10,
+					"msg":  res2.ErrMsg,
+				})
+			}
+		} else {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "退费成功",
+				"code": -10,
+				"msg":  res.ErrMsg,
 			})
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
 		}
 	} else {
-		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
+		err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, "")
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "退费成功",
@@ -2802,7 +2853,7 @@ func (c *HisApiController) RefundDetail() {
 			return
 		}
 
-		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
+		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "")
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "退费成功",
@@ -2812,7 +2863,7 @@ func (c *HisApiController) RefundDetail() {
 			return
 		}
 	} else {
-		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
+		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "")
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "退费成功",

models/his_models.go

@@ -675,6 +675,9 @@ type HisOrder struct {
 	RefundLog string `gorm:"column:refund_log" json:"refund_log" form:"refund_log"`
 	DetailLog string `gorm:"column:detail_log" json:"detail_log" form:"detail_log"`
 
+	RequestLog       string `gorm:"column:request_log" json:"request_log" form:"request_log"`
+	RefundRequestLog string `gorm:"column:refund_request_log" json:"refund_request_log" form:"refund_request_log"`
+
 	HisOrderInfo        HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient          HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`

service/gdyb_service.go

@@ -919,7 +919,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算
-func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64) string {
+func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -962,7 +962,7 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 	gdyb_url := beego.AppConfig.String("gdyb_url")
@@ -978,7 +978,7 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -991,20 +991,23 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	mjson, _ := json.Marshal(inputMessage)
+	str2 := string(mjson)
+
+	return str, str2
 }
 
 //  门诊结算撤销
-func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
+func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1027,7 +1030,7 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 	gdyb_url := beego.AppConfig.String("gdyb_url")
@@ -1043,7 +1046,7 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -1056,16 +1059,18 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	mjson, _ := json.Marshal(inputMessage)
+	str2 := string(mjson)
+	return str, str2
 }
 
 //确认订单
@@ -1626,12 +1631,10 @@ func Gdyb3302(baseParams *models.BaseParams, name string, codg string, list_type
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3302" // 交易编码
+	inputData["fixmedins_code"] = baseParams.FixmedinsCode
 	inputData["fixmedins_hilist_id"] = codg
-	inputData["fixmedins_hilist_name"] = name
 	inputData["list_type"] = list_type_code
 	inputData["med_list_codg"] = codg
-	inputData["begndate"] = "2021-01-01"
-	inputData["enddate"] = "2099-01-07"
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入

service/his_service.go

@@ -660,8 +660,8 @@ func GetMedicalInsuranceConfig(org_id int64) (medicalInsuranceConfig models.Medi
 
 }
 
-func UpdataOrderStatus(id int64, number string, user_org_id int64) (err error) {
-	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix()}).Error
+func UpdataOrderStatus(id int64, number string, user_org_id int64, log string) (err error) {
+	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix(), "refund_request_log": log}).Error
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
 	return