Przeglądaj źródła

增加对照菜单导出功能

837390164@qq.com 2 dni temu
rodzic
commit
ac239408a6

BIN
.vs/JiNanMI/v16/.suo


+ 2 - 32
Business/HisMainBusiness.cs

@@ -118,23 +118,7 @@ namespace PTMedicalInsurance.Business
             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.ecURL = "http://10.153.50.207:8090/cherry/common/localcfc/api/hsecfc/localQrCodeQuery";          
 
             inf.cainfo = "";
         }
@@ -167,21 +151,7 @@ namespace PTMedicalInsurance.Business
             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.ecURL = "http://10.153.50.207:8090/cherry/common/localcfc/api/hsecfc/localQrCodeQuery";           
 
             inf.cainfo = "";
 

BIN
Demo/Demo/obj/Debug/Interop.cressWSDLLLib.dll


+ 219 - 18
Forms/BasicData.cs

@@ -537,6 +537,163 @@ namespace PTMedicalInsurance.Forms
             return 0;
         }
 
+
+        private int queryMapeDirectory(int currentPage, int pageSize, out string errMsg)
+        {
+            errMsg = "";
+            string directoryType = string.Empty;
+            switch (rbgDirecType_C.SelectedIndex)
+            {
+                case 0:
+                    {
+                        directoryType = "drugs";
+                        break;
+                    }
+                case 1:
+                    {
+                        directoryType = "diagnosi";
+                        break;
+                    }
+                case 2:
+                    {
+                        directoryType = "consumables";
+                        break;
+                    }
+            }
+
+            JObject joHISRtn = new JObject();
+            JObject joRtn = new JObject();
+            InvokeHelper invoker = new InvokeHelper();
+            string flag = "";
+
+            JArray jaPagination = new JArray();
+            JArray jaParams = new JArray();
+            flag = "Maped";
+            dynamic joParam = new JObject();
+            joParam.alias = tbHISDirectoryFilter.Text;
+            joParam.HospitalDr = Global.inf.hospitalDr;
+            joParam.InterfaceDr = Global.inf.interfaceDr;
+            joParam.hisType = directoryType;
+            jaParams.Add(joParam);
+            dynamic joPagination = new JObject();
+            joPagination.pageSize = 3000;
+            joPagination.currentPage = 1;
+            joPagination.sortColumn = "HisCode";
+            joPagination.sortOrder = "asc";
+            jaPagination.Add(joPagination);
+
+            JObject joMIRtn = mIS.GetMappedHISDir(jaPagination, jaParams);
+
+            if (JsonHelper.parseIrisRtnValue(joMIRtn, out errMsg) != 0)
+            {
+                return -1;
+            }
+
+            //传给HIS,进行匹配
+            joParam = new JObject();
+            joParam.TotalCount = joMIRtn["result"]["TotalCount"];
+            joParam.type = directoryType;
+            joParam.flag = flag;
+            joParam.hospID = Global.inf.hisHospitalDr;
+            joParam.interfaceDr = Global.inf.interfaceDr;
+            joParam.alias = tbHISDirectoryFilter.Text;
+            joParam.include = "Hosp";
+            joParam.groupID = "324";
+            joParam.compareArr = joMIRtn["result"]["Data"];
+            jaParams = new JArray();
+            jaParams.Add(joParam);
+            if (hIS.getHISDir(jaPagination, jaParams, out joRtn, out errMsg) != 0)
+            {
+                return -1;
+            }
+
+            dtExport = (DataTable)joRtn["result"]["Data"].ToObject(typeof(DataTable));
+
+            //if (rbNoMaped.Checked)
+            //    pgHISDirect.PageSize = pageSize;
+            //else
+            //    pgHISDirect.PageSize = 50;
+
+            return 0;
+        }
+
+        private int queryNoMappDirectory(int currentPage, int pageSize, out string errMsg)
+        {
+            errMsg = "";
+            string directoryType = string.Empty;
+            switch (rbgDirecType_C.SelectedIndex)
+            {
+                case 0:
+                    {
+                        directoryType = "drugs";
+                        break;
+                    }
+                case 1:
+                    {
+                        directoryType = "diagnosi";
+                        break;
+                    }
+                case 2:
+                    {
+                        directoryType = "consumables";
+                        break;
+                    }
+            }
+
+            JObject joHISRtn = new JObject();
+            JObject joRtn = new JObject();
+            InvokeHelper invoker = new InvokeHelper();
+            string flag = "";
+
+            JArray jaPagination = new JArray();
+            JArray jaParams = new JArray();
+            flag = "All";
+            dynamic joParam = new JObject();
+            joParam.code = "";
+            joParam.descripts = "";
+            joParam.FindType = new JArray();
+            joParam.TypeID = "";
+            joParam.alias = tbHISDirectoryFilter.Text;
+            joParam.include = "Hosp";
+            joParam.groupID = "324";
+            joParam.hospID = Global.inf.hisHospitalDr;
+            joParam.interfaceDr = Global.inf.interfaceDr;
+            joParam.type = directoryType;
+            joParam.flag = flag;
+            joParam.specInput = "";
+            jaParams.Add(joParam);
+
+            dynamic joPagination = new JObject();
+            joPagination.pageSize = pageSize;
+            //joPagination.pageSize = 2;
+            joPagination.currentPage = currentPage;
+            joPagination.sortColumn = "Code";
+            joPagination.sortOrder = "asc";
+            jaPagination.Add(joPagination);
+
+            //1.获取全部HIS目录
+            if (hIS.getHISDir(jaPagination, jaParams, out joHISRtn, out errMsg) != 0)
+            {
+                return -1;
+            }
+
+            joRtn = mIS.GetNoMappHISDir(joHISRtn);
+            if (JsonHelper.parseIrisRtnValue(joRtn, out errMsg) != 0)
+            {
+                return -1;
+            }
+
+            dtExport = (DataTable)joRtn["result"]["Data"].ToObject(typeof(DataTable));
+
+            //if (rbNoMaped.Checked)
+            //    pgHISDirect.PageSize = pageSize;
+            //else
+            //    pgHISDirect.PageSize = 50;
+
+            return 0;
+        }
+
+
         private void queryCenterDirectory_09010012(int currentPage, int pageSize)
         {
             string directoryType = string.Empty;
@@ -1635,11 +1792,26 @@ namespace PTMedicalInsurance.Forms
         {
             e.Row.HeaderCell.Value = string.Format("{0}", e.Row.Index + 1);
         }
+        private void limitPriceUpdate_Click(object sender, EventArgs e)
+        {
+            SelfpayPercentForm selfpay = new SelfpayPercentForm();
+            selfpay.CenterCode = dgvDirectoy.Rows[dgvDirectoy.SelectedIndex].Cells["Code"].Value + "";
+            selfpay.ShowDialog();
+        }
+
+        private void tsmUploadAllMappedData_Click(object sender, EventArgs e)
+        {
+            AllUpLoad();
+        }
 
-        private void btnExport_Click(object sender, EventArgs e)
+        private void tsmCancelAllUploadedData_Click(object sender, EventArgs e)
         {
+            AllCancelUpload();
+        }
 
-            if (queryHISDirectory(1, 1000, out string errMsg) != 0)
+        private void tsmExportMappedDataByLeft_Click(object sender, EventArgs e)
+        {
+            if (queryMapeDirectory(1, 3000, out string errMsg) != 0)
             {
                 MessageBox.Show(errMsg);
                 return;
@@ -1648,12 +1820,11 @@ namespace PTMedicalInsurance.Forms
             if (dtExport.Rows.Count > 0)
             {
                 string directoryType = string.Empty;
-                string sBZ = "";
                 switch (rbgDirecType_C.SelectedIndex)
                 {
                     case 0:
                         {
-                            directoryType = "药品";                            
+                            directoryType = "药品";
                             break;
                         }
                     case 1:
@@ -1668,31 +1839,61 @@ namespace PTMedicalInsurance.Forms
                         }
                 }
 
-                if (rbAll.Checked) sBZ = "全部";
-                else
-                    if (rbMaped.Checked) sBZ = "已对照";
-                else
-                    if (rbNoMaped.Checked) sBZ = "未对照";
-
                 string LSH = DateTime.Now.ToString("yyyy-MM-dd"); //DateTime.Now.ToString("MMddHHmmssffff");
-                string sFliePathName = @"D:\" + LSH + "(" + directoryType + ")医保目录"+ sBZ + "信息.xls";
+                string sFliePathName = @"D:\" + LSH + "(" + directoryType + ")医保目录已对照信息.xls";
                 string ReturnFileName = ExportToExcel.DataTabletoExcel(dtExport, sFliePathName);
-                if (ReturnFileName != "")
+                if (!string.IsNullOrEmpty(ReturnFileName))
                 {
                     MessageBox.Show("导出成功,文件保存路径:【" + ReturnFileName + "】");
                     System.Diagnostics.Process.Start(ReturnFileName); //打开excel文件                
                 }
                 else
-                {
                     MessageBox.Show("导出失败!");
-                }
             }
         }
-        private void limitPriceUpdate_Click(object sender, EventArgs e)
+
+        private void tsmExportNoMappDataByLeft_Click(object sender, EventArgs e)
         {
-            SelfpayPercentForm selfpay = new SelfpayPercentForm();
-            selfpay.CenterCode = dgvDirectoy.Rows[dgvDirectoy.SelectedIndex].Cells["Code"].Value + "";
-            selfpay.ShowDialog();
+
+            if (queryNoMappDirectory(1, 3000, out string errMsg) != 0)
+            {
+                MessageBox.Show(errMsg);
+                return;
+            }
+
+            if (dtExport.Rows.Count > 0)
+            {
+                string directoryType = string.Empty;
+                switch (rbgDirecType_C.SelectedIndex)
+                {
+                    case 0:
+                        {
+                            directoryType = "药品";
+                            break;
+                        }
+                    case 1:
+                        {
+                            directoryType = "诊疗";
+                            break;
+                        }
+                    case 2:
+                        {
+                            directoryType = "材料";
+                            break;
+                        }
+                }
+
+                string LSH = DateTime.Now.ToString("yyyy-MM-dd"); //DateTime.Now.ToString("MMddHHmmssffff");
+                string sFliePathName = @"D:\" + LSH + "(" + directoryType + ")医保目录未对照信息.xls";
+                string ReturnFileName = ExportToExcel.DataTabletoExcel(dtExport, sFliePathName);
+                if (!string.IsNullOrEmpty(ReturnFileName))
+                {
+                    MessageBox.Show("导出成功,文件保存路径:【" + ReturnFileName + "】");
+                    System.Diagnostics.Process.Start(ReturnFileName); //打开excel文件                
+                }
+                else
+                    MessageBox.Show("导出失败!");
+            }
         }
     }
     

