perf: 提示优化

Business/AbstractProcess.cs

@@ -54,7 +54,7 @@ namespace PTMedicalInsurance.Business
         protected CallResult Exception(int code, string errMsg,string param)
         {
             outParam = JsonHelper.setExceptionJson(code, errMsg, param).ToString();
-            return new CallResult(code, errMsg, outParam);
+            return new CallResult(code, errMsg, outParam,param);
         }
         protected CallResult Exception(string errMsg, string param)
         {
@@ -64,7 +64,7 @@ namespace PTMedicalInsurance.Business
         protected CallResult IrisReturn(string msg,JObject obj)
         {
             outParam = JsonHelper.setIrisReturnValue(0, msg, obj).ToString();
-            return new CallResult(0, msg, outParam);
+            return new CallResult(0, msg, outParam,obj);
         }
 
         /// <summary>

Business/Basic/PatientService.cs

@@ -27,7 +27,7 @@ namespace PTMedicalInsurance.Business
         public int readCard(out string outParam)
         {
             CallResult ret = new ReadCardProcess().Process(null);
-            outParam = ret.Data;
+            outParam = ret.PureData?.ToString();
             return ret.Code;
         }
 

Business/CallResult.cs

@@ -17,11 +17,22 @@ namespace PTMedicalInsurance.Business
 
         public string Data { set; get; }
 
+        public object PureData { set; get; }
+
         public CallResult(int code, string errMsg, string data)
         {
             Code = code;
             ErrMsg = errMsg;
             Data = data;
+            PureData = data;
+        }
+
+        public CallResult(int code, string errMsg, string data,object pure)
+        {
+            Code = code;
+            ErrMsg = errMsg;
+            Data = data;
+            PureData = pure;
         }
 
         public bool Success {

Business/Local/ReadCardProcess.cs

@@ -115,6 +115,9 @@ namespace PTMedicalInsurance.Business
         /// <returns></returns>
         public int trade1101(out string outParam)
         {
+
+            Utils.GetInsuCode();
+
             outParam = "";
             string errorMsg = "";
             JObject joInput = new JObject();

Common/AppExtension.cs

@@ -1,5 +1,6 @@
 using Newtonsoft.Json.Linq;
 using PTMedicalInsurance.Entity;
+using PTMedicalInsurance.Helper;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -68,6 +69,18 @@ namespace PTMedicalInsurance.Common
             if (jtoken == null) return string.Empty;
             return jtoken.ToString();
         }
+        /// <summary>
+        /// 将字符串转为JObject
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        public static string ParseReturnObject(this string text)
+        {
+            if (string.IsNullOrEmpty(text) || !text.StartsWith("{")) {
+                return JsonHelper.setIrisReturnValue(-1, text, null).ToString();
+            }
+            return JsonHelper.setIrisReturnValue(0, "", JObject.Parse(text)).ToString();
+        }
 
         public static int Int(this JToken jtoken)
         {

Common/Utils.cs

@@ -219,7 +219,11 @@ namespace PTMedicalInsurance.Common
             else
             {
                 //异地判断
-                if (Global.pat.insuplc_admdvs.Substring(0, 4) != Global.inf.areaCode.Substring(0, 4))
+                if (Global.pat.insuplc_admdvs.Substring(0, 2) != "36")
+                {
+                    //全国异地不变
+                }
+                else if (Global.pat.insuplc_admdvs.Substring(0, 4) != Global.inf.areaCode.Substring(0, 4))
                 {
                     Global.inf.areaCode = "369900";
                 }

Helper/InvokeHelper.cs

@@ -197,7 +197,7 @@ namespace PTMedicalInsurance.Helper
         /// <returns></returns>
         public JObject invokeCenterAgentService(string funNo, JObject joInput)
         {
-            Global.curEvt.URL = Global.inf.centerURL + Global.curEvt.funNo;
+            Global.curEvt.URL = Global.inf.centerURL + funNo;
             string data = JsonHelper.setCenterInpar(funNo, joInput);
             //if (funNo.StartsWith("35"))
             //{

InsuBusiness.cs

@@ -194,7 +194,8 @@ namespace PTMedicalInsurance
                             //打开读卡窗口，操作员选择读卡类型后进行读卡器读卡，再进行1101获取参保信息
                             PatientService patientService = new PatientService();
                             patientService.readPatientInfo(out outParam);
-                            rtnResult = JsonHelper.setIrisReturnValue(0, "", JObject.Parse(outParam)).ToString();
+                            // 同时支持返回错误信息和对象
+                            rtnResult = outParam.ParseReturnObject();
                             break;
                         }     
                 }