Bladeren bron

事前事中更新,增加3103

353489937@qq.com 11 maanden geleden
bovenliggende
commit
ad43c6d1f0

BIN
.vs/ChongQingMI/v16/.suo


+ 23 - 1
Business/HisMainBusiness.cs

@@ -2426,7 +2426,29 @@ namespace PTMedicalInsurance.Business
                         PreAndInProcessAnalysisForm paipaForm = new PreAndInProcessAnalysisForm(joRtn);
                         if (paipaForm.ShowDialog() == DialogResult.OK)
                         {
-                            return 0;
+                            JObject joData = new JObject();
+                            JObject joTmp = new JObject();
+                            joTmp.Add("warnType", 1);
+                            joTmp.Add("warns", paipaForm.jaWarns);
+                            joData.Add("data", joTmp);
+                            joRtn = invoker.invokeCenterService("3103", joData);
+                            if (JsonHelper.parseCenterRtnValue(joRtn, out outparam) != 0)
+                            {
+                                return -1;
+                            }
+                            else
+                            {
+                                //if (JsonHelper.getDestValue(joRtn, "output.type") == "error")
+                                //{
+                                //    outparam = JsonHelper.getDestValue(joRtn, "output.message");
+                                //    return -1;
+                                //}
+                                //else
+                                //{
+                                //    return 0;
+                                //}
+                                return 0;
+                            }
                         }
                         else
                         {

+ 4 - 4
ChongQingMI.csproj

@@ -32,14 +32,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto">
-      <HintPath>..\Demo\bin\Debug-yaohai\BouncyCastle.Crypto.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+      <HintPath>packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="FastReport">
       <HintPath>..\Demo\bin\Debug-yaohai\FastReport.dll</HintPath>
     </Reference>
     <Reference Include="FastReportFrom">
-      <HintPath>..\Demo\bin\Debug-yaohai\FastReportFrom.dll</HintPath>
+      <HintPath>..\..\原来的代码\FastReportFrom\bin\Debug\FastReportFrom.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
@@ -53,7 +53,7 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="PTControl">
-      <HintPath>..\Demo\bin\Debug-yaohai\PTControl.dll</HintPath>
+      <HintPath>..\沈阳\ThirdDll\PTControl.dll</HintPath>
     </Reference>
     <Reference Include="SunnyUI, Version=3.1.5.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
       <HintPath>packages\SunnyUI.3.1.5\lib\net40\SunnyUI.dll</HintPath>

+ 172 - 70
Forms/PreAndInProcessAnalysisForm.Designer.cs

@@ -28,21 +28,22 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
             this.uiPanel1 = new Sunny.UI.UIPanel();
             this.btnCancle = new Sunny.UI.UIButton();
             this.btnOK = new Sunny.UI.UIButton();
             this.uiPanel2 = new Sunny.UI.UIPanel();
             this.uiGroupBox2 = new Sunny.UI.UIGroupBox();
+            this.dgvVolaDetailDtos = new Sunny.UI.UIDataGridView();
             this.tbRuleName = new Sunny.UI.UITextBox();
             this.tbVolaEvid = new Sunny.UI.UITextBox();
             this.tbVolaBhvrType = new Sunny.UI.UITextBox();
@@ -67,14 +68,20 @@
             this.rbtVolaContent = new Sunny.UI.UIRichTextBox();
             this.uiGroupBox3 = new Sunny.UI.UIGroupBox();
             this.dgvVolaItems = new Sunny.UI.UIDataGridView();
-            this.dgvVolaDetailDtos = new Sunny.UI.UIDataGridView();
+            this.uiGroupBox4 = new Sunny.UI.UIGroupBox();
+            this.btnSave = new Sunny.UI.UIButton();
+            this.cbxDspoWay = new Sunny.UI.UIComboBox();
+            this.uiGroupBox5 = new Sunny.UI.UIGroupBox();
+            this.rtbDspoWayRea = new Sunny.UI.UIRichTextBox();
             this.uiPanel1.SuspendLayout();
             this.uiPanel2.SuspendLayout();
             this.uiGroupBox2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvVolaDetailDtos)).BeginInit();
             this.uiGroupBox1.SuspendLayout();
             this.uiGroupBox3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvVolaItems)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvVolaDetailDtos)).BeginInit();
