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

controllers/sg/his_api_controller.go

@@ -1404,9 +1404,9 @@ func (c *HisApiController) ReadCard() {
 			errmsg = Remove0000(errmsg)
 
 			basStr := cardnum + "|" + cardCode + "|" + id_card_no + "|" + name
-			result, _ := service.FJyb1101(cardnum, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, cardCode, certificates, miConfig.Url, miConfig.Cainfo, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
-			fmt.Println("result:")
-			fmt.Println(result)
+			result, requestLog, errMsgLog := service.FJyb1101(cardnum, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, cardCode, certificates, miConfig.Url, miConfig.Cainfo, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			saveLog(result, requestLog, "1101", "获取人员信息")
+			fmt.Println(errMsgLog)
 
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -1422,7 +1422,7 @@ func (c *HisApiController) ReadCard() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
-
+			res.ErrMsg = errMsgLog
 			if res.Infcode == 0 {
 				patient, err := service.GetPatientByNumber(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
 				if err == gorm.ErrRecordNotFound {
@@ -5380,7 +5380,7 @@ func (c *HisApiController) GetRegisterInfo() {
 					cert_no = strings.Split(psn_info.CardInfo, "|")[0]
 				}
 				fmt.Println(cert_no)
-				result, requestLog := service.FJyb2201(psn_info.PsnNo, insutype, IdCardNo, miConfig.OrgName, doctor_info.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, roles.UserName, doctor_info.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, cert_no)
+				result, requestLog, _ := service.FJyb2201(psn_info.PsnNo, insutype, IdCardNo, miConfig.OrgName, doctor_info.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, roles.UserName, doctor_info.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, cert_no)
 				saveLog(result, requestLog, "2201", "挂号")
 				if miConfig.Code == "H15049901371" {
 
@@ -5767,7 +5767,7 @@ func (c *HisApiController) GetUploadInfo() {
 			res2.Infcode = infocode
 
 		} else if miConfig.MdtrtareaAdmvs == "350500" {
-			result, requestLog = service.FJyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time, doctor_info.UserName, roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			result, requestLog, _ = service.FJyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time, doctor_info.UserName, roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 			saveLog(result, requestLog, "2203", "上传就诊信息")
 			var respJSON2 map[string]interface{}
 			if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
@@ -6019,7 +6019,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 				} else if miConfig.MdtrtareaAdmvs == "350500" {
 
-					result, request_log := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+					result, request_log, _ := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(result), &dat); err == nil {
 						fmt.Println(dat)
@@ -6430,7 +6430,7 @@ func (c *HisApiController) GetUploadInfo() {
 								cert_no = strings.Split(psn_info.CardInfo, "|")[0]
 							}
 							fmt.Println(cert_no)
-							result2, src_resquest = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.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, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+							result2, src_resquest, _ = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.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, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 
 							//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, 0, 0, 0, 0, his.IdType, acct_used_flag)
 							var dat map[string]interface{}
@@ -6875,7 +6875,7 @@ func (c *HisApiController) GetUploadInfo() {
 				}
 				fmt.Println(cert_no)
 
-				result2, src_resquest = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.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, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+				result2, src_resquest, _ = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.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, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 					fmt.Println(dat)
@@ -7771,7 +7771,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 		res2.Infcode = infocode
 
 	} else if miConfig.MdtrtareaAdmvs == "350500" {
-		result, requestLog := service.FJyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time, doctor_info.UserName, roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+		result, requestLog, _ := service.FJyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time, doctor_info.UserName, roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 		saveLog(result, requestLog, "2203", "上传就诊信息")
 		var respJSON2 map[string]interface{}
 		if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
@@ -8013,7 +8013,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 			} else if miConfig.MdtrtareaAdmvs == "350500" {
 
-				result, request_log := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+				result, request_log, _ := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result), &dat); err == nil {
 					fmt.Println(dat)
@@ -8384,7 +8384,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 					} else if miConfig.MdtrtareaAdmvs == "350500" {
 
-						result, request_log := service.FJyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+						result, request_log, _ := service.FJyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 						var dat map[string]interface{}
 						if err := json.Unmarshal([]byte(result), &dat); err == nil {
 							fmt.Println(dat)
@@ -8699,7 +8699,7 @@ func (c *HisApiController) Refund() {
 			res.Infcode = infocode
 
 		} else if miConfig.MdtrtareaAdmvs == "350500" {
-			result, src_resquest = service.FJyb2208(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			result, src_resquest, _ = service.FJyb2208(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -8854,7 +8854,7 @@ func (c *HisApiController) Refund() {
 				res2.Infcode = infocode
 
 			} else if miConfig.MdtrtareaAdmvs == "350500" {
-				result2, src_request := service.FJyb2205(order.PsnNo, order.MdtrtId, order.Number, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+				result2, src_request, _ := service.FJyb2205(order.PsnNo, order.MdtrtId, order.Number, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 					fmt.Println(dat)
@@ -9072,7 +9072,7 @@ func (c *HisApiController) RefundNumber() {
 
 		} else if miConfig.MdtrtareaAdmvs == "350500" {
 
-			result, request := service.FJyb2202(his.PsnNo, his.Number, his.IptOtpNo, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			result, request, _ := service.FJyb2202(his.PsnNo, his.Number, his.IptOtpNo, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -9322,7 +9322,7 @@ func (c *HisApiController) RefundDetail() {
 				return
 			}
 		} else if miConfig.MdtrtareaAdmvs == "350500" {
-			result2, src_request := service.FJyb2205(his.PsnNo, his.Number, order.Number, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			result2, src_request, _ := service.FJyb2205(his.PsnNo, his.Number, order.Number, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 				fmt.Println(dat)
@@ -10230,7 +10230,8 @@ func (c *HisApiController) GetSettleAccounts() {
 			res.Infcode = infocode
 
 		} else if miConfig.MdtrtareaAdmvs == "350500" {
-			result := service.FJyb5203(baseParams, businessParams, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			result, requestLog, _ := service.FJyb5203(baseParams, businessParams, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			saveLog(result, requestLog, "5203", "结算单")
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -10244,7 +10245,6 @@ func (c *HisApiController) GetSettleAccounts() {
 				return
 			}
 		} else if miConfig.MdtrtareaAdmvs == "150499" {
-			fmt.Println("~~~~~~~")
 
 			api := "http://172.16.13.254:9532/" + "nmyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +

service/fj_service.go

@@ -8,6 +8,7 @@ import (
 	"golang.org/x/text/encoding/simplifiedchinese"
 	"io/ioutil"
 	"net/http"
+	"regexp"
 	"strconv"
 	"strings"
 	"syscall"
@@ -28,8 +29,8 @@ import (
 )
 
 //
-//// 人员基本信息
-func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, id_card_type int64, card_sn string, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string) {
+// 人员基本信息
+func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, id_card_type int64, card_sn string, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -79,21 +80,15 @@ func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error(), ""
+		return err.Error(), "", ""
 	}
-	//fmt.Println("开始jdk")
-
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
-	fmt.Println("输出信息:")
-	fmt.Println(output)
-	fmt.Println("错误信息：")
-	fmt.Println(err_msg)
-	return output, inputLog
+	return output, inputLog, err_msg
 }
 
 // 门诊挂号
-func FJyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, opter string, doctor_name string, url string, app_id string, app_secret string, sign_key string, enc_key string, card_number string) (string, string) {
+func FJyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, opter string, doctor_name string, url string, app_id string, app_secret string, sign_key string, enc_key string, card_number string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -137,20 +132,17 @@ func FJyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error(), ""
+		return err.Error(), "", ""
 	}
 
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
-	fmt.Println("输出信息:")
-	fmt.Println(output)
-	fmt.Println("错误信息：")
-	fmt.Println(err_msg)
-	return ConvertToString(output, "gbk", "utf-8"), requestLog
+
+	return output, requestLog, err_msg
 }
 
-// 门诊挂号撤销
-func FJyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string) {
+//门诊挂号撤销
+func FJyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -176,20 +168,17 @@ func FJyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	requestLog = string(bytesData)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error(), ""
+		return err.Error(), "", ""
 	}
 
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
-	fmt.Println("输出信息:")
-	fmt.Println(output)
-	fmt.Println("错误信息：")
-	fmt.Println(err_msg)
-	return ConvertToString(output, "gbk", "utf-8"), requestLog
+
+	return output, requestLog, err_msg
 }
 
 // 门诊就诊信息上传
-func FJyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, begin_time string, doctor_name string, opter string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string) {
+func FJyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, begin_time string, doctor_name string, opter string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -204,7 +193,7 @@ func FJyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	inputData := make(map[string]interface{})
 	diseinfo := make([]map[string]interface{}, 0)
 
-	inputMessage["infno"] = "2203"  // 交易编码
+	inputMessage["infno"] = "2203A" // 交易编码
 	inputData["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
 	inputData["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
 	//inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
@@ -249,27 +238,20 @@ func FJyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	requestLog = string(bytesData)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error(), ""
+		return err.Error(), "", ""
 	}
 
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
-	fmt.Println("输出信息:")
-	fmt.Println(output)
-	fmt.Println("错误信息：")
-	fmt.Println(err_msg)
-	return output, requestLog
+
+	return output, requestLog, err_msg
 }
 
 //  门诊费用明细信息上传
-func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string, opter string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string) {
+func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string, opter string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	//tempTime := time.Unix(timestamp, 0)
-	//timeFormat := tempTime.Format("20060102150405")
-	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
-	//chrgBchno := rand.Intn(100000) + 10000
 
 	var customs []*Custom
 
@@ -427,27 +409,21 @@ func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	inputMessage["input"] = input //交易输入
 	var requestLog string
 	bytesData, err := json.Marshal(inputMessage)
-	fmt.Println("----------")
-	fmt.Println(string(bytesData))
-	fmt.Println("----------")
 	requestLog = string(bytesData)
 	if err != nil {
 		fmt.Println(err.Error())
-		return "", ""
+		return "", "", ""
 	}
 
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
-	fmt.Println("输出信息:")
-	fmt.Println(output)
-	fmt.Println("错误信息：")
-	fmt.Println(err_msg)
-	return output, requestLog
+
+	return output, requestLog, err_msg
 
 }
 
 //  门诊费用明细信息撤销
-func FJyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string) {
+func FJyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -472,21 +448,17 @@ func FJyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	requestLog = string(bytesData)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error(), ""
+		return err.Error(), "", ""
 	}
 
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
-	fmt.Println("输出信息:")
-	fmt.Println(output)
-	fmt.Println("错误信息：")
-	fmt.Println(err_msg)
-	return output, requestLog
+
+	return output, requestLog, err_msg
 }
 
 //  门诊预结算
-//func Hbyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, secret_key string) string {
-func FJyb2206(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, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string) {
+func FJyb2206(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, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -546,20 +518,17 @@ func FJyb2206(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(), "", ""
 	}
 
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
-	fmt.Println("输出信息:")
-	fmt.Println(output)
-	fmt.Println("错误信息：")
-	fmt.Println(err_msg)
-	return output, requestLog
+
+	return output, requestLog, err_msg
 }
 
 //  门诊结算
-func FJyb2207(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, certificates int64, acct_used_flag string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string) {
+func FJyb2207(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, certificates int64, acct_used_flag string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -616,7 +585,7 @@ func FJyb2207(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(), "", ""
 	}
 
 	var requestLog string
@@ -624,15 +593,11 @@ func FJyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
-	fmt.Println("输出信息:")
-	fmt.Println(output)
-	fmt.Println("错误信息：")
-	fmt.Println(err_msg)
-	return output, requestLog
+	return output, requestLog, err_msg
 }
 
 //  门诊结算撤销
-func FJyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string) {
+func FJyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -656,28 +621,21 @@ func FJyb2208(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(), "", ""
 	}
-
 	var requestLog string
 	requestLog = string(bytesData)
-
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
-	fmt.Println("输出信息:")
-	fmt.Println(output)
-	fmt.Println("错误信息：")
-	fmt.Println(err_msg)
-	return output, requestLog
+	return output, requestLog, err_msg
 }
 
-func FJyb5203(baseParams models.BaseParams, businessParams models.BusinessParams, url string, app_id string, app_secret string, sign_key string, enc_key string) string {
+func FJyb5203(baseParams models.BaseParams, businessParams models.BusinessParams, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 
 	// 生成输入报文
-	//inputMessage := SetFjInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,url,app_id,app_secret,sign_key,enc_key)
 
 	inputMessage := SetFjInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs, url, app_id, app_secret, sign_key, enc_key)
 	input := make(map[string]interface{})
@@ -690,19 +648,18 @@ func FJyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)
-	fmt.Println(string(bytesData))
+
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), "", ""
 	}
 
+	var requestLog string
+	requestLog = string(bytesData)
+
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
-	fmt.Println("输出信息:")
-	fmt.Println(output)
-	fmt.Println("错误信息：")
-	fmt.Println(err_msg)
-	return output
+	return output, requestLog, err_msg
 }
 
 //确认订单
@@ -2470,13 +2427,13 @@ func GetFjBusinessHandleInfo(inputStr []byte) (string, string) {
 	errMessageStr := make([]byte, 2048)
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&inputStr[0])), uintptr(20000), (uintptr)(unsafe.Pointer(&outputStr[0])), (uintptr)(unsafe.Pointer(&errMessageStr[0])))
 
-	fmt.Println("错误信息1:", ConvertByte2String(errMessageStr, GB18030))
-	fmt.Println("输出信息1:", ConvertByte2String(outputStr, GB18030))
+	output_info := ConvertByte2String(outputStr, GB18030)
+	error_info := ConvertByte2String(errMessageStr, GB18030)
 
 	if ret2 != 0 {
 		return "", ""
 	}
-	return ConvertByte2String([]byte(Remove0000(string(outputStr))), GB18030), ConvertByte2String([]byte(Remove0000(string(errMessageStr))), GB18030)
+	return DeleteExtraSpace(output_info), DeleteExtraSpace(error_info)
 }
 
 func GetFjAuthorizationInfo(org_id string) {
@@ -2521,3 +2478,18 @@ func ConvertByte2String(byte []byte, charset Charset) string {
 
 	return str
 }
+
+func DeleteExtraSpace(s string) string {
+	//删除字符串中的多余空格，有多个空格时，仅保留一个空格
+	s1 := strings.Replace(s, "  ", " ", -1)      //替换tab为空格
+	regstr := "\\s{2,}"                          //两个及两个以上空格的正则表达式
+	reg, _ := regexp.Compile(regstr)             //编译正则表达式
+	s2 := make([]byte, len(s1))                  //定义字符数组切片
+	copy(s2, s1)                                 //将字符串复制到切片
+	spc_index := reg.FindStringIndex(string(s2)) //在字符串中搜索
+	for len(spc_index) > 0 {                     //找到适配项
+		s2 = append(s2[:spc_index[0]+1], s2[spc_index[1]:]...) //删除多余空格
+		spc_index = reg.FindStringIndex(string(s2))            //继续在字符串中搜索
+	}
+	return string(s2)
+}