fix:bug

Business/Basic/OPSettlementService.cs

@@ -23,7 +23,7 @@ namespace PTMedicalInsurance.Business
             .Add(new ReadPatientProcess())
             // 挂号[2201] 
             .Add(new OPRegProcess())
-            // 就诊信息上传[2203]
+            // 就诊信息上传[2203A]
             .Add(new OPAdmUploadProcess())
             // 费用上传[2204] 
             .Add(new OPFeeUploadProcess())

Business/HisMainBusiness.cs

@@ -733,7 +733,7 @@ namespace PTMedicalInsurance.Business
                     diseName = frmReg.diseName??"";
 
                     JObject ExportObj = new JObject();
-                    ExportObj.Add("local_dise", diseCodg);  //本地病种编码
+                    ExportObj.Add("local_dise", frmReg.local_dise_code);  //本地病种编码
                     ExportObj.Add("sin_dise_codg", "");              //单病种编码
                     ExportObj.Add("cla_trt_flag", frmReg.claTrtFlag);       //分级诊疗标志
                     ExportObj.Add("unif_pay_std_typ", frmReg.unifPayStdType);           //包干标准类型
@@ -1004,6 +1004,8 @@ namespace PTMedicalInsurance.Business
                 if (frmReg.ShowDialog() == DialogResult.OK)
                 {
                     string diseCodg = "", diseName = "";
+                    diseCodg = frmReg.diseCodg;
+                    diseName = frmReg.diseName;
                     if (string.IsNullOrEmpty(frmReg.diseCodg))
                     {
                         diseCodg = JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.dscg_maindiag_code");
@@ -1065,9 +1067,15 @@ namespace PTMedicalInsurance.Business
                     joDscgInfo.Add("insuplc_admdvs", Global.pat.insuplc_admdvs);          //参保地医保区划
                     joDscgInfo.Add("mdtrtarea_admvs", Global.inf.areaCode);          //就医地医保区划
 
+                    JObject joRegExp = new JObject();
+                    joRegExp.Add("local_dise", local_dise);              //单病种编码
+                    joRegExp.Add("old_mdtrt_id", "");
+
                     JObject joRegInpar = new JObject();
                     joRegInpar.Add("dscginfo", joDscgInfo);
                     joRegInpar.Add("diseinfo", jaConvertedDiagnoses);
+                    joRegInpar.Add("exp_content", joRegExp); //11111
+
 
                     //结算入参
                     JObject joSetlInpar = new JObject();

Business/Local/ReadCardProcess.cs

@@ -73,8 +73,9 @@ namespace PTMedicalInsurance.Business
                         {
                             //清除原数据
                             trade1101(out outParam);
+                            return Success();
                         }
-                        return Success();
+                        return Error("读卡失败："+outParam);
                         #endregion
 
                     }
@@ -201,7 +202,7 @@ namespace PTMedicalInsurance.Business
             {
                 Global.pat.mdtrtcertNO = Global.pat.card.NO;
             }
-
+            // 没有卡号用证件号
             if (string.IsNullOrEmpty(Global.pat.mdtrtcertNO))
             {
                 Global.pat.mdtrtcertNO = Global.pat.certNO;

Business/Outpatient/OPAdmUploadProcess.cs

@@ -12,7 +12,7 @@ namespace PTMedicalInsurance.Business
     {
         public override CallResult Process(JObject joInput)
         {
-            JObject jo2203Rtn = invoker.invokeCenterService(TradeEnum.OutpatientAdmUpload, joInput);
+            JObject jo2203Rtn = invoker.invokeCenterService(TradeEnum.OutpatientAdmUploadA, joInput);
             if (JsonHelper.parseCenterRtnValue(jo2203Rtn, out outParam) != 0)
             {
                 return Error("门诊就诊信息上传失败");

Business/Outpatient/OPPreSettlementProcess.cs

@@ -29,7 +29,7 @@ namespace PTMedicalInsurance.Business
             JObject joSettlement = JObject.Parse(JsonHelper.getDestValue(joReg, "settlement"));
             //修改joSettlement的就诊ID ,总金额等
             joSettlement["mdtrt_id"] = Global.pat.mdtrtID;
-            joSettlement["mdtrt_cert_no"] = Global.pat.mdtrtcertNO;   //与计算不需要转换
+            joSettlement["mdtrt_cert_no"] = Utils.ConvertMdtrtcertNo(false);   //预结算不需要转换
             joSettlement["medfee_sumamt"] = JsonHelper.getDestValue(joSumFee, "data.Sumamt");
 
             // 个性化（济南）,费用不单独上传

Forms/ChooseCard.cs

@@ -40,18 +40,18 @@ namespace PTMedicalInsurance.Forms
 
             Global.pat.OtherProv = rbgOtherProv.SelectedIndex;
 
-            if (rbgCardType.SelectedIndex == 0)
-            {
-                if (string.IsNullOrEmpty(tbID.Text.Trim()))
-                {
-                    MessageBox.Show("请先扫电子医保码!");
-                    tbID.Focus();
-                    return;
-                } else
-                {
-                    Global.pat.ecCardNo = tbID.Text.Trim();
-                }
-            }
+            //if (rbgCardType.SelectedIndex == 0)
+            //{
+            //    if (string.IsNullOrEmpty(tbID.Text.Trim()))
+            //    {
+            //        MessageBox.Show("请先扫电子医保码!");
+            //        tbID.Focus();
+            //        return;
+            //    } else
+            //    {
+            //        Global.pat.ecCardNo = tbID.Text.Trim();
+            //    }
+            //}
 
             if ((rbgOtherProv.SelectedIndex == 1)&&(cbCBD.Text==""))
             {

Forms/InpatientRegistration.cs

@@ -34,11 +34,11 @@ namespace PTMedicalInsurance.Forms
                 SetDBLKCombox(ref dblkcbxInsuranceType, sqlStr);
 
                 sqlStr = "select A.Code, A.Name FROM HB_MedInsuDirectory A where A.ValidFlag='1' And A.HisType=7" + sqlCondition;
-                // 如果登记选择了，则直接用登记的病种
-                if(!string.IsNullOrEmpty(Global.pat.DiseasecCode))
-                {
-                    sqlStr += " and A.Code='" + Global.pat.DiseasecCode + "' ";
-                }
+                //// 如果登记选择了，则直接用登记的病种
+                //if(!string.IsNullOrEmpty(Global.pat.DiseasecCode))
+                //{
+                //    sqlStr += " and A.Code='" + Global.pat.DiseasecCode + "' ";
+                //}
                 SetDBLKCombox(ref dblkcbxDisease, sqlStr);
 
                 sqlStr = " SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr"
@@ -97,6 +97,11 @@ namespace PTMedicalInsurance.Forms
         //病种
         public string dise_type_code { get; set; }
         public string dise_type_name { get; set; }
+
+        /// <summary>
+        /// 本地病种编码
+        /// </summary>
+        public string local_dise_code { get; set; }
         //结算方式
         public string psn_setlway { get; set; }
         public string psn_setlway_name { get; set; }
@@ -201,6 +206,8 @@ namespace PTMedicalInsurance.Forms
                 personAccountUsedFlag = "1";
             }
 
+            this.local_dise_code = txtLocateCode.Text.Trim();
+
             this.DialogResult = DialogResult.OK;
         }
 

Forms/InpatientRegistration.designer.cs

@@ -63,6 +63,8 @@ namespace PTMedicalInsurance.Forms
             this.dise_dor_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.diag_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.label5 = new System.Windows.Forms.Label();
+            this.txtLocateCode = new Sunny.UI.UITextBox();
             this.panel1.SuspendLayout();
             this.panel3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvDiagnose)).BeginInit();
@@ -72,12 +74,14 @@ namespace PTMedicalInsurance.Forms
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.SystemColors.Window;
+            this.panel1.Controls.Add(this.txtLocateCode);
             this.panel1.Controls.Add(this.chkEmergency);
             this.panel1.Controls.Add(this.cbxAccountPay);
             this.panel1.Controls.Add(this.Chk_RelTtpFlag);
             this.panel1.Controls.Add(this.chkDanger);
             this.panel1.Controls.Add(this.Chk_TraumaFlag);
             this.panel1.Controls.Add(this.dblkcbxExitway);
+            this.panel1.Controls.Add(this.label5);
             this.panel1.Controls.Add(this.label8);
             this.panel1.Controls.Add(this.dblkcbxSettelmentWay);
             this.panel1.Controls.Add(this.dblkcbxDisease);
@@ -172,7 +176,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxExitway.sDisplayField = "";
             this.dblkcbxExitway.sDisplayMember = "";
             this.dblkcbxExitway.SeparatorChar = "|";
-            this.dblkcbxExitway.Size = new System.Drawing.Size(257, 26);
+            this.dblkcbxExitway.Size = new System.Drawing.Size(257, 30);
             this.dblkcbxExitway.sKeyWords = "";
             this.dblkcbxExitway.sValueMember = "";
             this.dblkcbxExitway.TabIndex = 44;
@@ -186,7 +190,7 @@ namespace PTMedicalInsurance.Forms
             this.label8.Location = new System.Drawing.Point(506, 82);
             this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(89, 19);
+            this.label8.Size = new System.Drawing.Size(98, 22);
             this.label8.TabIndex = 43;
             this.label8.Text = "离院方式";
             // 
@@ -201,7 +205,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxSettelmentWay.sDisplayField = "";
             this.dblkcbxSettelmentWay.sDisplayMember = "";
             this.dblkcbxSettelmentWay.SeparatorChar = "|";
-            this.dblkcbxSettelmentWay.Size = new System.Drawing.Size(257, 26);
+            this.dblkcbxSettelmentWay.Size = new System.Drawing.Size(257, 30);
             this.dblkcbxSettelmentWay.sKeyWords = "";
             this.dblkcbxSettelmentWay.sValueMember = "";
             this.dblkcbxSettelmentWay.TabIndex = 22;
@@ -219,7 +223,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxDisease.sDisplayField = "";
             this.dblkcbxDisease.sDisplayMember = "";
             this.dblkcbxDisease.SeparatorChar = "|";
-            this.dblkcbxDisease.Size = new System.Drawing.Size(257, 26);
+            this.dblkcbxDisease.Size = new System.Drawing.Size(257, 30);
             this.dblkcbxDisease.sKeyWords = "";
             this.dblkcbxDisease.sValueMember = "";
             this.dblkcbxDisease.TabIndex = 20;
@@ -237,7 +241,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxMedicalType.sDisplayField = "";
             this.dblkcbxMedicalType.sDisplayMember = "";
             this.dblkcbxMedicalType.SeparatorChar = "|";
-            this.dblkcbxMedicalType.Size = new System.Drawing.Size(257, 26);
+            this.dblkcbxMedicalType.Size = new System.Drawing.Size(257, 30);
             this.dblkcbxMedicalType.sKeyWords = "";
             this.dblkcbxMedicalType.sValueMember = "";
             this.dblkcbxMedicalType.TabIndex = 19;
@@ -255,7 +259,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxInsuranceType.sDisplayField = "";
             this.dblkcbxInsuranceType.sDisplayMember = "";
             this.dblkcbxInsuranceType.SeparatorChar = "|";
-            this.dblkcbxInsuranceType.Size = new System.Drawing.Size(257, 26);
+            this.dblkcbxInsuranceType.Size = new System.Drawing.Size(257, 30);
             this.dblkcbxInsuranceType.sKeyWords = "";
             this.dblkcbxInsuranceType.sValueMember = "";
             this.dblkcbxInsuranceType.TabIndex = 18;
@@ -269,7 +273,7 @@ namespace PTMedicalInsurance.Forms
             this.label4.Location = new System.Drawing.Point(506, 30);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(89, 19);
+            this.label4.Size = new System.Drawing.Size(98, 22);
             this.label4.TabIndex = 15;
             this.label4.Text = "医疗类别";
             // 
@@ -280,7 +284,7 @@ namespace PTMedicalInsurance.Forms
             this.label3.Location = new System.Drawing.Point(67, 128);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(89, 19);
+            this.label3.Size = new System.Drawing.Size(98, 22);
             this.label3.TabIndex = 14;
             this.label3.Text = "结算方式";
             // 
@@ -291,7 +295,7 @@ namespace PTMedicalInsurance.Forms
             this.label2.Location = new System.Drawing.Point(67, 79);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(89, 19);
+            this.label2.Size = new System.Drawing.Size(98, 22);
             this.label2.TabIndex = 13;
             this.label2.Text = "病种名称\r\n";
             // 
@@ -302,7 +306,7 @@ namespace PTMedicalInsurance.Forms
             this.label1.Location = new System.Drawing.Point(67, 30);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(89, 19);
+            this.label1.Size = new System.Drawing.Size(98, 22);
             this.label1.TabIndex = 12;
             this.label1.Text = "险种类型";
             // 
@@ -489,6 +493,31 @@ namespace PTMedicalInsurance.Forms
             this.panel2.Size = new System.Drawing.Size(1267, 465);
             this.panel2.TabIndex = 13;
             // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.ForeColor = System.Drawing.SystemColors.InfoText;
+            this.label5.Location = new System.Drawing.Point(506, 133);
+            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.TabIndex = 43;
+            this.label5.Text = "本地编码";
+            // 
+            // txtLocateCode
+            // 
+            this.txtLocateCode.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.txtLocateCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtLocateCode.Location = new System.Drawing.Point(602, 126);
+            this.txtLocateCode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.txtLocateCode.MinimumSize = new System.Drawing.Size(1, 16);
+            this.txtLocateCode.Name = "txtLocateCode";
+            this.txtLocateCode.ShowText = false;
+            this.txtLocateCode.Size = new System.Drawing.Size(257, 29);
+            this.txtLocateCode.TabIndex = 51;
+            this.txtLocateCode.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.txtLocateCode.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
             // InpatientRegistration
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -559,5 +588,7 @@ namespace PTMedicalInsurance.Forms
         private System.Windows.Forms.Panel panel2;
         public Sunny.UI.UICheckBox chkEmergency;
         public Sunny.UI.UICheckBox chkDanger;
+        private Sunny.UI.UITextBox txtLocateCode;
+        private System.Windows.Forms.Label label5;
     }
 }