dian

ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResults/Dian/ImportLisResultPlugInsDian.cs

@@ -129,7 +129,7 @@ namespace Shentun.Peis.PlugIns.Extensions.ImportLisResults.Dian
                         var result_cg = await client.GetDetailByHospCodeAsync(_clientID, _clientGUID, barCode, 0);
                         var resultObj_cg = XmlHelper.DeserializeXmlAddRoot<GetDetailByHospCodeNormalOut>(result_cg.Body.GetDetailByHospCodeResult);
 
-                        if (resultObj_cg.ResultsDataSet != null)
+                        if (resultObj_cg.ResultsDataSet != null && resultObj_cg.ResultsDataSet.Tables.Count > 0)
                         {
                             barCodeDian = resultObj_cg.ResultsDataSet.Tables.FirstOrDefault().Barcode;
                         }
@@ -138,7 +138,7 @@ namespace Shentun.Peis.PlugIns.Extensions.ImportLisResults.Dian
                         var result_bl = await client.GetDetailByHospCodeAsync(_clientID, _clientGUID, barCode, 1);
                         var resultObj_bl = XmlHelper.DeserializeXmlAddRoot<GetDetailByHospCodePathologyOut>(result_bl.Body.GetDetailByHospCodeResult);
 
-                        if (resultObj_bl.ResultsDataSet != null && string.IsNullOrWhiteSpace(barCodeDian))
+                        if (resultObj_bl.ResultsDataSet != null && resultObj_bl.ResultsDataSet.Tables.Count > 0 && string.IsNullOrWhiteSpace(barCodeDian))
                         {
                             barCodeDian = resultObj_bl.ResultsDataSet.Tables.FirstOrDefault().Barcode;
                         }

src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs

@@ -2523,7 +2523,7 @@ namespace Shentun.Peis.PatientRegisters
             return ObjectMapper.Map<PatientRegister, PatientRegisterDto>(newentity);
         }
         /// <summary>
-        /// 更新病人总检综述建议
+        /// 更新病人总检综述建议  总检医生诊台保存
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>

src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs

@@ -195,24 +195,32 @@ namespace Shentun.Peis.RegisterCheckPictures
 
                 #region 处理pdf
 
-                string prefix = item.PictureBaseStr.Substring(0, item.PictureBaseStr.IndexOf(","));
-
-                if (prefix.Contains("application/pdf"))
+                if (item.PictureBaseStr.IndexOf(",") > 0)
                 {
-                    //处理pdf文件
-                    // base64Images = PDFHelper.SplitPdfToBase64Images(item.PictureBaseStr);
-                    base64Images = PdfiumConverter.ConvertPdfToImages(item.PictureBaseStr);
+                    string prefix = item.PictureBaseStr.Substring(0, item.PictureBaseStr.IndexOf(","));
+
+                    if (prefix.Contains("application/pdf"))
+                    {
+                        //处理pdf文件
+                        // base64Images = PDFHelper.SplitPdfToBase64Images(item.PictureBaseStr);
+                        base64Images = PdfiumConverter.ConvertPdfToImages(item.PictureBaseStr);
+                    }
+                    else
+                    {
+                        base64Images.Add(item.PictureBaseStr);
+                    }
+
                 }
                 else
                 {
                     base64Images.Add(item.PictureBaseStr);
                 }
-
                 #endregion
 
 
                 foreach (var imgbase64 in base64Images)
                 {
+
                     string PictureUrl = ImageHelper.Base64StrToImageInAbsolutePath(AbsolutePath, item.FileName + "_" + base64Images.IndexOf(imgbase64), imgbase64,
                   PatientRegisterId,
                   input.RegisterCheckId.ToString(), AbsoluteName);