Plik diff jest za duży
+ 243 - 273
Forms/BasicData.designer.cs


+ 3 - 0
Forms/BasicData.resx

@@ -129,6 +129,9 @@
   <metadata name="backgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>499, 17</value>
   </metadata>
+  <metadata name="uiContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>851, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>63</value>
   </metadata>

+ 8 - 5
Forms/ChooseCard.cs

@@ -19,7 +19,7 @@ namespace PTMedicalInsurance.Forms
     public partial class ChooseCard : Form
     {
         public string cardType;
-        public string businessType;
+        public string businessType, sL_CertCodeType;
         public string ID,PatName;
         public int sL_CardType;
 
@@ -36,24 +36,27 @@ namespace PTMedicalInsurance.Forms
         private void btOk_Click(object sender, EventArgs e)
         {
             cardType = "0" + (rbgCardType.SelectedIndex + 1).ToString();
-            businessType = cbBusinessType.Text.Substring(0, 3);
+            businessType = "01" + cbBusinessType.Text.Substring(0, 3);
 
             Global.pat.OtherProv = rbgOtherProv.SelectedIndex;
 
             if (rbgCardType.SelectedIndex == 0)
             {
+                sL_CertCodeType = "01" + cbBusinessType.Text.Trim().Substring(0, 3); //用码业务类型 
+
                 if (string.IsNullOrEmpty(tbID.Text.Trim()))
                 {
                     MessageBox.Show("请先扫电子医保码!");
                     tbID.Focus();
                     return;
-                } else
+                } 
+                else
                 {
                     Global.pat.ecCardNo = tbID.Text.Trim();
                 }
             }
 
-            if ((rbgOtherProv.SelectedIndex == 1)&&(cbCBD.Text==""))
+            if ((rbgOtherProv.SelectedIndex == 1) && (cbCBD.Text == ""))            
             {
                 MessageBox.Show("异地结算,请选择统筹区!");
                 return;
@@ -98,7 +101,7 @@ namespace PTMedicalInsurance.Forms
 
         private void rbgCardType_ValueChanged(object sender, int index, string text)
         {
-            if (rbgCardType.SelectedIndex == 0)
+            if (rbgCardType.SelectedIndex == 0 || rbgCardType.SelectedIndex == 3)            
             {
                 // 电子凭证
                 cbBusinessType.Enabled = true;

+ 2 - 1
InsuBusiness.cs

@@ -201,12 +201,13 @@ namespace PTMedicalInsurance
                     case "Z1"://住院读卡
                         {
                             //打开读卡窗口,操作员选择读卡类型后进行读卡器读卡,再进行1101获取参保信息
-                            PatientService patientService = new PatientService();
+                            PatientService patientService = new PatientService();                            
                             patientService.readPatientInfo(out outParam);
                             rtnResult = JsonHelper.setIrisReturnValue(0, "", JObject.Parse(outParam)).ToString();
                             break;
                         }     
                 }
+
                 return rtnResult;
             }
             catch (Exception ex)

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików