perf: 住院优化

Business/HisMainBusiness.cs

@@ -155,22 +155,13 @@ namespace PTMedicalInsurance.Business
             inf.dev_safe_info = "";
             inf.dev_no = Global.curEvt.mac;
 
-            inf.cardURL = inf.centerURL;
-            inf.ecURL = "http://ec.yn.hsip.gov.cn/localcfc/api/hsecfc/localQrCodeQuery";
-
-            //inf.BusinessID = "41a8514ba8ed429eb4dde381eda02fe0";   //商务ID码 
-            //inf.CreditID = "91530112MA6Q3GGC1E";                   //服务商统一社会信用代码
-
-            //if (string.IsNullOrEmpty(inf.areaCode) || inf.areaCode.Substring(0, 4) == "3401")
-            //{
-            //    inf.areaCode = "340100";
-            //    Global.user.ID = "7571C4995A2F4290";
-            //}
-            //else
-            //{
-            //    inf.areaCode = "349900";
-            //    Global.user.ID = "48664E4455CC0F8F";
-            //}
+            inf.cardURL = "http://10.77.211.236/1.0.0/agent-card-init";
+            inf.ecURL = JsonHelper.getDestValue(joInpar, "CenterURL2");
+
+            //获取AK，SK
+            IniFile urlIni = new IniFile(Global.curEvt.path + @"\EncrypInfo.ini");
+            inf.AK = urlIni.ReadValue("KEY", "AK");
+            inf.SK = urlIni.ReadValue("KEY", "SK");
 
             inf.cainfo = "";
 
@@ -806,24 +797,7 @@ namespace PTMedicalInsurance.Business
                     joMdtrtinfo.Add("dise_type_code", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.dise_type_code"));          //病种类型
                     joMdtrtinfo.Add("exp_content", ExportObj);          //字段扩展
                     joMdtrtinfo.Add("insuplc_admdvs", Global.pat.insuplc_admdvs);          //参保地医保区划
-                    joMdtrtinfo.Add("mdtrtarea_admvs", Global.pat.mdtrtarea_admvs);          //就医地医保区划
-
-                    // 异地就医标志 （济南个性化）
-                    //string otherAreaFlag = "10";
-                    //if (!Utils.isOtherCity() || Global.inf.interfaceDr == 28) {
-                    //    otherAreaFlag = "01"; //本地
-                    //}
-                    //joMdtrtinfo.Add("otherAreaFlag", otherAreaFlag);
-                    //string insuCode = ""; //参保地编码
-                    //string insuAdmOrgName = ""; //参保机构名称
-                    //if (!Utils.isOtherProvice() && Utils.isOtherCity())
-                    //{
-                    //    //省内异地
-                    //    insuCode = Global.pat.insuplc_admdvs;
-                    //    insuAdmOrgName = Global.pat.insuplc_name;
-                    //}
-                    //joMdtrtinfo.Add("insuCode", insuCode);
-                    //joMdtrtinfo.Add("insuAdmOrgName", insuAdmOrgName);
+                    joMdtrtinfo.Add("mdtrtarea_admvs", Global.inf.areaCode);          //就医地医保区划
 
                     joReg.Add("mdtrtinfo", joMdtrtinfo);
                     joReg.Add("diseinfo", jaConvertedDiagnoses);
@@ -972,7 +946,7 @@ namespace PTMedicalInsurance.Business
                             }
                     }
 
-                    if (jaDiagnoses[i]["diaTypeCode"].ToString() == "DIS") //出院
+                    if (jaDiagnoses[i]["diaTypeCode"].ToString() == "DIS" || jaDiagnoses[i]["diaTypeCode"].ToString() == "ADD") //入院、出院
                     {
                         jaConvertedDiagnoses.Add(jaDiagnoses[i]);
                     }
@@ -993,6 +967,7 @@ namespace PTMedicalInsurance.Business
                 
 
                 frmReg.DtDiagnose = (DataTable)jaConvertedDiagnoses.ToObject(typeof(DataTable));
