受检者模块调整

G.MES.API/Controllers/ClientInfoController.cs

@@ -14,7 +14,7 @@ namespace G.MES.API.Controllers
     /// <summary>
     /// 受检者信息
     /// </summary>
-    public class ClientInfoController:BasicController
+    public class ClientInfoController : BasicController
     {
         public readonly ClientInfoSVC ClientInfo = new ClientInfoSVC();
         /// <summary>
@@ -128,5 +128,23 @@ namespace G.MES.API.Controllers
             }
 
         }
+        /// <summary>
+        /// Excel导出
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public string ExportClient()
+        {
+            try
+            {
+                LoginInfo user = GetLoginUser(); 
+                return ClientInfo.DoExportClientInfo(user);
+
+            }
+            catch (Exception ex)
+            {
+                throw new Exception("导入受试者信息表格：" + ex.Message);
+            }
+        }
     }
 }
\ No newline at end of file

G.MES.API/G.MES.API.csproj

@@ -945,13 +945,13 @@
     <Content Include="Template\PMID模板.xlsx" />
     <Content Include="Template\靶药模板.xlsx" />
     <Content Include="Template\基因检测结果模板.xlsx" />
-    <Content Include="Template\受检者基本信息模板.xlsx" />
     <Content Include="Template\基因模板.xlsx" />
     <Content Include="Template\相关基因列表模板.xlsx" />
     <Content Include="Template\样本质控模板.xlsx" />
     <Content Include="Template\遗传风险模板.xlsx" />
     <Content Include="Template\Chemotherapy.xlsx" />
     <Content Include="Template\Summary.xlsx" />
+    <Content Include="Template\受检者基本信息模块.xlsx" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />

G.MES.API/Web.config

@@ -21,7 +21,7 @@
     <!--导出问卷路径-->
     <add key="ExportFilePath" value="E:\Export" />
     <!--主网站的浏览文件的地址-->
-    <add key="MainWebSite" value="http://192.168.6.131:10222/" />
+    <add key="MainWebSite" value="http://192.168.5.219:10122/" />
     <!--录音文件路径-->
     <add key="lywjurl" value="E:\GideaProject\TestUpLoadFile\ly" />
     <!--回复图片路径-->

G.MES.Business/G.BaseInfo/Services/ExportWordSVC/ReportDataSvc.cs

@@ -44,7 +44,7 @@ namespace G.Buss.BaseInfo.Services.ExportWordSVC
                         SampleDetection = a.SampleDetection,
                         TechnologyDetection = a.TechnologyDetection,
                         TumorsType = a.TumorsType,
-                        TBM = a.TBM,
+                        TNM = a.TNM,
                         IsEssential = a.IsEssential,
                         ClinicalDiagnosis = a.ClinicalDiagnosis,
                         FamilyHistory = a.FamilyHistory,

G.MES.Business/G.BaseInfo/Services/SampleTypeSVC/SampleTypeSVC.cs