+            this.uiGroupBox4.SuspendLayout();
+            this.uiGroupBox5.SuspendLayout();
             this.SuspendLayout();
             // 
             // uiPanel1
@@ -83,11 +90,11 @@
             this.uiPanel1.Controls.Add(this.btnOK);
             this.uiPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiPanel1.Location = new System.Drawing.Point(0, 538);
+            this.uiPanel1.Location = new System.Drawing.Point(0, 875);
             this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiPanel1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel1.Name = "uiPanel1";
-            this.uiPanel1.Size = new System.Drawing.Size(1302, 53);
+            this.uiPanel1.Size = new System.Drawing.Size(1545, 53);
             this.uiPanel1.TabIndex = 0;
             this.uiPanel1.Text = null;
             this.uiPanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -98,7 +105,7 @@
             this.btnCancle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCancle.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnCancle.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCancle.Location = new System.Drawing.Point(1045, 3);
+            this.btnCancle.Location = new System.Drawing.Point(1288, 3);
             this.btnCancle.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnCancle.Name = "btnCancle";
             this.btnCancle.Size = new System.Drawing.Size(100, 35);
@@ -113,7 +120,7 @@
             this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnOK.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnOK.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnOK.Location = new System.Drawing.Point(896, 4);
+            this.btnOK.Location = new System.Drawing.Point(1139, 4);
             this.btnOK.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnOK.Name = "btnOK";
             this.btnOK.Size = new System.Drawing.Size(100, 35);
@@ -153,7 +160,7 @@
             this.uiPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiPanel2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel2.Name = "uiPanel2";
-            this.uiPanel2.Size = new System.Drawing.Size(1032, 538);
+            this.uiPanel2.Size = new System.Drawing.Size(1275, 875);
             this.uiPanel2.TabIndex = 1;
             this.uiPanel2.Text = null;
             this.uiPanel2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -164,12 +171,12 @@
             this.uiGroupBox2.Controls.Add(this.dgvVolaDetailDtos);
             this.uiGroupBox2.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.uiGroupBox2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox2.Location = new System.Drawing.Point(0, 383);
+            this.uiGroupBox2.Location = new System.Drawing.Point(0, 666);
             this.uiGroupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiGroupBox2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox2.Name = "uiGroupBox2";
             this.uiGroupBox2.Padding = new System.Windows.Forms.Padding(0, 24, 0, 0);
-            this.uiGroupBox2.Size = new System.Drawing.Size(1032, 155);
+            this.uiGroupBox2.Size = new System.Drawing.Size(1275, 209);
             this.uiGroupBox2.TabIndex = 21;
             this.uiGroupBox2.Text = "违规明细";
             this.uiGroupBox2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -177,6 +184,57 @@
             this.uiGroupBox2.TitleTop = 8;
             this.uiGroupBox2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
+            // dgvVolaDetailDtos
+            // 
+            this.dgvVolaDetailDtos.AllowUserToAddRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
+            this.dgvVolaDetailDtos.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvVolaDetailDtos.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
+            this.dgvVolaDetailDtos.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvVolaDetailDtos.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvVolaDetailDtos.ColumnHeadersHeight = 32;
+            this.dgvVolaDetailDtos.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvVolaDetailDtos.DefaultCellStyle = dataGridViewCellStyle3;
+            this.dgvVolaDetailDtos.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvVolaDetailDtos.EnableHeadersVisualStyles = false;
+            this.dgvVolaDetailDtos.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvVolaDetailDtos.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(173)))), ((int)(((byte)(255)))));
+            this.dgvVolaDetailDtos.Location = new System.Drawing.Point(0, 24);
+            this.dgvVolaDetailDtos.Name = "dgvVolaDetailDtos";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvVolaDetailDtos.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle5.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.dgvVolaDetailDtos.RowsDefaultCellStyle = dataGridViewCellStyle5;
+            this.dgvVolaDetailDtos.RowTemplate.Height = 23;
+            this.dgvVolaDetailDtos.SelectedIndex = -1;
+            this.dgvVolaDetailDtos.Size = new System.Drawing.Size(1275, 185);
+            this.dgvVolaDetailDtos.TabIndex = 1;
+            this.dgvVolaDetailDtos.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
             // tbRuleName
             // 
             this.tbRuleName.Cursor = System.Windows.Forms.Cursors.IBeam;
