perf: 调整历史处方为5960

Business/HisMainBusiness.cs

@@ -1917,11 +1917,13 @@ namespace PTMedicalInsurance.Business
         /// <param name="name"></param>
         /// <param name="certNo"></param>
         /// <returns></returns>
-        public JArray QueryPatientPrescription(string name, string certNo)
+        public JArray QueryPatientPrescription(string name, string certNo,string doctorCode,string mdtrt_id)
         {
             dynamic input = new JObject();
             input.psn_name = name;
             input.certno = certNo;
+            input.chfpdr_code = doctorCode;
+            input.mdtrt_id = mdtrt_id;
 
             JArray joOutput = new JArray();
             string errMsg = "";
@@ -1998,6 +2000,7 @@ namespace PTMedicalInsurance.Business
                 case "HistoryPrescriptionQuery":
                     pat.certNO = JsonHelper.getDestValue(joInparam, "insuAdmObj.certno");
                     pat.name = JsonHelper.getDestValue(joInparam, "insuAdmObj.psn_name");
+                    pat.mdtrtID = JsonHelper.getDestValue(joInparam, "insuAdmObj.mdtrt_id");
                     break;
                 default:
                     {

Business/Local/OtherQueryProcess.cs

@@ -29,7 +29,7 @@ namespace PTMedicalInsurance.Business
             switch (this.trade)
             {
                 case TradeEnum.HistoryPrescriptionQuery:
-                    QueryPatientPrescription();
+                    QueryPatientPrescription(JsonHelper.getDestValue(input, "insuAdmObj.doctor_code"));
                     break;
                 default:
                     break;
@@ -38,9 +38,9 @@ namespace PTMedicalInsurance.Business
             return Success();
         }
 
-        private void QueryPatientPrescription()
+        private void QueryPatientPrescription(string doctorCode)
         {
-            JArray list = hBus.QueryPatientPrescription(Global.pat.name, Global.pat.certNO);
+            JArray list = hBus.QueryPatientPrescription(Global.pat.name, Global.pat.certNO,doctorCode,Global.pat.mdtrtID);
             PrescriptionForm form = new PrescriptionForm();
             if (list?.Count > 0)
             {

FormSetter/GridViewSetter.cs

@@ -955,6 +955,8 @@ namespace PTMedicalInsurance.FormSetter
             AddDGVColumn(dgv, "数量", "cnt", 200);
             AddDGVColumn(dgv, "规格", "spec", 150);
             AddDGVColumn(dgv, "剂型", "dosform", 150);
+            AddDGVColumn(dgv, "剂量", "sin_dos_dscr", 150);
+            AddDGVColumn(dgv, "频次", "used_frqu_dscr", 150);
             AddDGVColumn(dgv, "是否结算标志", "setl_falg", 80);
 
             dgv.RowHeadersVisible = true;

Forms/PrescriptionForm.Designer.cs

@@ -41,6 +41,10 @@ namespace PTMedicalInsurance.Forms
             this.dgvHistory = new Sunny.UI.UIDataGridView();
             this.uiPanel1 = new Sunny.UI.UIPanel();
             this.btnQuery = new System.Windows.Forms.Button();
+            this.uiLabel3 = new Sunny.UI.UILabel();
+            this.txtAdmID = new Sunny.UI.UITextBox();
+            this.uiLabel4 = new Sunny.UI.UILabel();
+            this.txtDoctorNo = new Sunny.UI.UITextBox();
             ((System.ComponentModel.ISupportInitialize)(this.dgvHistory)).BeginInit();
             this.uiPanel1.SuspendLayout();
             this.SuspendLayout();
@@ -49,12 +53,12 @@ namespace PTMedicalInsurance.Forms
             // 
             this.txtNo.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtNo.Location = new System.Drawing.Point(703, 29);
+            this.txtNo.Location = new System.Drawing.Point(477, 29);
             this.txtNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txtNo.MinimumSize = new System.Drawing.Size(1, 16);
             this.txtNo.Name = "txtNo";
             this.txtNo.ShowText = false;
-            this.txtNo.Size = new System.Drawing.Size(327, 33);
+            this.txtNo.Size = new System.Drawing.Size(186, 33);
             this.txtNo.TabIndex = 17;
             this.txtNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.txtNo.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -63,12 +67,12 @@ namespace PTMedicalInsurance.Forms
             // 
             this.txtName.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtName.Location = new System.Drawing.Point(228, 30);
+            this.txtName.Location = new System.Drawing.Point(159, 29);
             this.txtName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txtName.MinimumSize = new System.Drawing.Size(1, 16);
             this.txtName.Name = "txtName";
             this.txtName.ShowText = false;
-            this.txtName.Size = new System.Drawing.Size(267, 33);
+            this.txtName.Size = new System.Drawing.Size(147, 33);
             this.txtName.TabIndex = 16;
             this.txtName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.txtName.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -76,7 +80,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel2
             // 
             this.uiLabel2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel2.Location = new System.Drawing.Point(551, 29);
+            this.uiLabel2.Location = new System.Drawing.Point(325, 29);
             this.uiLabel2.Name = "uiLabel2";
             this.uiLabel2.Size = new System.Drawing.Size(130, 33);
             this.uiLabel2.TabIndex = 15;
@@ -87,7 +91,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel1
             // 
             this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel1.Location = new System.Drawing.Point(64, 30);
+            this.uiLabel1.Location = new System.Drawing.Point(12, 30);
             this.uiLabel1.Name = "uiLabel1";
             this.uiLabel1.Size = new System.Drawing.Size(131, 33);
             this.uiLabel1.TabIndex = 14;
@@ -143,16 +147,20 @@ namespace PTMedicalInsurance.Forms
             this.dgvHistory.RowsDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvHistory.RowTemplate.Height = 23;
             this.dgvHistory.SelectedIndex = -1;
-            this.dgvHistory.Size = new System.Drawing.Size(1186, 555);
+            this.dgvHistory.Size = new System.Drawing.Size(1465, 555);
             this.dgvHistory.TabIndex = 18;
             this.dgvHistory.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiPanel1
             // 
             this.uiPanel1.Controls.Add(this.btnQuery);
+            this.uiPanel1.Controls.Add(this.txtDoctorNo);
             this.uiPanel1.Controls.Add(this.txtName);
+            this.uiPanel1.Controls.Add(this.uiLabel4);
             this.uiPanel1.Controls.Add(this.uiLabel1);
+            this.uiPanel1.Controls.Add(this.txtAdmID);
             this.uiPanel1.Controls.Add(this.txtNo);
+            this.uiPanel1.Controls.Add(this.uiLabel3);
             this.uiPanel1.Controls.Add(this.uiLabel2);
             this.uiPanel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -160,7 +168,7 @@ namespace PTMedicalInsurance.Forms
             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(1186, 98);
+            this.uiPanel1.Size = new System.Drawing.Size(1465, 92);
             this.uiPanel1.TabIndex = 19;
             this.uiPanel1.Text = null;
             this.uiPanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -168,7 +176,7 @@ namespace PTMedicalInsurance.Forms
             // 
             // btnQuery
             // 
-            this.btnQuery.Location = new System.Drawing.Point(1055, 24);
+            this.btnQuery.Location = new System.Drawing.Point(1334, 23);
             this.btnQuery.Name = "btnQuery";
             this.btnQuery.Size = new System.Drawing.Size(119, 44);
             this.btnQuery.TabIndex = 18;
@@ -176,11 +184,61 @@ namespace PTMedicalInsurance.Forms
             this.btnQuery.UseVisualStyleBackColor = true;
             this.btnQuery.Click += new System.EventHandler(this.btnQuery_Click);
             // 
+            // uiLabel3
+            // 
+            this.uiLabel3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel3.Location = new System.Drawing.Point(1007, 29);
+            this.uiLabel3.Name = "uiLabel3";
+            this.uiLabel3.Size = new System.Drawing.Size(130, 33);
+            this.uiLabel3.TabIndex = 15;
+            this.uiLabel3.Text = "就诊ID:";
+            this.uiLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.uiLabel3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // txtAdmID
+            // 
+            this.txtAdmID.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.txtAdmID.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtAdmID.Location = new System.Drawing.Point(1159, 29);
+            this.txtAdmID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.txtAdmID.MinimumSize = new System.Drawing.Size(1, 16);
+            this.txtAdmID.Name = "txtAdmID";
+            this.txtAdmID.ShowText = false;
+            this.txtAdmID.Size = new System.Drawing.Size(157, 33);
+            this.txtAdmID.TabIndex = 17;
+            this.txtAdmID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.txtAdmID.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // uiLabel4
+            // 
+            this.uiLabel4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel4.Location = new System.Drawing.Point(694, 30);
+            this.uiLabel4.Name = "uiLabel4";
+            this.uiLabel4.Size = new System.Drawing.Size(131, 33);
+            this.uiLabel4.TabIndex = 14;
+            this.uiLabel4.Text = "医师编号:";
+            this.uiLabel4.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.uiLabel4.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // txtDoctorNo
+            // 
+            this.txtDoctorNo.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.txtDoctorNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtDoctorNo.Location = new System.Drawing.Point(841, 29);
+            this.txtDoctorNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.txtDoctorNo.MinimumSize = new System.Drawing.Size(1, 16);
+            this.txtDoctorNo.Name = "txtDoctorNo";
+            this.txtDoctorNo.ShowText = false;
+            this.txtDoctorNo.Size = new System.Drawing.Size(147, 33);
+            this.txtDoctorNo.TabIndex = 16;
+            this.txtDoctorNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.txtDoctorNo.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
             // PrescriptionForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1186, 555);
+            this.ClientSize = new System.Drawing.Size(1465, 555);
             this.Controls.Add(this.uiPanel1);
             this.Controls.Add(this.dgvHistory);
             this.Name = "PrescriptionForm";
@@ -201,5 +259,9 @@ namespace PTMedicalInsurance.Forms
         private Sunny.UI.UIDataGridView dgvHistory;
         private Sunny.UI.UIPanel uiPanel1;
         private System.Windows.Forms.Button btnQuery;
+        private Sunny.UI.UITextBox txtDoctorNo;
+        private Sunny.UI.UILabel uiLabel4;
+        private Sunny.UI.UITextBox txtAdmID;
+        private Sunny.UI.UILabel uiLabel3;
     }
 }

Forms/PrescriptionForm.cs

@@ -40,7 +40,7 @@ namespace PTMedicalInsurance.Forms
 
         private void btnQuery_Click(object sender, EventArgs e)
         {
-            JArray list = hBus.QueryPatientPrescription(txtName.Text.Trim(), txtNo.Text.Trim());
+            JArray list = hBus.QueryPatientPrescription(txtName.Text.Trim(), txtNo.Text.Trim(),txtDoctorNo.Text.Trim(),txtAdmID.Text.Trim());
             if (list?.Count > 0)
             {
                 initList(list);

Variables/TradeEnum.cs

@@ -469,7 +469,7 @@ namespace PTMedicalInsurance
 
         #region 地方扩展
 
-        [Trade("5280", "历史处方查询")]
+        [Trade("5960", "历史处方查询")]
         HistoryPrescriptionQuery,
 
         #endregion