Skip to content

R
ReportingSystemAPI
Commit a0d3f41a by 刘军
Options

临时提交

parent 9950e341
正在显示 包含 70 行增加 和 59 行删除
G.MES.API/readme.md
......@@ -16,3 +16,8 @@ CREATE TABLE [dbo].[Chemotherapy](
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
```
### 二、修改GeneCorrelation表Type字段类型
> 2019年12月24日14点10分
```
alter table GeneCorrelation alter column [Type] varchar(50)
```
G.MES.Business/G.BaseInfo/Services/ExportWordSVC/ReportDataSvc.cs
......@@ -2,6 +2,7 @@
using Chloe.SqlServer;
using G.Buss.BaseInfo.ViewModel.ClientInfoModel;
using G.Buss.BaseInfo.ViewModel.CodeTableModel;
using G.Buss.BaseInfo.ViewModel.GeneCorrelationModel;
using G.Buss.BaseInfo.ViewModel.GeneticRisksModel;
using G.Buss.BaseInfo.ViewModel.MISReportModel;
using G.Buss.BaseInfo.ViewModel.SampleControlModel;
......@@ -80,9 +81,13 @@ namespace G.Buss.BaseInfo.Services.ExportWordSVC
/// <summary>
/// 获取化疗药物
/// </summary>
public void GetChemotherapyDrugs()
public List<Chemotherapy> GetChemotherapyDrugs()
{
using (var context = new MsSqlContext(sqlConn))
{
List<Chemotherapy> chemotherapies = context.Query<Chemotherapy>().ToList();
return chemotherapies;
}
}
/// <summary>
/// 获取遗传风险
......@@ -152,21 +157,22 @@ namespace G.Buss.BaseInfo.Services.ExportWordSVC
/// <summary>
/// 获取基因列表
/// </summary>
public void GetGeneList()
public List<GeneCorrelationQueryModel> GetGeneList()
{
using (var context = new MsSqlContext(sqlConn))
{
List<SonCodeTableResponseModel> AllSonDictionaryDirectory = context.Query<CodeValue>()
.Where(a => a.CodeTableID == CodeTableID)
.Select(a => new SonCodeTableResponseModel
List<GeneCorrelationQueryModel> GeneCorrelationQuery = context.JoinQuery<GeneCorrelation, CodeValue>((GeneCorrelation, code) => new object[] {
JoinType.LeftJoin,GeneCorrelation.Type == code.CodeID
}).Select((GeneCorrelation, code) => new GeneCorrelationQueryModel
{
CodeID = a.CodeID,
CodeName = a.CodeName,
OrderNo = a.OrderNo,
Reserved3 = a.Reserved3
GeneCorrelationOID = GeneCorrelation.GeneCorrelationOID,
GeneName = GeneCorrelation.GeneName,
SortNo = GeneCorrelation.SortNo,
Type = GeneCorrelation.Type + "",
ClassCode = code.ClassCode,
Color = code.Reserved3
}).ToList();
return AllSonDictionaryDirectory;
return GeneCorrelationQuery;
}
}
/// <summary>
......
G.MES.Business/G.BaseInfo/ViewModel/CodeTableModel/SonCodeTableResponseModel.cs
......@@ -16,6 +16,5 @@ namespace G.Buss.BaseInfo.ViewModel.CodeTableModel
public string Reserved3 { get; set; }
public Guid? CodeClassifyOID { get; set; }
public int? OrderNo { get; set; }
public string Color { get; set; }
}
}
G.MES.Business/G.BaseInfo/ViewModel/GeneCorrelationModel/GeneCorrelationRequestModel.cs
......@@ -58,9 +58,11 @@ namespace G.Buss.BaseInfo.ViewModel.GeneCorrelationModel
public string Type { get; set; }
public string ClassCode { get; set; }
/// <summary>
/// 颜色
/// </summary>
public string Color { get; set; }
}
}
G.MES.DataModel/GeneCorrelation.cs
......@@ -26,7 +26,7 @@ namespace G.MES.DataModel
///<summary><summary>
public virtual Nullable<int> SortNo { get;set; }
///<summary><summary>
public virtual Nullable<int> Type { get;set; }
public virtual string Type { get;set; }
///<summary><summary>
public virtual Nullable<System.DateTime> SYS_Created { get;set; }
///<summary><summary>
......
G.MES.DbAdapter/App.config
......@@ -13,7 +13,7 @@
</defaultConnectionFactory>
</entityFramework>
<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=.;initial catalog=JCBB_MB;persist security info=True;user id=sa;password=P@ssw0rd;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=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" />
</connectionStrings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup>
<runtime>
......
G.MES.DbAdapter/DBModel1.Context1.cs
......@@ -9,7 +9,6 @@
namespace G.MES.DataAdapter
{
using G.MES.DataModel;
using System;
using System.Data.Entity;
using System.Data.Entity.Infrastructure;
......
G.MES.DbAdapter/DbModel.Context.cs
......@@ -50,7 +50,6 @@ namespace G.MES.DataAdapter
public DbSet<TargetedMedicine> TargetedMedicine { get; set; }
public DbSet<TumorsType> TumorsType { get; set; }
public DbSet<ChemicalDrugReferences> ChemicalDrugReferences { get; set; }
public DbSet<GeneCorrelation> GeneCorrelation { get; set; }
public DbSet<GeneDetectionResult> GeneDetectionResult { get; set; }
public DbSet<GeneticRisks> GeneticRisks { get; set; }
public DbSet<InformedConsent> InformedConsent { get; set; }
......@@ -64,5 +63,6 @@ namespace G.MES.DataAdapter
public DbSet<Gene> Gene { get; set; }
public DbSet<ClientInfo> ClientInfo { get; set; }
public DbSet<Chemotherapy> Chemotherapy { get; set; }
public DbSet<GeneCorrelation> GeneCorrelation { get; set; }
}
}
G.MES.DbAdapter/DbModel.edmx
......@@ -132,7 +132,7 @@
<Property Name="GeneCorrelationOID" Type="uniqueidentifier" Nullable="false" />
<Property Name="GeneName" Type="varchar" MaxLength="50" />
<Property Name="SortNo" Type="int" />
<Property Name="Type" Type="int" />
<Property Name="Type" Type="varchar" MaxLength="50" />
<Property Name="SYS_Created" Type="datetime" />
<Property Name="SYS_LAST_UPD" Type="datetime" />
<Property Name="SYS_CreatedBy" Type="uniqueidentifier" />
......@@ -666,7 +666,6 @@
<EntitySet Name="TargetedMedicine" EntityType="DbModel.TargetedMedicine" />
<EntitySet Name="TumorsType" EntityType="DbModel.TumorsType" />
<EntitySet Name="ChemicalDrugReferences" EntityType="DbModel.ChemicalDrugReferences" />
<EntitySet Name="GeneCorrelation" EntityType="DbModel.GeneCorrelation" />
<EntitySet Name="GeneDetectionResult" EntityType="DbModel.GeneDetectionResult" />
<EntitySet Name="GeneticRisks" EntityType="DbModel.GeneticRisks" />
<EntitySet Name="InformedConsent" EntityType="DbModel.InformedConsent" />
......@@ -680,6 +679,7 @@
<EntitySet Name="Gene" EntityType="DbModel.Gene" />
<EntitySet Name="ClientInfo" EntityType="DbModel.ClientInfo" />
<EntitySet Name="Chemotherapy" EntityType="DbModel.Chemotherapy" />
<EntitySet Name="GeneCorrelation" EntityType="DbModel.GeneCorrelation" />
</EntityContainer>
<EntityType Name="Sys_BusiPortalMenu">
......@@ -1028,23 +1028,6 @@
<Property Name="SYS_ORG" Type="Guid" />
<Property Name="SYS_LAST_UPD_BY" Type="Guid" />
</EntityType>
<EntityType Name="GeneCorrelation">
<Key>
<PropertyRef Name="GeneCorrelationOID" />
</Key>
<Property Name="GeneCorrelationOID" Type="Guid" Nullable="false" />
<Property Name="GeneName" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="SortNo" Type="Int32" />
<Property Name="Type" Type="Int32" />
<Property Name="SYS_Created" Type="DateTime" Precision="3" />
<Property Name="SYS_LAST_UPD" Type="DateTime" Precision="3" />
<Property Name="SYS_CreatedBy" Type="Guid" />
<Property Name="SYS_REPLACEMENT" Type="Guid" />
<Property Name="SYS_POSTN" Type="Guid" />
<Property Name="SYS_DIVISION" Type="Guid" />
<Property Name="SYS_ORG" Type="Guid" />
<Property Name="SYS_LAST_UPD_BY" Type="Guid" />
</EntityType>
<EntityType Name="GeneDetectionResult">
<Key>
<PropertyRef Name="GeneDetectionResultOID" />
......@@ -1282,6 +1265,23 @@
<Property Name="MedicationPrompts" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
<Property Name="Levels" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
</EntityType>
<EntityType Name="GeneCorrelation">
<Key>
<PropertyRef Name="GeneCorrelationOID" />
</Key>
<Property Name="GeneCorrelationOID" Type="Guid" Nullable="false" />
<Property Name="GeneName" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="SortNo" Type="Int32" />
<Property Name="Type" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="SYS_Created" Type="DateTime" Precision="3" />
<Property Name="SYS_LAST_UPD" Type="DateTime" Precision="3" />
<Property Name="SYS_CreatedBy" Type="Guid" />
<Property Name="SYS_REPLACEMENT" Type="Guid" />
<Property Name="SYS_POSTN" Type="Guid" />
<Property Name="SYS_DIVISION" Type="Guid" />
<Property Name="SYS_ORG" Type="Guid" />
<Property Name="SYS_LAST_UPD_BY" Type="Guid" />
</EntityType>
</Schema>
</edmx:ConceptualModels>
......@@ -1568,24 +1568,6 @@
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="GeneCorrelation">
<EntityTypeMapping TypeName="DbModel.GeneCorrelation">
<MappingFragment StoreEntitySet="GeneCorrelation">
<ScalarProperty Name="SYS_LAST_UPD_BY" ColumnName="SYS_LAST_UPD_BY" />
<ScalarProperty Name="SYS_ORG" ColumnName="SYS_ORG" />
<ScalarProperty Name="SYS_DIVISION" ColumnName="SYS_DIVISION" />
<ScalarProperty Name="SYS_POSTN" ColumnName="SYS_POSTN" />
<ScalarProperty Name="SYS_REPLACEMENT" ColumnName="SYS_REPLACEMENT" />
<ScalarProperty Name="SYS_CreatedBy" ColumnName="SYS_CreatedBy" />
<ScalarProperty Name="SYS_LAST_UPD" ColumnName="SYS_LAST_UPD" />
<ScalarProperty Name="SYS_Created" ColumnName="SYS_Created" />
<ScalarProperty Name="Type" ColumnName="Type" />
<ScalarProperty Name="SortNo" ColumnName="SortNo" />
<ScalarProperty Name="GeneName" ColumnName="GeneName" />
<ScalarProperty Name="GeneCorrelationOID" ColumnName="GeneCorrelationOID" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="GeneDetectionResult">
<EntityTypeMapping TypeName="DbModel.GeneDetectionResult">
<MappingFragment StoreEntitySet="GeneDetectionResult">
......@@ -1836,6 +1818,24 @@
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="GeneCorrelation">
<EntityTypeMapping TypeName="DbModel.GeneCorrelation">
<MappingFragment StoreEntitySet="GeneCorrelation">
<ScalarProperty Name="SYS_LAST_UPD_BY" ColumnName="SYS_LAST_UPD_BY" />
<ScalarProperty Name="SYS_ORG" ColumnName="SYS_ORG" />
<ScalarProperty Name="SYS_DIVISION" ColumnName="SYS_DIVISION" />
<ScalarProperty Name="SYS_POSTN" ColumnName="SYS_POSTN" />
<ScalarProperty Name="SYS_REPLACEMENT" ColumnName="SYS_REPLACEMENT" />
<ScalarProperty Name="SYS_CreatedBy" ColumnName="SYS_CreatedBy" />
<ScalarProperty Name="SYS_LAST_UPD" ColumnName="SYS_LAST_UPD" />
<ScalarProperty Name="SYS_Created" ColumnName="SYS_Created" />
<ScalarProperty Name="Type" ColumnName="Type" />
<ScalarProperty Name="SortNo" ColumnName="SortNo" />
<ScalarProperty Name="GeneName" ColumnName="GeneName" />
<ScalarProperty Name="GeneCorrelationOID" ColumnName="GeneCorrelationOID" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
</EntityContainerMapping>
</Mapping></edmx:Mappings>
</edmx:Runtime>
......
G.MES.DbAdapter/DbModel.edmx.diagram
......@@ -4,7 +4,7 @@
<edmx:Designer xmlns="http://schemas.microsoft.com/ado/2008/10/edmx">
<!-- Diagram content (shape and connector positions) -->
<edmx:Diagrams>
<Diagram DiagramId="9f8a19998537481ebe0af75d709f372f" Name="关系图1" ZoomLevel="43">
<Diagram DiagramId="9f8a19998537481ebe0af75d709f372f" Name="关系图1" ZoomLevel="95">
<EntityTypeShape EntityType="DbModel.Sys_BusiPortalMenu" Width="1.5" PointX="0.75" PointY="1" />
<EntityTypeShape EntityType="DbModel.Sys_Organize" Width="1.5" PointX="2.75" PointY="5" />
<EntityTypeShape EntityType="DbModel.Sys_Post" Width="1.5" PointX="5" PointY="5.375" />
......@@ -30,7 +30,6 @@
<EntityTypeShape EntityType="DbModel.TargetedMedicine" Width="1.5" PointX="13.375" PointY="27.75" />
<EntityTypeShape EntityType="DbModel.TumorsType" Width="1.5" PointX="15.375" PointY="27.75" />
<EntityTypeShape EntityType="DbModel.ChemicalDrugReferences" Width="1.5" PointX="7.375" PointY="4.75" />
<EntityTypeShape EntityType="DbModel.GeneCorrelation" Width="1.5" PointX="28.375" PointY="4.75" />
<EntityTypeShape EntityType="DbModel.GeneDetectionResult" Width="1.5" PointX="28.375" PointY="8.75" />
<EntityTypeShape EntityType="DbModel.GeneticRisks" Width="1.5" PointX="28.375" PointY="13.75" />
<EntityTypeShape EntityType="DbModel.InformedConsent" Width="1.5" PointX="17.375" PointY="28.75" />
......@@ -44,6 +43,7 @@
<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.GeneCorrelation" Width="1.5" PointX="3.375" PointY="13.75" />
</Diagram>
</edmx:Diagrams>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论