@@ -470,7 +528,7 @@
             this.uiGroupBox3.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox3.Name = "uiGroupBox3";
             this.uiGroupBox3.Padding = new System.Windows.Forms.Padding(0, 26, 0, 0);
-            this.uiGroupBox3.Size = new System.Drawing.Size(270, 538);
+            this.uiGroupBox3.Size = new System.Drawing.Size(270, 875);
             this.uiGroupBox3.TabIndex = 2;
             this.uiGroupBox3.Text = "违规项目";
             this.uiGroupBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -525,69 +583,106 @@
             this.dgvVolaItems.RowsDefaultCellStyle = dataGridViewCellStyle10;
             this.dgvVolaItems.RowTemplate.Height = 23;
             this.dgvVolaItems.SelectedIndex = -1;
-            this.dgvVolaItems.Size = new System.Drawing.Size(270, 512);
+            this.dgvVolaItems.Size = new System.Drawing.Size(270, 849);
             this.dgvVolaItems.TabIndex = 0;
             this.dgvVolaItems.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.dgvVolaItems.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvVolaItems_CellContentClick);
             this.dgvVolaItems.SelectionChanged += new System.EventHandler(this.dgvVolaItems_SelectionChanged);
             // 
-            // dgvVolaDetailDtos
-            // 
-            this.dgvVolaDetailDtos.AllowUserToAddRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
-            this.dgvVolaDetailDtos.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvVolaDetailDtos.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
-            this.dgvVolaDetailDtos.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvVolaDetailDtos.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
-            this.dgvVolaDetailDtos.ColumnHeadersHeight = 32;
-            this.dgvVolaDetailDtos.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvVolaDetailDtos.DefaultCellStyle = dataGridViewCellStyle3;
-            this.dgvVolaDetailDtos.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgvVolaDetailDtos.EnableHeadersVisualStyles = false;
-            this.dgvVolaDetailDtos.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvVolaDetailDtos.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(173)))), ((int)(((byte)(255)))));
-            this.dgvVolaDetailDtos.Location = new System.Drawing.Point(0, 24);
-            this.dgvVolaDetailDtos.Name = "dgvVolaDetailDtos";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvVolaDetailDtos.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.dgvVolaDetailDtos.RowsDefaultCellStyle = dataGridViewCellStyle5;
-            this.dgvVolaDetailDtos.RowTemplate.Height = 23;
-            this.dgvVolaDetailDtos.SelectedIndex = -1;
-            this.dgvVolaDetailDtos.Size = new System.Drawing.Size(1032, 131);
-            this.dgvVolaDetailDtos.TabIndex = 1;
-            this.dgvVolaDetailDtos.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.dgvVolaDetailDtos.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.uiDataGridView1_CellContentClick);
+            // uiGroupBox4
+            // 
+            this.uiGroupBox4.Controls.Add(this.btnSave);
+            this.uiGroupBox4.Controls.Add(this.cbxDspoWay);
+            this.uiGroupBox4.Controls.Add(this.uiGroupBox5);
+            this.uiGroupBox4.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.uiGroupBox4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiGroupBox4.Location = new System.Drawing.Point(270, 603);
+            this.uiGroupBox4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiGroupBox4.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiGroupBox4.Name = "uiGroupBox4";
+            this.uiGroupBox4.Padding = new System.Windows.Forms.Padding(0, 24, 0, 0);
+            this.uiGroupBox4.Size = new System.Drawing.Size(1275, 272);
+            this.uiGroupBox4.TabIndex = 24;
+            this.uiGroupBox4.Text = "如果选择继续执行医嘱,请在下方选择框选择,并点击保存按钮";
+            this.uiGroupBox4.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.uiGroupBox4.TitleInterval = 0;
+            this.uiGroupBox4.TitleTop = 8;
+            this.uiGroupBox4.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // btnSave
+            // 
+            this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnSave.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSave.Location = new System.Drawing.Point(283, 19);
+            this.btnSave.MinimumSize = new System.Drawing.Size(1, 1);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(100, 29);
+            this.btnSave.TabIndex = 7;
+            this.btnSave.Text = "保存";
+            this.btnSave.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSave.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            // 
+            // cbxDspoWay
+            // 
+            this.cbxDspoWay.DataSource = null;
+            this.cbxDspoWay.FillColor = System.Drawing.Color.White;
+            this.cbxDspoWay.FilterMaxCount = 50;
+            this.cbxDspoWay.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbxDspoWay.Items.AddRange(new object[] {
+            "",
+            "1.继续执行医嘱",
+            "2.返回修改医嘱"});
+            this.cbxDspoWay.Location = new System.Drawing.Point(10, 19);
+            this.cbxDspoWay.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.cbxDspoWay.MinimumSize = new System.Drawing.Size(63, 0);
+            this.cbxDspoWay.Name = "cbxDspoWay";
+            this.cbxDspoWay.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+            this.cbxDspoWay.Size = new System.Drawing.Size(244, 29);
+            this.cbxDspoWay.TabIndex = 6;
+            this.cbxDspoWay.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.cbxDspoWay.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // uiGroupBox5
+            // 
+            this.uiGroupBox5.Controls.Add(this.rtbDspoWayRea);
+            this.uiGroupBox5.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.uiGroupBox5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiGroupBox5.Location = new System.Drawing.Point(0, 49);
+            this.uiGroupBox5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiGroupBox5.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiGroupBox5.Name = "uiGroupBox5";
+            this.uiGroupBox5.Padding = new System.Windows.Forms.Padding(0, 24, 0, 0);
+            this.uiGroupBox5.Size = new System.Drawing.Size(1275, 223);
+            this.uiGroupBox5.TabIndex = 5;
+            this.uiGroupBox5.Text = "请填写采用此种处理方式的原因,处理方式为继续执行医嘱时必填";
+            this.uiGroupBox5.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.uiGroupBox5.TitleInterval = 0;
+            this.uiGroupBox5.TitleTop = 8;
+            this.uiGroupBox5.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // rtbDspoWayRea
+            // 
+            this.rtbDspoWayRea.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.rtbDspoWayRea.FillColor = System.Drawing.Color.White;
+            this.rtbDspoWayRea.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.rtbDspoWayRea.Location = new System.Drawing.Point(0, 24);
+            this.rtbDspoWayRea.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.rtbDspoWayRea.MinimumSize = new System.Drawing.Size(1, 1);
+            this.rtbDspoWayRea.Name = "rtbDspoWayRea";
+            this.rtbDspoWayRea.Padding = new System.Windows.Forms.Padding(2);
+            this.rtbDspoWayRea.ShowText = false;
+            this.rtbDspoWayRea.Size = new System.Drawing.Size(1275, 199);
+            this.rtbDspoWayRea.TabIndex = 0;
+            this.rtbDspoWayRea.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.rtbDspoWayRea.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // PreAndInProcessAnalysisForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1302, 591);
+            this.ClientSize = new System.Drawing.Size(1545, 928);
+            this.Controls.Add(this.uiGroupBox4);
             this.Controls.Add(this.uiPanel2);
             this.Controls.Add(this.uiGroupBox3);
             this.Controls.Add(this.uiPanel1);