+                frmReg.hideBaseInfo();
                 if (tools.ShowAppDiaglog(frmReg) == DialogResult.OK)
                 {
                     string diseCodg = "", diseName = "";
@@ -1064,8 +1039,8 @@ namespace PTMedicalInsurance.Business
                     joSetlInpar.Add("mdtrt_id", Global.pat.mdtrtID);
                     joSetlInpar.Add("acct_used_flag", frmReg.personAccountUsedFlag);//个人账户使用标志
                     joSetlInpar.Add("insutype", frmReg.insuType);//险种类型
-                    //joSetlInpar.Add("insuplc_admdvs", Global.pat.insuplc_admdvs);
-                    //joSetlInpar.Add("mdtrtarea_admvs", Global.inf.areaCode);
+                    joSetlInpar.Add("insuplc_admdvs", Global.pat.insuplc_admdvs);
+                    joSetlInpar.Add("mdtrtarea_admvs", Global.inf.areaCode);
                     joSetlInpar.Add("invono", "");
                     joSetlInpar.Add("mid_setl_flag", "0");
                     joSetlInpar.Add("fulamt_ownpay_amt", JsonHelper.getDestValue(joSumFee, "data.FullOwnPayAmount"));
@@ -1449,13 +1424,6 @@ namespace PTMedicalInsurance.Business
 
                             pat.ecCardNo = JsonHelper.getDestValue(joInparam, "params[0].patientInfo.output.cardecinfo.ecCardNo");
 
-                            //增加业务码
-                            pat.card.BusinessCode = JsonHelper.getDestValue(joInparam, "params[0].patientInfo.output.baseinfo.bizCode");
-                            if ("03".Equals(pat.mdtrtcertType)) {
-                                //此时为卡号
-                                pat.card.NO = pat.mdtrtcertNO;
-                                pat.mdtrtcertNO = JsonHelper.getDestValue(joInparam, "params[0].patientInfo.output.baseinfo.certno");
-                            }
                             break;
                         }
                     case "Z2C"://入院登记取消

Business/Inpatient/IPPreSettlementProcess.cs

@@ -121,19 +121,6 @@ namespace PTMedicalInsurance.Business
             JObject joConverted = JObject.Parse(outParam);
 
             #region 济南扩展
-            //string useAccountFlag = JsonHelper.getDestValue(jo2303Inpar, "acct_used_flag");
-            //string acctPay = JsonHelper.getDestValue(joConverted, "setlinfo.acct_pay") ;
-            //if (!"1".Equals(useAccountFlag))
-            //{
-            //    //不使用个人账户
-            //    acctPay = "0";
-            //}
-
-            //JObject expContentObj = (JObject)jo2303Inpar["exp_content"] ?? new JObject();
-            //expContentObj.Add("acct_payamt", acctPay);
-            //jo2303Inpar["exp_content"] = expContentObj;
-            ////返回
-            //joRtn["Settlement"] = jo2303Inpar;
 
             #endregion
 