@@ -26,14 +26,16 @@ namespace G.Buss.BaseInfo.Services.SampleTypeSVC
                 GetWhere(requestModel, user, out LamadaExtention<SampleTypeQueryModel> where);
                 using (var context = new MsSqlContext(sqlConn))
                 {
-                    var sampleTypeQuery = context.JoinQuery<SampleType, Sys_Organize>((sample, org) => new object[] {
-                        JoinType.LeftJoin,sample.SYS_ORG == org.Sys_OrganizeOID
-                    }).Select((sample, org) => new SampleTypeQueryModel
+                    var sampleTypeQuery = context.JoinQuery<SampleType,ClientInfo, Sys_Organize>((sample,client, org) => new object[] {
+                        JoinType.LeftJoin,sample.SYS_ORG == org.Sys_OrganizeOID,
+                        JoinType.LeftJoin,sample.SampleCode == client.SampleCode
+                    }).Select((sample, client,org) => new SampleTypeQueryModel
                     {
                         SampleTypeOID = sample.SampleTypeOID,
                         SampleCode = sample.SampleCode,
                         SampleName = sample.SampleName,
-                        ClassCode = org.ClassCode
+                        ClassCode = org.ClassCode,
+                        ClientOID = client.ClientInfoOID
                     }).Where(where.GetLambda());
 
                     int TotalNum = sampleTypeQuery.Count();

G.MES.Business/G.BaseInfo/ViewModel/ClientInfoModel/ClientInfoRequestModel.cs

@@ -55,6 +55,11 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel
         /// </summary>
         [JsonConverter(typeof(ShortDateFormat))]
         public DateTime? Birth { get; set; }
+
+        /// <summary>
+        /// 公司号码
+        /// </summary>
+        public string CompanyPhone { get; set; }
         /// <summary>
         /// 样本编码
         /// </summary>
@@ -87,9 +92,9 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel
         /// </summary>
         public string TumorsType { get; set; }
         /// <summary>
-        /// TBM分期
+        /// TNM分期
         /// </summary>
-        public string TBM { get; set; }
+        public string TNM { get; set; }
         /// <summary>
         /// 是否原发  1 是，0 否
         /// </summary>
@@ -287,6 +292,10 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel
         /// </summary>
         public string IDCard { get; set; }
         /// <summary>
+        /// 公司号码
+        /// </summary>
+        public string CompanyPhone { get; set; }
+        /// <summary>
         /// 出生日期
         /// </summary>
         [JsonConverter(typeof(ShortDateFormat))]
@@ -320,9 +329,9 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel
         /// </summary>
         public string TumorsType { get; set; }
         /// <summary>
-        /// TBM分期
+        /// TNM分期
         /// </summary>
-        public string TBM { get; set; }
+        public string TNM { get; set; }
         /// <summary>
         /// 是否原发  1 是，0 否
         /// </summary>

G.MES.Business/G.BaseInfo/ViewModel/SampleTypeModel/SampleTypeRequestModel.cs

@@ -49,6 +49,7 @@ namespace G.Buss.BaseInfo.ViewModel.SampleTypeModel
         public string SampleName { get; set; }
 
         public string ClassCode { get; set; }
+        public Guid ClientOID { get; set; }
     }
     public class SampleTypeSelectModel
     { 

G.MES.DataModel/1.G.MES.DataModel.csproj

@@ -104,6 +104,9 @@
     <Compile Include="MISReport.cs">
       <DependentUpon>DataTemplete.tt</DependentUpon>
     </Compile>
+    <Compile Include="Mission.cs">
+      <DependentUpon>DataTemplete.tt</DependentUpon>
+    </Compile>
     <Compile Include="PMID.cs">
       <DependentUpon>DataTemplete.tt</DependentUpon>
     </Compile>

G.MES.DataModel/ClientInfo.cs

@@ -44,7 +44,7 @@ namespace G.MES.DataModel
             ///<summary><summary>
             public virtual string TumorsType { get;set; }
             ///<summary><summary>
-            public virtual string TBM { get;set; }
+            public virtual string TNM { get;set; }
             ///<summary><summary>
             public virtual Nullable<bool> IsEssential { get;set; }
             ///<summary><summary>
@@ -133,5 +133,7 @@ namespace G.MES.DataModel
             public virtual string ProjectNumber { get;set; }
             ///<summary><summary>
             public virtual string DetectingPlatform { get;set; }
+            ///<summary><summary>
+            public virtual string CompanyPhone { get;set; }
     }
 }

G.MES.DataModel/Mission.cs