@@ -596,10 +691,12 @@
             this.uiPanel1.ResumeLayout(false);
             this.uiPanel2.ResumeLayout(false);
             this.uiGroupBox2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvVolaDetailDtos)).EndInit();
             this.uiGroupBox1.ResumeLayout(false);
             this.uiGroupBox3.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvVolaItems)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvVolaDetailDtos)).EndInit();
+            this.uiGroupBox4.ResumeLayout(false);
+            this.uiGroupBox5.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -636,5 +733,10 @@
         private Sunny.UI.UIGroupBox uiGroupBox3;
         private Sunny.UI.UIDataGridView dgvVolaItems;
         private Sunny.UI.UIDataGridView dgvVolaDetailDtos;
+        private Sunny.UI.UIGroupBox uiGroupBox4;
+        private Sunny.UI.UIButton btnSave;
+        private Sunny.UI.UIComboBox cbxDspoWay;
+        private Sunny.UI.UIGroupBox uiGroupBox5;
+        private Sunny.UI.UIRichTextBox rtbDspoWayRea;
     }
 }

+ 31 - 9
Forms/PreAndInProcessAnalysisForm.cs

@@ -20,9 +20,11 @@ namespace PTMedicalInsurance.Forms
 
         private GridViewSetter grdSetter = new GridViewSetter();
         private JArray jaVolaItems;
