暂时提交

c460347e · 刘军 · a0d3f41a · c460347e · c460347e · c460347e
Commit c460347e authored Dec 24, 2019 by 刘军
--- a/Common.Unit/0.Common.Unit.csproj
+++ b/Common.Unit/0.Common.Unit.csproj
@@ -146,6 +146,7 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="SqlHelper.cs" />
    <Compile Include="VerCodeHelp.cs" />
+    <Compile Include="Word\CreateWordReport.cs" />
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />
@@ -164,9 +165,7 @@
  <ItemGroup>
    <Content Include="Chloe.Extension\Chloe.Extension.csproj" />
  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup />
-    <Folder Include="Word\" />
-  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.

--- a/Common.Unit/Word/CreateWordReport.cs
+++ b/Common.Unit/Word/CreateWordReport.cs
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace Common.Unit.Word
+{
+    public class CreateWordReport
+    {
+    }
+}
--- a/G.MES.API/Controllers/ChemotherapyController.cs
+++ b/G.MES.API/Controllers/ChemotherapyController.cs
+using G.Buss.BaseInfo.Services.ChemotherapySVC;
+using G.MES.DataModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+namespace G.MES.API.Controllers
+{
+    /// <summary>
+    /// 化疗结果
+    /// </summary>
+    public class ChemotherapyController : BasicController
+    {
+        private readonly ChemotherapySvc svc = new ChemotherapySvc();
+        /// <summary>
+        /// 获取化药结果
+        /// </summary>
+        public List<Chemotherapy> GetChemotherapy()
+        {
+            return svc.GetChemotherapy();
+        }
+    }
+}
\ No newline at end of file
--- a/G.MES.API/G.MES.API.csproj
+++ b/G.MES.API/G.MES.API.csproj
@@ -244,6 +244,7 @@
    <Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
    <Compile Include="Base\BasicController.cs" />
    <Compile Include="Controllers\ChemicalDrugReferencesController.cs" />
+    <Compile Include="Controllers\ChemotherapyController.cs" />
    <Compile Include="Controllers\ClientInfoController.cs" />
    <Compile Include="Controllers\CodeTableController.cs" />
    <Compile Include="Controllers\GeneController.cs" />

--- a/G.MES.Business/G.BaseInfo/G.Buss.BaseInfo.csproj
+++ b/G.MES.Business/G.BaseInfo/G.Buss.BaseInfo.csproj
@@ -93,6 +93,7 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Services\AuditLogDetailedSVC\AuditLogDetailedOperaSVC.cs" />
    <Compile Include="Services\ChemicalDrugReferencesSVC\ChemicalDrugReferencesSVC.cs" />
+    <Compile Include="Services\ChemotherapySVC\ChemotherapySvc.cs" />
    <Compile Include="Services\ClientInfoSVC\ClientInfoSVC.cs" />
    <Compile Include="Services\CodeTableSVC\CodeTableOperaSVC.cs" />
    <Compile Include="Services\ExportWordSVC\ReportDataSvc.cs" />

--- a/G.MES.Business/G.BaseInfo/Services/ChemotherapySVC/ChemotherapySvc.cs
+++ b/G.MES.Business/G.BaseInfo/Services/ChemotherapySVC/ChemotherapySvc.cs
+using Chloe.SqlServer;
+using G.MES.DataModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace G.Buss.BaseInfo.Services.ChemotherapySVC
+{
+    public class ChemotherapySvc : BaseSvc
+    {
+        /// <summary>
+        /// 获取化药结果
+        /// </summary>
+        /// <returns></returns>
+        public List<Chemotherapy> GetChemotherapy()
+        {
+            using (var context = new MsSqlContext(sqlConn))
+            {
+                List<Chemotherapy> chemotherapies = context.Query<Chemotherapy>().ToList();
+                return chemotherapies;
+            }
+        }
+    }
+}
--- a/G.MES.Business/G.BaseInfo/Services/GeneCorrelationSVC/GeneCorrelationSVC.cs
+++ b/G.MES.Business/G.BaseInfo/Services/GeneCorrelationSVC/GeneCorrelationSVC.cs
@@ -95,7 +95,7 @@ namespace G.Buss.BaseInfo.Services.GeneCorrelationSVC
                        context.TrackEntity(nowSam);
                        nowSam.GeneName = GeneCorrelation.GeneName;
                        nowSam.SortNo = GeneCorrelation.SortNo;
-                        nowSam.Type = Convert.ToInt32( GeneCorrelation.Type);
+                        nowSam.Type = GeneCorrelation.Type;
                        UpSysField(nowSam, user);
                        context.Update(nowSam);
                    }
@@ -106,7 +106,7 @@ namespace G.Buss.BaseInfo.Services.GeneCorrelationSVC
                        nowSam.GeneCorrelationOID = GeneCorrelation.GeneCorrelationOID;
                        nowSam.GeneName = GeneCorrelation.GeneName;
                        nowSam.SortNo = GeneCorrelation.SortNo;
-                        nowSam.Type = Convert.ToInt32(GeneCorrelation.Type);
+                        nowSam.Type = GeneCorrelation.Type;
                        InsertSysField(nowSam, user);
                        context.Insert(nowSam);
                    }

--- a/G.MES.DbAdapter/DBModel1.Context1.cs
+++ b/G.MES.DbAdapter/DBModel1.Context1.cs
@@ -9,6 +9,7 @@
 namespace G.MES.DataAdapter
 {
+    using G.MES.DataModel;
    using System;
    using System.Data.Entity;
    using System.Data.Entity.Infrastructure;