+//------------------------------------------------------------------------------
+// <auto-generated>
+//    此代码是根据模板生成的。
+//
+//    手动更改此文件可能会导致应用程序中发生异常行为。
+//    如果重新生成代码，则将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace G.MES.DataModel
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.DataAnnotations;
+    using Chloe.Annotations;
+    
+    ///<summary><summary>
+    [Serializable]
+    public partial class Mission : Core.BaseModel
+    {
+            ///<summary><summary>
+            [ColumnAttribute(IsPrimaryKey = true)]
+            public virtual System.Guid MissionOID { get;set; }
+            ///<summary><summary>
+            public virtual string MissionName { get;set; }
+            ///<summary><summary>
+            public virtual Nullable<System.DateTime> StartTime { get;set; }
+            ///<summary><summary>
+            public virtual Nullable<System.DateTime> EndTime { get;set; }
+            ///<summary><summary>
+            public virtual string CurrentProcess { get;set; }
+            ///<summary><summary>
+            public virtual string DownloadPath { get;set; }
+            ///<summary><summary>
+            public virtual Nullable<System.Guid> ExportPeople { get;set; }
+            ///<summary><summary>
+            public virtual Nullable<System.Guid> SYS_ORG { get;set; }
+    }
+}

G.MES.DbAdapter/DbModel.Context.cs

@@ -63,7 +63,8 @@ namespace G.MES.DataAdapter
         public DbSet<Gene> Gene { get; set; }
         public DbSet<GeneCorrelation> GeneCorrelation { get; set; }
         public DbSet<Summary> Summary { get; set; }
-        public DbSet<ClientInfo> ClientInfo { get; set; }
         public DbSet<Chemotherapy> Chemotherapy { get; set; }
+        public DbSet<ClientInfo> ClientInfo { get; set; }
+        public DbSet<Mission> Mission { get; set; }
     }
 }

G.MES.DbAdapter/DbModel.Designer.cs

-// 为模型“F:\Work\Project\报告系统\Git\ReportingSystemAPI\G.MES.DbAdapter\DbModel.edmx”启用了 T4 代码生成。
+// 为模型“D:\Project\NEWAPI\3.SourceCode\JCBGAPI\G.MES.DbAdapter\DbModel.edmx”启用了 T4 代码生成。
 // 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值
 // 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在
 // “属性”窗口中。

G.MES.DbAdapter/DbModel.edmx.diagram

@@ -43,8 +43,9 @@
         <EntityTypeShape EntityType="DbModel.Gene" Width="1.5" PointX="11.375" PointY="9.75" />
         <EntityTypeShape EntityType="DbModel.GeneCorrelation" Width="1.5" PointX="3.375" PointY="13.75" />
         <EntityTypeShape EntityType="DbModel.Summary" Width="1.5" PointX="9.375" PointY="14.75" />
-        <EntityTypeShape EntityType="DbModel.ClientInfo" Width="1.5" PointX="13.375" PointY="0.75" />
         <EntityTypeShape EntityType="DbModel.Chemotherapy" Width="1.5" PointX="0.75" PointY="13.75" />
+        <EntityTypeShape EntityType="DbModel.ClientInfo" Width="1.5" PointX="13.375" PointY="0.75" />
+        <EntityTypeShape EntityType="DbModel.Mission" Width="1.5" PointX="13.375" PointY="13.75" />
  
       </Diagram>
     </edmx:Diagrams>

WordByDocx/Word/ReplaceText.cs

@@ -44,7 +44,7 @@ namespace WordByDocx.Word
             document.ReplaceFunc("#{SamplingTime}", clientInfo.SamplingTime.ToLocalLongTime());
             document.ReplaceFunc("#{TechnologyDetection}", clientInfo.TechnologyDetection);
             document.ReplaceFunc("#{TumorsType}", clientInfo.TumorsType);
-            document.ReplaceFunc("#{TBM}", clientInfo.TBM);
+            document.ReplaceFunc("#{TNM}", clientInfo.TNM);
             document.ReplaceFunc("#{IsEssential}", clientInfo.IsEssential == true ? "是" : "否");
             document.ReplaceFunc("#{ClinicalDiagnosis}", clientInfo.ClinicalDiagnosis);
             document.ReplaceFunc("#{FamilyHistory}", clientInfo.FamilyHistory);