Business/Local/TestProcess.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PTMedicalInsurance.Business.Local
+namespace PTMedicalInsurance.Business
 {
     public class TestProcess
     {
@@ -17,7 +17,10 @@ namespace PTMedicalInsurance.Business.Local
             //OPSettlementProcess process = new OPSettlementProcess();
             //process.Process(joInput);
 
-            JObject joSetlinfo = JObject.Parse(JsonHelper.getDestValue(joInput, "output.setlinfo"));
+            IPSettlementProcess process = new IPSettlementProcess();
+            process.Process(joInput);
+
+            //JObject joSetlinfo = JObject.Parse(JsonHelper.getDestValue(joInput, "output.setlinfo"));
 
             //济南未返回基金分项，手工拆分
             //JArray fundArray = new LocalPayFundSplitService().Split(joSetlinfo);
@@ -26,18 +29,18 @@ namespace PTMedicalInsurance.Business.Local
             //    joInput["output"]["setldetail"] = fundArray;
             //}
 
-            JObject joParam = new JObject();
-            joParam.Add("admID", Global.pat.adm_Dr);
-            joParam.Add("recordID", Global.pat.recordID);
-            joParam.Add("billID", Global.pat.billID);
-            string outParam = "";
+            //JObject joParam = new JObject();
+            //joParam.Add("admID", Global.pat.adm_Dr);
+            //joParam.Add("recordID", Global.pat.recordID);
+            //joParam.Add("billID", Global.pat.billID);
+            //string outParam = "";
 
-            HisIrisServices hIS = new HisIrisServices();
+            //HisIrisServices hIS = new HisIrisServices();
 
-            if (hIS.preSettlementInfo(joParam, joSetlinfo, out outParam) != 0)
-            {
-                Console.WriteLine(outParam);
-            }
+            //if (hIS.preSettlementInfo(joParam, joSetlinfo, out outParam) != 0)
+            //{
+            //    Console.WriteLine(outParam);
+            //}
 
             Global.writeLog(joInput.ToString());
 

Forms/Clearing.cs

@@ -84,14 +84,6 @@ namespace PTMedicalInsurance.Forms
         {
             DataTable dtInteface = (DataTable)cbxInterface.DataSource;
             int i = cbxInterface.SelectedIndex;
-            if (i != 2)
-            {
-                Global.pat.insuplc_admdvs = "";
-            }
-            else
-            {
-                Global.pat.insuplc_admdvs = "530199";
-            }
             Global.inf.hospitalNO = dtInteface.Rows[i]["HospitalNO"].ToString();
             Global.inf.hospitalName = dtInteface.Rows[i]["HospitalName"].ToString();
             Global.inf.centerURL = dtInteface.Rows[i]["CenterURL"].ToString();
@@ -112,14 +104,6 @@ namespace PTMedicalInsurance.Forms
         {
             DataTable dtInteface = (DataTable)cbInterface_2.DataSource;
             int i = cbInterface_2.SelectedIndex;
-            if (i != 2)
-            {
-                Global.inf.areaCode = "";
-            }
-            else
-            {
-                Global.pat.insuplc_admdvs = "530100";
-            }
             Global.inf.hospitalNO = dtInteface.Rows[i]["HospitalNO"].ToString();
             Global.inf.hospitalName = dtInteface.Rows[i]["HospitalName"].ToString();
             Global.inf.centerURL = dtInteface.Rows[i]["CenterURL"].ToString();
@@ -140,14 +124,6 @@ namespace PTMedicalInsurance.Forms
         {
             DataTable dtInteface = (DataTable)cbInterface_2.DataSource;
             int i = cbInterface_2.SelectedIndex;
-            if (i != 2)
-            {
-                Global.inf.areaCode = "";
-            }
-            else
-            {
-                Global.pat.insuplc_admdvs = "530100";
-            }
             Global.inf.hospitalNO = dtInteface.Rows[i]["HospitalNO"].ToString();
             Global.inf.hospitalName = dtInteface.Rows[i]["HospitalName"].ToString();
             Global.inf.centerURL = dtInteface.Rows[i]["CenterURL"].ToString();

Forms/HandleException.cs

@@ -299,7 +299,7 @@ namespace PTMedicalInsurance.Forms
             if (Chk_DealNo.Checked)
             {
                 //自定义交易
-                joRtn = invoker.invokeCenterService(JsonHelper.setCenterInpar(tb_DealNo.Text, JObject.Parse(rtbInparam.Text)));
+                joRtn = invoker.invokeCenterAgentService(tb_DealNo.Text,JObject.Parse(rtbInparam.Text));
             }
             else
             {

Forms/InpatientRegistration.cs

@@ -130,6 +130,18 @@ namespace PTMedicalInsurance.Forms
 
         public string personAccountUsedFlag = "0";
 
+        public void hideBaseInfo()
+        {
+            pnlBottom.Top = pnlCenter.Top;
+            pnlBottom.Location = new Point(0, 160);
+            
+            pnlCenter.Top = 0;
+            pnlCenter.Left = 0;
+            this.Size = new Size(this.Width, this.Height - pnlHeader.Height);
+
+            grpHeader.Height = 0;
+            grpHeader.Visible = false;
+        }
 
         public void initBaseInfo(JObject jObject)
         {

Forms/InpatientRegistration.designer.cs

@@ -30,7 +30,7 @@ namespace PTMedicalInsurance.Forms
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
             this.pnlHeader = new System.Windows.Forms.Panel();
             this.grpHeader = new Sunny.UI.UIGroupBox();
             this.txtBirthDay = new Sunny.UI.UITextBox();
@@ -516,13 +516,13 @@ namespace PTMedicalInsurance.Forms
             // 
             this.dgvDiagnose.AllowUserToAddRows = false;
             this.dgvDiagnose.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.ButtonShadow;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("新宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDiagnose.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.ButtonShadow;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("新宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDiagnose.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
             this.dgvDiagnose.ColumnHeadersHeight = 40;
             this.dgvDiagnose.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvDiagnose.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -664,7 +664,6 @@ namespace PTMedicalInsurance.Forms
             this.pnlCenter.Controls.Add(this.label3);
             this.pnlCenter.Controls.Add(this.label2);
             this.pnlCenter.Controls.Add(this.label1);
-            this.pnlCenter.Dock = System.Windows.Forms.DockStyle.Top;
             this.pnlCenter.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pnlCenter.Location = new System.Drawing.Point(0, 144);
             this.pnlCenter.Name = "pnlCenter";
@@ -763,7 +762,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxExitway.sDisplayField = "";
             this.dblkcbxExitway.sDisplayMember = "";
             this.dblkcbxExitway.SeparatorChar = "|";
-            this.dblkcbxExitway.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxExitway.Size = new System.Drawing.Size(257, 26);
             this.dblkcbxExitway.sKeyWords = "";
             this.dblkcbxExitway.sValueMember = "";
             this.dblkcbxExitway.TabIndex = 62;
@@ -777,7 +776,7 @@ namespace PTMedicalInsurance.Forms
             this.label5.Location = new System.Drawing.Point(492, 124);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(98, 22);
+            this.label5.Size = new System.Drawing.Size(89, 19);
             this.label5.TabIndex = 61;
             this.label5.Text = "本地编码";
             // 
@@ -788,7 +787,7 @@ namespace PTMedicalInsurance.Forms
             this.label8.Location = new System.Drawing.Point(492, 73);
             this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(98, 22);
+            this.label8.Size = new System.Drawing.Size(89, 19);
             this.label8.TabIndex = 60;
             this.label8.Text = "离院方式";
             // 
@@ -803,7 +802,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxSettelmentWay.sDisplayField = "";
             this.dblkcbxSettelmentWay.sDisplayMember = "";
             this.dblkcbxSettelmentWay.SeparatorChar = "|";
-            this.dblkcbxSettelmentWay.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxSettelmentWay.Size = new System.Drawing.Size(257, 26);
             this.dblkcbxSettelmentWay.sKeyWords = "";
             this.dblkcbxSettelmentWay.sValueMember = "";
             this.dblkcbxSettelmentWay.TabIndex = 59;
@@ -821,7 +820,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxDisease.sDisplayField = "";
             this.dblkcbxDisease.sDisplayMember = "";
             this.dblkcbxDisease.SeparatorChar = "|";
-            this.dblkcbxDisease.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxDisease.Size = new System.Drawing.Size(257, 26);
             this.dblkcbxDisease.sKeyWords = "";
             this.dblkcbxDisease.sValueMember = "";
             this.dblkcbxDisease.TabIndex = 58;
@@ -839,7 +838,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxMedicalType.sDisplayField = "";
             this.dblkcbxMedicalType.sDisplayMember = "";
             this.dblkcbxMedicalType.SeparatorChar = "|";
-            this.dblkcbxMedicalType.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxMedicalType.Size = new System.Drawing.Size(257, 26);
             this.dblkcbxMedicalType.sKeyWords = "";
             this.dblkcbxMedicalType.sValueMember = "";
             this.dblkcbxMedicalType.TabIndex = 57;
@@ -857,7 +856,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxInsuranceType.sDisplayField = "";
             this.dblkcbxInsuranceType.sDisplayMember = "";
             this.dblkcbxInsuranceType.SeparatorChar = "|";
-            this.dblkcbxInsuranceType.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxInsuranceType.Size = new System.Drawing.Size(257, 26);
             this.dblkcbxInsuranceType.sKeyWords = "";
             this.dblkcbxInsuranceType.sValueMember = "";
             this.dblkcbxInsuranceType.TabIndex = 56;
@@ -871,7 +870,7 @@ namespace PTMedicalInsurance.Forms
             this.label4.Location = new System.Drawing.Point(492, 21);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(98, 22);
+            this.label4.Size = new System.Drawing.Size(89, 19);
             this.label4.TabIndex = 55;
             this.label4.Text = "医疗类别";
             // 
@@ -882,7 +881,7 @@ namespace PTMedicalInsurance.Forms
             this.label3.Location = new System.Drawing.Point(53, 119);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(98, 22);
+            this.label3.Size = new System.Drawing.Size(89, 19);
             this.label3.TabIndex = 54;
             this.label3.Text = "结算方式";
             // 
@@ -893,7 +892,7 @@ namespace PTMedicalInsurance.Forms
             this.label2.Location = new System.Drawing.Point(53, 70);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(98, 22);
+            this.label2.Size = new System.Drawing.Size(89, 19);
             this.label2.TabIndex = 53;
             this.label2.Text = "病种名称\r\n";
             // 
@@ -904,7 +903,7 @@ namespace PTMedicalInsurance.Forms
             this.label1.Location = new System.Drawing.Point(53, 21);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(98, 22);
+            this.label1.Size = new System.Drawing.Size(89, 19);
             this.label1.TabIndex = 52;
             this.label1.Text = "险种类型";
             // 
@@ -916,6 +915,7 @@ namespace PTMedicalInsurance.Forms
             this.Controls.Add(this.pnlCenter);
             this.Controls.Add(this.pnlHeader);
             this.Font = new System.Drawing.Font("新宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "InpatientRegistration";
             this.Text = "医保登记";

Helper/InvokeHelper.cs

@@ -177,6 +177,24 @@ namespace PTMedicalInsurance.Helper
 
         #region 医保中心调用
 
+        /// <summary>
+        /// 仅辅助交易、自定义交易使用
+        /// </summary>
+        /// <param name="funNo"></param>
+        /// <param name="joInput"></param>
+        /// <returns></returns>
+        public JObject invokeCenterAgentService(string funNo, JObject joInput)
+        {
+            Global.curEvt.URL = Global.inf.centerURL + Global.curEvt.funNo;
+            string data = JsonHelper.setCenterInpar(funNo, joInput);
+            //if (funNo.StartsWith("35"))
+            //{
+            //    // 进销存测试
+            //    Global.curEvt.URL = "http://10.42.149.235:9091/hss/api/hiinterface";
+            //}
+            return invokeCenterService(data);
+        }
+
         private JObject invokeCenterService(string data, ModeEnum mode = ModeEnum.REST)
         {
             JObject joRtn = new JObject();
@@ -288,17 +306,6 @@ namespace PTMedicalInsurance.Helper
             return joRtn;
         }
 
-        /// <summary>
-        /// 预留自定义交易
-        /// </summary>
-        /// <param name="data"></param>
-        /// <returns></returns>
-        public JObject invokeCenterService(string data)
-        {
-            Global.curEvt.URL = Global.inf.centerURL;
-            return invokeCenterService(data, ModeEnum.REST);
-        }
-
         /// <summary>
         /// 医保目录txt文件下载
         /// </summary>

Helper/JsonHelper.cs

@@ -259,11 +259,6 @@ namespace PTMedicalInsurance.Helper
             Global.curEvt.msgid = Global.inf.hospitalNO + DateTime.Now.ToString("yyyyMMddHHmmssffff");
             Jo.msgid = Global.curEvt.msgid;
 
-            if (Global.inf.areaCode == "")
-            {
-                Global.inf.areaCode = "530100";
-            }
-
             if (Global.pat.insuplc_admdvs == "")
             {
                 Global.pat.insuplc_admdvs = Global.inf.areaCode;

InsuBusiness.cs

@@ -703,10 +703,8 @@ namespace PTMedicalInsurance
                 }
 
                 Global.pat.insuplc_admdvs = JsonHelper.getDestValue(joInParam, "insuplc_admdvs");
-                TradeEnum trade = TradeEnum.DEFAULT.GetByCode(funNO);
 
-
-                JObject joRtn = invoker.invokeCenterService(trade, joParam);
+                JObject joRtn = invoker.invokeCenterAgentService(funNO, joParam);
                 if (JsonHelper.parseCenterRtnValue(joRtn, out errMsg) != 0)
                 {
                     rtnResult = JsonHelper.setExceptionJson(-1, "平台直连错误", errMsg).ToString();