+        public JArray jaWarns;
         public PreAndInProcessAnalysisForm()
         {
             InitializeComponent();
+            cbxDspoWay.SelectedIndex = 1;
         }
 
         public PreAndInProcessAnalysisForm(JObject jo)
@@ -79,19 +81,39 @@ namespace PTMedicalInsurance.Forms
             showVolaItemContent((JObject)jaVolaItems[i]);
         }
 
-        private void dgvVolaItems_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        private void btnSave_Click(object sender, EventArgs e)
         {
+            if (cbxDspoWay.SelectedIndex == 1)
+            {
+                if (string.IsNullOrEmpty(rtbDspoWayRea.Text))
+                {
+                    MessageBox.Show("请输入原因");
+                    return;
+                }
+            }
 
-        }
-
-        private void uiRichTextBox1_TextChanged(object sender, EventArgs e)
-        {
-
-        }
+            int i = dgvVolaItems.CurrentRow.Index;
+            JObject jo = (JObject)jaVolaItems[i];
+            JObject joTmp = new JObject();
+            joTmp.Add("warnRsltId", JsonHelper.getDestValue(jo, "jrId"));
+            joTmp.Add("dspoWay", cbxDspoWay.SelectedIndex);
+            joTmp.Add("dspoWayRea", rtbDspoWayRea.Text);
 
-        private void uiDataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
-        {
+            bool isExist = false;
+            foreach (JObject joSub in jaWarns)
+            {
+                if (joSub["warnRsltId"].ToString() == joTmp["warnRsltId"].ToString())
+                {
+                    isExist = true;
+                }
+            }
 
+            if (!isExist)
+            {
+                jaWarns.Add(joTmp);
+                dgvVolaItems.Rows[i].DefaultCellStyle.BackColor = Color.Red;
+                MessageBox.Show("保存成功,请继续下一条");//如果重复点击,则覆盖,同时有标识标识改数据已经添加成功
+            }
         }
     }
 }

+ 0 - 4
Helper/InvokeHelper.cs

@@ -389,8 +389,6 @@ namespace PTMedicalInsurance.Helper
                     int iInt = mobileCenter.Business(data, ref outputData, ref errMsg);
                     joRtn = JObject.Parse(outputData);
 
-                    Global.writeLog(funNO + "【密文出参】:\r\n" + joRtn.ToString());
-
                     string encData = JsonHelper.getDestValue(joRtn, "encData");
                     string signData = JsonHelper.getDestValue(joRtn, "signData");
                     if (!string.IsNullOrEmpty(encData) && !string.IsNullOrEmpty(signData))
@@ -410,8 +408,6 @@ namespace PTMedicalInsurance.Helper
                         bool rtn = encrypt.verify(joRtn, signData);
                         if (rtn)
                         {
-                            Global.writeLog(funNO + "【明文出参】:\r\n" + decData);
-
                             joRtn = JObject.Parse(decData);
                             joRtn.Add("success", "True");
                         }

+ 1 - 1
packages.config

@@ -4,7 +4,7 @@
   <package id="Microsoft.Office.Excel" version="14.0.4760.1000" targetFramework="net45" />
   <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1001" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
-  <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net461" />
+  <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net472" />
   <package id="SunnyUI" version="3.1.5" targetFramework="net45" requireReinstallation="true" />
   <package id="SunnyUI.Common" version="3.1.2" targetFramework="net45" requireReinstallation="true" />
 </packages>