Browse Source

电子发票上传微调整

zzz 2 months ago
parent
commit
571705db26
2 changed files with 24 additions and 23 deletions
  1. 5 7
      HuBeiMI/Business/ElectronicSettlementCertificate.cs
  2. 19 16
      HuBeiMI/Forms/BasicData.cs

+ 5 - 7
HuBeiMI/Business/ElectronicSettlementCertificate.cs

@@ -143,13 +143,12 @@ namespace PTMedicalInsurance.Business
             {
                 //税务数电票结构化数据文件(xml),命名规则为:电子结算凭证号码-extinfo  ,因可能存在多条结算信息, 命名规则为:电子结算凭证号码-结算ID-extinfo
                 jo["tktextinfo"]["mdtrtInfo"]["fixBlngAdmdvs"] = "420104";
-                jo["tktextinfo"]["billInfo"]["supninsCode"] = "420104";
-                jo["tktextinfo"]["billInfo"]["elecSetlCertCode"] = "003";                
+                jo["tktextinfo"]["billInfo"]["supninsCode"] = "420104";              
                 ecSettlCertNo = JsonHelper.getDestValue(jo, "tktextinfo.billInfo.elecSetlCertNo");
                 string setlId = JsonHelper.getDestValue(jo, "tktextinfo.mdtrtInfo.setlId");
                 //xmlName = $"{ecSettlCertNo}-{setlId}-extinfo.xml";
-                xmlName = $"003-{ecSettlCertNo}.xml";
-                pdfName = $"003-{ecSettlCertNo}.pdf";
+                xmlName = $"{ecSettlCertNo}-extinfo.xml";
+                pdfName = $"{ecSettlCertNo}.pdf";
                 // 创建临时XML文件
                 folderPath = $@"{savePath}\ElecXml\{ecSettlCertNo}";
                 xmlPath = $@"{savePath}\ElecXml\{ecSettlCertNo}\{xmlName}";
@@ -286,11 +285,10 @@ namespace PTMedicalInsurance.Business
             //DownloadPdfFileAsync(pdfUrl,$@"{folderPath}\{pdfName}");
             DownloadPdfFile(pdfUrl, $@"{folderPath}\{pdfName}");
             //压缩文件为ZIP,并保存到文件夹同级
-            CompressFolderToZIP(folderPath, $@"{savePath}\ElecXml\003-{ecSettlCertNo}.zip");
+            CompressFolderToZIP(folderPath, $@"{savePath}\ElecXml\{ecSettlCertNo}.zip");
             //转换ZIP为Base64
-            string base64 = ZipTobase64($@"{savePath}\ElecXml\003-{ecSettlCertNo}.zip");
+            string base64 = ZipTobase64($@"{savePath}\ElecXml\{ecSettlCertNo}.zip");
             joData["ftfileCompac"] = base64;
-            joData["upldDetlList"][0]["elecSetlCertCode"] = "003";
             joData["filename"] = $@"{ecSettlCertNo}.zip";
             joData["elecSetlCertCnt"] = int.Parse(joData["elecSetlCertCnt"].ToString()) + 1;
             upldBchno = GetSeqNoBySecondStamp();

+ 19 - 16
HuBeiMI/Forms/BasicData.cs

@@ -1964,6 +1964,7 @@ namespace PTMedicalInsurance.Forms
             string sfdl = "";
             for (i = 0; i < dt.Rows.Count; i++)
             {
+                MessageBox.Show("saa" + dt.Rows[i][12].ToString());
                 one1312.hilist_code = dt.Rows[i][12].ToString();//每行的第13列是医保编码
                 if (htype == "3")
                 {
@@ -1982,22 +1983,24 @@ namespace PTMedicalInsurance.Forms
                         if (string.IsNullOrEmpty(Convert.ToString(dt_result.Rows[n]["enddate"])))//判断返回结束时间为空的
                         {
                             //医保返参取值
-                            //joPamam.Code = dt_result.Rows[n][3].ToString();//长春第四位医保编码
-                            joPamam.Code = dt_result.Rows[n]["hilist_code"].ToString();
-                            joPamam.Name = dt_result.Rows[n]["hilist_name"].ToString();//长春第18位医保名称
-                            joPamam.ChargeItemLevel = dt_result.Rows[n]["chrgitm_lv"].ToString();//长春第28位收费项目等级
-                            if (joPamam.ChargeItemLevel == "01")
-                            {
-                                joPamam.ChargeItemLevelName = "甲类";
-                            }else if (joPamam.ChargeItemLevel == "02")
-                            {
-                                joPamam.ChargeItemLevelName = "乙类";
-                            }
-                            else if (joPamam.ChargeItemLevel == "03")
-                            {
-                                joPamam.ChargeItemLevelName = "丙类";
-                            }
-                            JObject joRtn = mIS.UpdateDirectoryBySelf(joPamam);
+                                //joPamam.Code = dt_result.Rows[n][3].ToString();//长春第四位医保编码
+                                joPamam.Code = dt_result.Rows[n]["hilist_code"].ToString();
+                                joPamam.Name = dt_result.Rows[n]["hilist_name"].ToString();//长春第18位医保名称
+                                joPamam.ChargeItemLevel = dt_result.Rows[n]["chrgitm_lv"].ToString();//长春第28位收费项目等级
+                                if (joPamam.ChargeItemLevel == "01")
+                                {
+                                    joPamam.ChargeItemLevelName = "甲类";
+                                }
+                                else if (joPamam.ChargeItemLevel == "02")
+                                {
+                                    joPamam.ChargeItemLevelName = "乙类";
+                                }
+                                else if (joPamam.ChargeItemLevel == "03")
+                                {
+                                    joPamam.ChargeItemLevelName = "丙类";
+                                }
+                                JObject joRtn = mIS.UpdateDirectoryBySelf(joPamam);
+                            
                         }
                     }
                 }