Skip to content

R
ReportingSystemAPI
Commit eeb92e9b by 徐建业
Options

受检者编辑页面接口

parent c460347e
正在显示 包含 465 行增加 和 7 行删除
G.MES.API/Controllers/SampleTypeController.cs
...@@ -34,6 +34,24 @@ namespace G.MES.API.Controllers ...@@ -34,6 +34,24 @@ namespace G.MES.API.Controllers
throw new Exception("获取样本类型表格"+ex.Message); throw new Exception("获取样本类型表格"+ex.Message);
} }
} }
/// <summary>
/// 获取所有样本类型
/// </summary>
/// <returns></returns>
[HttpGet]
public List<SampleTypeSelectModel> GetAllSampleType()
{
try
{
LoginInfo user = GetLoginUser();
return sample.DoGetAllSampleType(user);
}
catch (Exception ex)
{
throw new Exception("获取样本类型选项" + ex.Message);
}
}
/// <summary> /// <summary>
/// 批量保存（新增或更新） /// 批量保存（新增或更新）
/// </summary> /// </summary>
......
G.MES.API/Controllers/TumorsTypeController.cs
...@@ -33,7 +33,22 @@ namespace G.MES.API.Controllers ...@@ -33,7 +33,22 @@ namespace G.MES.API.Controllers
throw new Exception("获取肿瘤类型表格" + ex.Message); throw new Exception("获取肿瘤类型表格" + ex.Message);
} }
} }
/// <summary>
/// 获取所有肿瘤类型
/// </summary>
/// <returns></returns>
[HttpGet]
public List<TumorsTypeSelectModel> GetAllTumorsType() {
try
{
LoginInfo user = GetLoginUser();
return Tumors.DoGetAllTumorsType(user);
}
catch (Exception ex)
{
throw new Exception("获取肿瘤类型选项" + ex.Message);
}
}
/// <summary> /// <summary>
/// 批量保存（新增或更新） /// 批量保存（新增或更新）
/// </summary> /// </summary>
......
G.MES.API/G.MES.API.csproj
...@@ -941,6 +941,14 @@ ...@@ -941,6 +941,14 @@
<Content Include="Views\Shared\Error.cshtml" /> <Content Include="Views\Shared\Error.cshtml" />
<Content Include="Views\Shared\_Layout.cshtml" /> <Content Include="Views\Shared\_Layout.cshtml" />
<Content Include="Template\肿瘤类型模板.xlsx" /> <Content Include="Template\肿瘤类型模板.xlsx" />
<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" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="App_Data\" /> <Folder Include="App_Data\" />
......
G.MES.Business/G.BaseInfo/Services/CodeTableSVC/CodeTableOperaSVC.cs
...@@ -169,7 +169,7 @@ namespace G.Buss.BaseInfo.Services.CodeTableSVC ...@@ -169,7 +169,7 @@ namespace G.Buss.BaseInfo.Services.CodeTableSVC
OrderNo = a.OrderNo, OrderNo = a.OrderNo,
CodeTableID = a.CodeTableID, CodeTableID = a.CodeTableID,
Reserved3 = a.Reserved3 Reserved3 = a.Reserved3
}).Where(where.GetLambda()); }).Where(where.GetLambda()).OrderBy(a=>a.OrderNo);
//.Where(where.GetLambda()) //.Where(where.GetLambda())
return PageData.Make( return PageData.Make(
......
G.MES.Business/G.BaseInfo/Services/SampleTypeSVC/SampleTypeSVC.cs
...@@ -49,6 +49,35 @@ namespace G.Buss.BaseInfo.Services.SampleTypeSVC ...@@ -49,6 +49,35 @@ namespace G.Buss.BaseInfo.Services.SampleTypeSVC
throw new Exception(ex.Message); throw new Exception(ex.Message);
} }
} }
public List<SampleTypeSelectModel> DoGetAllSampleType( LoginInfo user)
{
try
{
using (var context = new MsSqlContext(sqlConn))
{
List<SampleTypeSelectModel> sampleTypeQuery = context.JoinQuery<SampleType, Sys_Organize>((sample, org) => new object[] {
JoinType.LeftJoin,sample.SYS_ORG == org.Sys_OrganizeOID
})
.Where((sample, org) => org.ClassCode.StartsWith(user.OrgClassCode))
.Select((sample, org) => new SampleTypeSelectModel
{
SampleCode = sample.SampleCode,
SampleName = sample.SampleName,
}).ToList();
return sampleTypeQuery;
}
}
catch (Exception ex)
{
throw new Exception(ex.Message);
}
}
/// <summary> /// <summary>
/// 获取筛选条件 /// 获取筛选条件
/// </summary> /// </summary>
......
G.MES.Business/G.BaseInfo/Services/TumorsTypeSVC/TumorsTypeSVC.cs
...@@ -49,6 +49,29 @@ namespace G.Buss.BaseInfo.Services.TumorsTypeSVC ...@@ -49,6 +49,29 @@ namespace G.Buss.BaseInfo.Services.TumorsTypeSVC
throw new Exception(ex.Message); throw new Exception(ex.Message);
} }
} }
public List<TumorsTypeSelectModel> DoGetAllTumorsType(LoginInfo user)
{
try
{
using (var context = new MsSqlContext(sqlConn))
{
List<TumorsTypeSelectModel> TumorsTypeQuery = context.JoinQuery<TumorsType, Sys_Organize>((Tumors, org) => new object[] {
JoinType.LeftJoin,Tumors.SYS_ORG == org.Sys_OrganizeOID
}).Where((Tumors, org)=>org.ClassCode.StartsWith(user.OrgClassCode)).Select((Tumors, org) => new TumorsTypeSelectModel
{
TumorsCode = Tumors.TumorsCode,
TumorsName = Tumors.TumorsName,
}).ToList();
return TumorsTypeQuery;
}
}
catch (Exception ex)
{
throw new Exception(ex.Message);
}
}
/// <summary> /// <summary>
/// 获取筛选条件 /// 获取筛选条件
/// </summary> /// </summary>
......
G.MES.Business/G.BaseInfo/ViewModel/ClientInfoModel/ClientInfoRequestModel.cs
...@@ -64,6 +64,9 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel ...@@ -64,6 +64,9 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel
/// </summary> /// </summary>
public string SampleType { get; set; } public string SampleType { get; set; }
/// <summary>
/// 采样时间
/// </summary>
[JsonConverter(typeof(ShortDateFormat))] [JsonConverter(typeof(ShortDateFormat))]
public DateTime? SamplingTime { get; set; } public DateTime? SamplingTime { get; set; }
...@@ -104,6 +107,137 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel ...@@ -104,6 +107,137 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel
/// </summary> /// </summary>
public string PersonalHistory { get; set; } public string PersonalHistory { get; set; }
/// <summary>
/// 项目名称
/// </summary>
public string ItemsName { get; set; }
/// <summary>
/// 项目类型
/// </summary>
public string ItemsType { get; set; }
/// <summary>
/// 实验类型
/// </summary>
public string ExperimentalType { get; set; }
/// <summary>
/// YK样本编号
/// </summary>
public string YKSampleNum { get; set; }
/// <summary>
/// 临检号
/// </summary>
public string RummageNum { get; set; }
/// <summary>
/// 客户样本名称
/// </summary>
public string ClientSampleName { get; set; }
/// <summary>
/// 癌种/病种
/// </summary>
public string Entity { get; set; }
/// <summary>
/// 收样日期
/// </summary>
[JsonConverter(typeof(ShortDateFormat))]
public DateTime? ReceivedDate { get; set; }
/// <summary>
/// 立项日期
/// </summary>
[JsonConverter(typeof(ShortDateFormat))]
public DateTime? ProjectDate { get; set; }
/// <summary>
/// 预计结题日期
/// </summary>
[JsonConverter(typeof(ShortDateFormat))]
public DateTime? NodeTitleDate { get; set; }
/// <summary>
/// 样本来源
/// </summary>
public string SampleSource { get; set; }
/// <summary>
/// 分组情况
/// </summary>
public string GroupingSituation { get; set; }
/// <summary>
/// 批次
/// </summary>
public string Batch { get; set; }
/// <summary>
/// 捕获探针
/// </summary>
public string CaptureProbe { get; set; }
/// <summary>
/// 提取人
/// </summary>
public string Extracter { get; set; }
/// <summary>
/// 质检人
/// </summary>
public string QualityPeople { get; set; }
/// <summary>
/// 实验操作员
/// </summary>
public string LabOperator { get; set; }
/// <summary>
/// 外送日期
/// </summary>
[JsonConverter(typeof(ShortDateFormat))]
public DateTime? DeliveryDate { get; set; }
/// <summary>
/// index_I5
/// </summary>
public string Index_I5 { get; set; }
/// <summary>
/// index_I7
/// </summary>
public string Index_I7 { get; set; }
/// <summary>
/// 文库自身抽检情况
/// </summary>
public string SpotCheck { get; set; }
/// <summary>
/// 公司质检情况
/// </summary>
public string QualityManagement { get; set; }
/// <summary>
/// 处理方式
/// </summary>
public string ProcessMode { get; set; }
/// <summary>
/// 客户数据量要求
/// </summary>
public string ClientDataSize { get; set; }
/// <summary>
/// 实际下机数据量
/// </summary>
public string DeplaneDataSize { get; set; }
/// <summary>
/// 加测、补做情况(次数)
/// </summary>
public string AdditionalNum { get; set; }
/// <summary>
/// 操作失误备注
/// </summary>
public string FaultRemark { get; set; }
/// <summary>
/// 客户单位
/// </summary>
public string ClientUnit { get; set; }
/// <summary>
/// 联系邮箱
/// </summary>
public string Email { get; set; }
/// <summary>
/// 立项编号
/// </summary>
public string ProjectNumber { get; set; }
/// <summary>
/// 检测平台
/// </summary>
public string DetectingPlatform { get; set; }
} }
...@@ -209,7 +343,149 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel ...@@ -209,7 +343,149 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel
/// 个人病史 /// 个人病史
/// </summary> /// </summary>
public string PersonalHistory { get; set; } public string PersonalHistory { get; set; }
} /// <summary>
/// 项目名称
/// </summary>
public string ItemsName { get; set; }
/// <summary>
/// 项目类型
/// </summary>
public string ItemsType { get; set; }
/// <summary>
/// 实验类型
/// </summary>
public string ExperimentalType { get; set; }
/// <summary>
/// YK样本编号
/// </summary>
public string YKSampleNum { get; set; }
/// <summary>
/// 临检号
/// </summary>
public string RummageNum { get; set; }
/// <summary>
/// 客户样本名称
/// </summary>
public string ClientSampleName { get; set; }
/// <summary>
/// 癌种/病种
/// </summary>
public string Entity { get; set; }
/// <summary>
/// 收样日期
/// </summary>
[JsonConverter(typeof(ShortDateFormat))]
public DateTime? ReceivedDate { get; set; }
/// <summary>
/// 立项日期
/// </summary>
[JsonConverter(typeof(ShortDateFormat))]
public DateTime? ProjectDate { get; set; }
/// <summary>
/// 预计结题日期
/// </summary>
[JsonConverter(typeof(ShortDateFormat))]
public DateTime? NodeTitleDate { get; set; }
/// <summary>
/// 样本来源
/// </summary>
public string SampleSource { get; set; }
/// <summary>
/// 分组情况
/// </summary>
public string GroupingSituation { get; set; }
/// <summary>
/// 批次
/// </summary>
public string Batch { get; set; }
/// <summary>
/// 捕获探针
/// </summary>
public string CaptureProbe { get; set; }
/// <summary>
/// 提取人
/// </summary>
public string Extracter { get; set; }
/// <summary>
/// 质检人
/// </summary>
public string QualityPeople { get; set; }
/// <summary>
/// 实验操作员
/// </summary>
public string LabOperator { get; set; }
/// <summary>
/// 外送日期
/// </summary>
[JsonConverter(typeof(ShortDateFormat))]
public DateTime? DeliveryDate { get; set; }
/// <summary>
/// index_I5
/// </summary>
public string Index_I5 { get; set; }
/// <summary>
/// index_I7
/// </summary>
public string Index_I7 { get; set; }
/// <summary>
/// 文库自身抽检情况
/// </summary>
public string SpotCheck { get; set; }
/// <summary>
/// 公司质检情况
/// </summary>
public string QualityManagement { get; set; }
/// <summary>
/// 处理方式
/// </summary>
public string ProcessMode { get; set; }
/// <summary>
/// 客户数据量要求
/// </summary>
public string ClientDataSize{ get; set; }
/// <summary>
/// 实际下机数据量
/// </summary>
public string DeplaneDataSize { get; set; }
/// <summary>
/// 加测、补做情况(次数)
/// </summary>
public string AdditionalNum { get; set; }
/// <summary>
/// 操作失误备注
/// </summary>
public string FaultRemark { get; set; }
/// <summary>
/// 客户单位
/// </summary>
public string ClientUnit { get; set; }
/// <summary>
/// 联系邮箱
/// </summary>
public string Email { get; set; }
/// <summary>
/// 立项编号
/// </summary>
public string ProjectNumber { get; set; }
/// <summary>
/// 检测平台
/// </summary>
public string DetectingPlatform { get; set; }
/// <summary>
/// 客户流量选项数据
/// </summary>
public List<CodeValueIDAndValueModel> ClientDataSizeList { get; set; }
}
public class CodeValueIDAndValueModel {
/// <summary>
/// 编码
/// </summary>
public string CodeID { get; set; }
/// <summary>
/// 名称
/// </summary>
public string CodeName { get; set; }
}
} }
G.MES.Business/G.BaseInfo/ViewModel/SampleTypeModel/SampleTypeRequestModel.cs
...@@ -50,4 +50,17 @@ namespace G.Buss.BaseInfo.ViewModel.SampleTypeModel ...@@ -50,4 +50,17 @@ namespace G.Buss.BaseInfo.ViewModel.SampleTypeModel
public string ClassCode { get; set; } public string ClassCode { get; set; }
} }
public class SampleTypeSelectModel
{
/// <summary>
/// 样本编号
/// </summary>
public string SampleCode { get; set; }
/// <summary>
/// 样本名称
/// </summary>
public string SampleName { get; set; }
}
} }
G.MES.Business/G.BaseInfo/ViewModel/Tumorss/TumorsTypeRequestModel.cs
...@@ -58,4 +58,18 @@ namespace G.Buss.BaseInfo.ViewModel.Tumorss ...@@ -58,4 +58,18 @@ namespace G.Buss.BaseInfo.ViewModel.Tumorss
public string ClassCode { get; set; } public string ClassCode { get; set; }
} }
public class TumorsTypeSelectModel
{
/// <summary>
/// 肿瘤编号
/// </summary>
public string TumorsCode { get; set; }
/// <summary>
/// 肿瘤名称
/// </summary>
public string TumorsName { get; set; }
}
} }
G.MES.DataModel/ClientInfo.cs
...@@ -71,5 +71,67 @@ namespace G.MES.DataModel ...@@ -71,5 +71,67 @@ namespace G.MES.DataModel
public virtual Nullable<System.Guid> SYS_LAST_UPD_BY { get;set; } public virtual Nullable<System.Guid> SYS_LAST_UPD_BY { get;set; }
///<summary><summary> ///<summary><summary>
public virtual string Remark { get;set; } public virtual string Remark { get;set; }
///<summary><summary>
public virtual string ItemsName { get;set; }
///<summary><summary>
public virtual string ItemsType { get;set; }
///<summary><summary>
public virtual string ExperimentalType { get;set; }
///<summary><summary>
public virtual string YKSampleNum { get;set; }
///<summary><summary>
public virtual string RummageNum { get;set; }
///<summary><summary>
public virtual string ClientSampleName { get;set; }
///<summary><summary>
public virtual string Entity { get;set; }
///<summary><summary>
public virtual Nullable<System.DateTime> ReceivedDate { get;set; }
///<summary><summary>
public virtual Nullable<System.DateTime> ProjectDate { get;set; }
///<summary><summary>
public virtual Nullable<System.DateTime> NodeTitleDate { get;set; }
///<summary><summary>
public virtual string SampleSource { get;set; }
///<summary><summary>
public virtual string GroupingSituation { get;set; }
///<summary><summary>
public virtual string Batch { get;set; }
///<summary><summary>
public virtual string CaptureProbe { get;set; }
///<summary><summary>
public virtual string Extracter { get;set; }
///<summary><summary>
public virtual string QualityPeople { get;set; }
///<summary><summary>
public virtual string LabOperator { get;set; }
///<summary><summary>
public virtual Nullable<System.DateTime> DeliveryDate { get;set; }
///<summary><summary>
public virtual string Index_I5 { get;set; }
///<summary><summary>
public virtual string Index_I7 { get;set; }
///<summary><summary>
public virtual string SpotCheck { get;set; }
///<summary><summary>
public virtual string QualityManagement { get;set; }
///<summary><summary>
public virtual string ProcessMode { get;set; }
///<summary><summary>
public virtual string ClientDataSize { get;set; }
///<summary><summary>
public virtual string DeplaneDataSize { get;set; }
///<summary><summary>
public virtual string AdditionalNum { get;set; }
///<summary><summary>
public virtual string FaultRemark { get;set; }
///<summary><summary>
public virtual string ClientUnit { get;set; }
///<summary><summary>
public virtual string Email { get;set; }
///<summary><summary>
public virtual string ProjectNumber { get;set; }
///<summary><summary>
public virtual string DetectingPlatform { get;set; }
} }
} }
G.MES.DbAdapter/App.config
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</defaultConnectionFactory> </defaultConnectionFactory>
</entityFramework> </entityFramework>
<connectionStrings> <connectionStrings>
<add name="DbModelEntities" connectionString="metadata=res://*/DbModel.csdl|res://*/DbModel.ssdl|res://*/DbModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=47.96.124.15;initial catalog=JCBB_MB;persist security info=True;user id=sa;password=valtai;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" /> <add name="DbModelEntities" connectionString="metadata=res://*/DbModel.csdl|res://*/DbModel.ssdl|res://*/DbModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=.;initial catalog=SYSMANAGE;persist security info=True;user id=sa;password=123456;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
</connectionStrings> </connectionStrings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup>
<runtime> <runtime>
......
G.MES.DbAdapter/DbModel.Context.cs
...@@ -61,8 +61,8 @@ namespace G.MES.DataAdapter ...@@ -61,8 +61,8 @@ namespace G.MES.DataAdapter
public DbSet<CodeClassify> CodeClassify { get; set; } public DbSet<CodeClassify> CodeClassify { get; set; }
public DbSet<CodeValue> CodeValue { get; set; } public DbSet<CodeValue> CodeValue { get; set; }
public DbSet<Gene> Gene { get; set; } public DbSet<Gene> Gene { get; set; }
public DbSet<ClientInfo> ClientInfo { get; set; }
public DbSet<Chemotherapy> Chemotherapy { get; set; } public DbSet<Chemotherapy> Chemotherapy { get; set; }
public DbSet<GeneCorrelation> GeneCorrelation { get; set; } public DbSet<GeneCorrelation> GeneCorrelation { get; set; }
public DbSet<ClientInfo> ClientInfo { get; set; }
} }
} }
G.MES.DbAdapter/DbModel.Designer.cs
// 为模型“F:\Work\Project\报告系统\Git\ReportingSystemAPI\G.MES.DbAdapter\DbModel.edmx”启用了 T4 代码生成。 // 为模型“D:\Project\NEWAPI\3.SourceCode\NEWJCBGAPI\G.MES.DbAdapter\DbModel.edmx”启用了 T4 代码生成。
// 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值 // 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值
// 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在 // 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在
// “属性”窗口中。 // “属性”窗口中。
......
G.MES.DbAdapter/DbModel.edmx.diagram
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
<EntityTypeShape EntityType="DbModel.CodeClassify" Width="1.5" PointX="9.375" PointY="9.75" /> <EntityTypeShape EntityType="DbModel.CodeClassify" Width="1.5" PointX="9.375" PointY="9.75" />
<EntityTypeShape EntityType="DbModel.CodeValue" Width="1.5" PointX="11.375" PointY="4.75" /> <EntityTypeShape EntityType="DbModel.CodeValue" Width="1.5" PointX="11.375" PointY="4.75" />
<EntityTypeShape EntityType="DbModel.Gene" Width="1.5" PointX="11.375" PointY="9.75" /> <EntityTypeShape EntityType="DbModel.Gene" Width="1.5" PointX="11.375" PointY="9.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.Chemotherapy" Width="1.5" PointX="0.75" PointY="13.75" />
<EntityTypeShape EntityType="DbModel.GeneCorrelation" Width="1.5" PointX="3.375" PointY="13.75" /> <EntityTypeShape EntityType="DbModel.GeneCorrelation" Width="1.5" PointX="3.375" PointY="13.75" />
<EntityTypeShape EntityType="DbModel.ClientInfo" Width="1.5" PointX="13.375" PointY="0.75" />
</Diagram> </Diagram>
</edmx:Diagrams> </edmx:Diagrams>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论