Skip to content

R
ReportingSystemAPI
Commit 1ca9a2bd by 徐建业
Options

受检者模块调整

parent a89def6e
正在显示 包含 421 行增加 和 90 行删除
G.MES.API/Controllers/ClientInfoController.cs
...@@ -14,7 +14,7 @@ namespace G.MES.API.Controllers ...@@ -14,7 +14,7 @@ namespace G.MES.API.Controllers
/// <summary> /// <summary>
/// 受检者信息 /// 受检者信息
/// </summary> /// </summary>
public class ClientInfoController:BasicController public class ClientInfoController : BasicController
{ {
public readonly ClientInfoSVC ClientInfo = new ClientInfoSVC(); public readonly ClientInfoSVC ClientInfo = new ClientInfoSVC();
/// <summary> /// <summary>
...@@ -128,5 +128,23 @@ namespace G.MES.API.Controllers ...@@ -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 @@ ...@@ -945,13 +945,13 @@
<Content Include="Template\PMID模板.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" />
<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\Chemotherapy.xlsx" />
<Content Include="Template\Summary.xlsx" /> <Content Include="Template\Summary.xlsx" />
<Content Include="Template\受检者基本信息模块.xlsx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="App_Data\" /> <Folder Include="App_Data\" />
......
G.MES.API/Web.config
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<!--导出问卷路径--> <!--导出问卷路径-->
<add key="ExportFilePath" value="E:\Export" /> <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" /> <add key="lywjurl" value="E:\GideaProject\TestUpLoadFile\ly" />
<!--回复图片路径--> <!--回复图片路径-->
......
G.MES.Business/G.BaseInfo/Services/ClientInfoSVC/ClientInfoSVC.cs
using Chloe; using Aspose.Cells;
using Chloe;
using Chloe.SqlServer; using Chloe.SqlServer;
using Common.Unit; using Common.Unit;
using G.Buss.BaseInfo.ViewModel.ClientInfoModel; using G.Buss.BaseInfo.ViewModel.ClientInfoModel;
...@@ -9,8 +10,11 @@ using NPOI.SS.UserModel; ...@@ -9,8 +10,11 @@ using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel; using NPOI.XSSF.UserModel;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Configuration;
using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Web; using System.Web;
...@@ -30,32 +34,18 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC ...@@ -30,32 +34,18 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC
.Select(a => new ClientInfoDetailModel .Select(a => new ClientInfoDetailModel
{ {
ClientInfoOID = a.ClientInfoOID, ClientInfoOID = a.ClientInfoOID,
Name = a.Name,
Sex = a.Sex,
IDCard = a.IDCard,
Birth = a.Birth,
SampleCode = a.SampleCode,
SampleType = a.SampleType,
Phone = a.Phone,
SampleDetection = a.SampleDetection,
TechnologyDetection = a.TechnologyDetection,
TumorsType = a.TumorsType,
TBM = a.TBM,
IsEssential = a.IsEssential,
ClinicalDiagnosis = a.ClinicalDiagnosis,
FamilyHistory = a.FamilyHistory,
PersonalHistory = a.PersonalHistory,
ItemsName = a.ItemsName, ItemsName = a.ItemsName,
ItemsType = a.ItemsType, ItemsType = a.ItemsType,
ExperimentalType = a.ExperimentalType, ExperimentalType = a.ExperimentalType,
Name = a.Name,
YKSampleNum = a.YKSampleNum, YKSampleNum = a.YKSampleNum,
RummageNum = a.RummageNum, RummageNum = a.RummageNum,
ClientSampleName = a.ClientSampleName, ClientSampleName = a.ClientSampleName,
Entity = a.Entity, Entity = a.Entity,
Sex = a.Sex,
ReceivedDate = a.ReceivedDate, ReceivedDate = a.ReceivedDate,
ProjectDate = a.ProjectDate, ProjectDate = a.ProjectDate,
NodeTitleDate = a.NodeTitleDate, NodeTitleDate = a.NodeTitleDate,
SampleSource = a.SampleSource,
GroupingSituation = a.GroupingSituation, GroupingSituation = a.GroupingSituation,
Batch = a.Batch, Batch = a.Batch,
CaptureProbe = a.CaptureProbe, CaptureProbe = a.CaptureProbe,
...@@ -74,8 +64,22 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC ...@@ -74,8 +64,22 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC
FaultRemark = a.FaultRemark, FaultRemark = a.FaultRemark,
ClientUnit = a.ClientUnit, ClientUnit = a.ClientUnit,
Email = a.Email, Email = a.Email,
Phone = a.Phone,
ProjectNumber = a.ProjectNumber, ProjectNumber = a.ProjectNumber,
DetectingPlatform = a.DetectingPlatform Birth = a.Birth,
IDCard = a.IDCard,
SampleDetection = a.SampleDetection,
TechnologyDetection = a.TechnologyDetection,
DetectingPlatform = a.DetectingPlatform,
TNM = a.TNM,
IsEssential = a.IsEssential,
ClinicalDiagnosis = a.ClinicalDiagnosis,
FamilyHistory = a.FamilyHistory,
PersonalHistory = a.PersonalHistory
//SampleCode = a.SampleCode,
//SampleType = a.SampleType,
//TumorsType = a.TumorsType,
//SampleSource = a.SampleSource,
}).ToList(); }).ToList();
thisQueryModel[0].ClientDataSizeList = GetClientDataSizeCodeValue(); thisQueryModel[0].ClientDataSizeList = GetClientDataSizeCodeValue();
...@@ -244,7 +248,7 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC ...@@ -244,7 +248,7 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC
nowSam.SampleDetection = ClientInfo.SampleDetection; nowSam.SampleDetection = ClientInfo.SampleDetection;
nowSam.TechnologyDetection = ClientInfo.TechnologyDetection; nowSam.TechnologyDetection = ClientInfo.TechnologyDetection;
nowSam.TumorsType = ClientInfo.TumorsType; nowSam.TumorsType = ClientInfo.TumorsType;
nowSam.TBM = ClientInfo.TBM; nowSam.TNM = ClientInfo.TNM;
nowSam.IsEssential = ClientInfo.IsEssential; nowSam.IsEssential = ClientInfo.IsEssential;
nowSam.ClinicalDiagnosis = ClientInfo.ClinicalDiagnosis; nowSam.ClinicalDiagnosis = ClientInfo.ClinicalDiagnosis;
nowSam.FamilyHistory = ClientInfo.FamilyHistory; nowSam.FamilyHistory = ClientInfo.FamilyHistory;
...@@ -299,7 +303,7 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC ...@@ -299,7 +303,7 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC
nowSam.SampleDetection = ClientInfo.SampleDetection; nowSam.SampleDetection = ClientInfo.SampleDetection;
nowSam.TechnologyDetection = ClientInfo.TechnologyDetection; nowSam.TechnologyDetection = ClientInfo.TechnologyDetection;
nowSam.TumorsType = ClientInfo.TumorsType; nowSam.TumorsType = ClientInfo.TumorsType;
nowSam.TBM = ClientInfo.TBM; nowSam.TNM = ClientInfo.TNM;
nowSam.IsEssential = ClientInfo.IsEssential; nowSam.IsEssential = ClientInfo.IsEssential;
nowSam.ClinicalDiagnosis = ClientInfo.ClinicalDiagnosis; nowSam.ClinicalDiagnosis = ClientInfo.ClinicalDiagnosis;
nowSam.FamilyHistory = ClientInfo.FamilyHistory; nowSam.FamilyHistory = ClientInfo.FamilyHistory;
...@@ -367,6 +371,219 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC ...@@ -367,6 +371,219 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC
} }
#endregion #endregion
#region Excel导出
public string DoExportClientInfo(LoginInfo user)
{
using (var context = new MsSqlContext(sqlConn))
{
Workbook workBook = new Workbook();
Worksheet sheet = workBook.Worksheets[0];
Directory.CreateDirectory(ConfigurationManager.AppSettings["ExportFilePath"].ToString());
//设置EXCEL类型和基础信息及创建默认导出路径
workBook.FileFormat = FileFormatType.Xlsx;
TimeSpan ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
string dataTime = Convert.ToInt64(ts.TotalSeconds).ToString();
string ExportTitle = "受检者信息";
try
{
List<ClientInfoDetailModel> thisQueryModel = context.JoinQuery<ClientInfo, Sys_Organize>((client, org) => new object[] {
JoinType.LeftJoin,client.SYS_ORG==org.Sys_OrganizeOID
})
//.Where((a, b) => b.ClassCode.StartsWith(user.OrgClassCode))
.Select((a, b) => a)
.Select(a => new ClientInfoDetailModel
{
ClientInfoOID = a.ClientInfoOID,
ItemsName = a.ItemsName,
ItemsType = a.ItemsType,
ExperimentalType = a.ExperimentalType,
Name = a.Name,
YKSampleNum = a.YKSampleNum,
RummageNum = a.RummageNum,
ClientSampleName = a.ClientSampleName,
Entity = a.Entity,
Sex = a.Sex,
ReceivedDate = a.ReceivedDate,
ProjectDate = a.ProjectDate,
NodeTitleDate = a.NodeTitleDate,
SampleType = a.SampleType,
SampleSource = a.SampleSource,
GroupingSituation = a.GroupingSituation,
Batch = a.Batch,
CaptureProbe = a.CaptureProbe,
Extracter = a.Extracter,
QualityPeople = a.QualityPeople,
LabOperator = a.LabOperator,
DeliveryDate = a.DeliveryDate,
Index_I5 = a.Index_I5,
Index_I7 = a.Index_I7,
SpotCheck = a.SpotCheck,
QualityManagement = a.QualityManagement,
ProcessMode = a.ProcessMode,
ClientDataSize = a.ClientDataSize,
DeplaneDataSize = a.DeplaneDataSize,
AdditionalNum = a.AdditionalNum,
FaultRemark = a.FaultRemark,
ClientUnit = a.ClientUnit,
Email = a.Email,
Phone = a.Phone,
ProjectNumber = a.ProjectNumber,
Birth = a.Birth,
IDCard = a.IDCard,
CompanyPhone = a.CompanyPhone,
SampleDetection = a.SampleDetection,
TechnologyDetection = a.TechnologyDetection,
DetectingPlatform = a.DetectingPlatform,
TNM = a.TNM,
IsEssential = a.IsEssential,
ClinicalDiagnosis = a.ClinicalDiagnosis,
FamilyHistory = a.FamilyHistory,
PersonalHistory = a.PersonalHistory
}).ToList();
List<string> RowFirst = new List<string>() { "项目名称",
"项目类型",
"实验类型",
"客户姓名",
"YK样本编号",
"临检号",
"客户样本名称",
"癌种/病种",
"性别",
"收样日期",
"立项日期",
"预计结题日期",
"样本类型",
"样本来源",
"分组情况",
"批次",
"捕获探针",
"提取人",
"质检人",
"实验操作员",
"外送日期",
"index_I5",
"index_I7",
"文库自身抽检情况",
"公司质检情况",
"处理方式",
"客户数据量要求",
"实际下机数据量",
"加测、补做情况(次数)",
"操作失误备注",
"客户单位",
"联系邮箱",
"联系电话",
"立项编号",
"出生日期",
"身份证号码",
"联系电话",
"检测样本",
"检测技术",
"检测平台",
"TNM分期 ",
"是否原发",
"临床诊断",
"家族病史",
"个人病史及用药史"
};
int cellNum = 0;
foreach (string item in RowFirst)
{
sheet.Cells[0, cellNum++].Value = item;
}
int rowNum = 1;
foreach (ClientInfoDetailModel a in thisQueryModel)
{
cellNum = 0;
sheet.Cells[rowNum, cellNum++].Value = a.ItemsName;
sheet.Cells[rowNum, cellNum++].Value = a.ItemsType;
sheet.Cells[rowNum, cellNum++].Value = a.ExperimentalType;
sheet.Cells[rowNum, cellNum++].Value = a.Name;
sheet.Cells[rowNum, cellNum++].Value = a.YKSampleNum;
sheet.Cells[rowNum, cellNum++].Value = a.RummageNum;
sheet.Cells[rowNum, cellNum++].Value = a.ClientSampleName;
sheet.Cells[rowNum, cellNum++].Value = a.Entity;
sheet.Cells[rowNum, cellNum++].Value = a.Sex==1?"男":"女";
sheet.Cells[rowNum, cellNum++].Value = a.ReceivedDate==null?"":((DateTime) a.ReceivedDate).ToString("yyyy-MM-dd");
sheet.Cells[rowNum, cellNum++].Value = a.ProjectDate == null?"":((DateTime)a.ProjectDate).ToString("yyyy-MM-dd");
sheet.Cells[rowNum, cellNum++].Value = a.NodeTitleDate == null ? "" : ((DateTime)a.NodeTitleDate).ToString("yyyy-MM-dd") ;
sheet.Cells[rowNum, cellNum++].Value = a.SampleType;
sheet.Cells[rowNum, cellNum++].Value = a.SampleSource;
sheet.Cells[rowNum, cellNum++].Value = a.GroupingSituation;
sheet.Cells[rowNum, cellNum++].Value = a.Batch;
sheet.Cells[rowNum, cellNum++].Value = a.CaptureProbe;
sheet.Cells[rowNum, cellNum++].Value = a.Extracter;
sheet.Cells[rowNum, cellNum++].Value = a.QualityPeople;
sheet.Cells[rowNum, cellNum++].Value = a.LabOperator;
sheet.Cells[rowNum, cellNum++].Value = a.DeliveryDate == null ? "":((DateTime)a.DeliveryDate).ToString("yyyy-MM-dd");
sheet.Cells[rowNum, cellNum++].Value = a.Index_I5;
sheet.Cells[rowNum, cellNum++].Value = a.Index_I7;
sheet.Cells[rowNum, cellNum++].Value = a.SpotCheck;
sheet.Cells[rowNum, cellNum++].Value = a.QualityManagement;
sheet.Cells[rowNum, cellNum++].Value = a.ProcessMode;
sheet.Cells[rowNum, cellNum++].Value = a.ClientDataSize;
sheet.Cells[rowNum, cellNum++].Value = a.DeplaneDataSize;
sheet.Cells[rowNum, cellNum++].Value = a.AdditionalNum;
sheet.Cells[rowNum, cellNum++].Value = a.FaultRemark;
sheet.Cells[rowNum, cellNum++].Value = a.ClientUnit;
sheet.Cells[rowNum, cellNum++].Value = a.Email;
sheet.Cells[rowNum, cellNum++].Value = a.Phone;
sheet.Cells[rowNum, cellNum++].Value = a.ProjectNumber;
sheet.Cells[rowNum, cellNum++].Value = a.Birth == null ? "" : ((DateTime)a.Birth).ToString("yyyy-MM-dd");
sheet.Cells[rowNum, cellNum++].Value = a.IDCard;
sheet.Cells[rowNum, cellNum++].Value = a.CompanyPhone;
sheet.Cells[rowNum, cellNum++].Value = a.SampleDetection;
sheet.Cells[rowNum, cellNum++].Value = a.TechnologyDetection;
sheet.Cells[rowNum, cellNum++].Value = a.DetectingPlatform;
sheet.Cells[rowNum, cellNum++].Value = a.TNM;
sheet.Cells[rowNum, cellNum++].Value = a.IsEssential;
sheet.Cells[rowNum, cellNum++].Value = a.ClinicalDiagnosis;
sheet.Cells[rowNum, cellNum++].Value = a.FamilyHistory;
sheet.Cells[rowNum, cellNum++].Value = a.PersonalHistory;
rowNum++;
}
workBook.Save(ConfigurationManager.AppSettings["ExportFilePath"].ToString() + "\\" + ExportTitle + dataTime + ".xlsx");
return ConfigurationManager.AppSettings["MainWebSite"].ToString() + "/ExportFile/" + ExportTitle + dataTime + ".xlsx";
}
catch (Exception ex)
{
throw new Exception(ex.Message);
}
}
}
/// <summary>
/// 插入任务
/// </summary>
/// <param name="uer"></param>
public Guid DoInsertMission(LoginInfo user)
{
Guid MissionOID = Guid.NewGuid();
using (var context = new MsSqlContext(sqlConn))
{
Mission mission = new Mission()
{
MissionOID = MissionOID,
MissionName = "导出受检者",
StartTime = DateTime.Now,
ExportPeople = user.Sys_UserOID,
CurrentProcess = "0%",
SYS_ORG = user.Sys_OrganizeOID
};
context.Insert(mission);
return MissionOID;
}
}
#endregion
#region Excel导入 #region Excel导入
public bool DoImportClientInfo(HttpPostedFile file, LoginInfo user) public bool DoImportClientInfo(HttpPostedFile file, LoginInfo user)
{ {
...@@ -400,20 +617,20 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC ...@@ -400,20 +617,20 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC
ClientInfo.ClientSampleName = Irow.GetCell(6).ToString(); ClientInfo.ClientSampleName = Irow.GetCell(6).ToString();
ClientInfo.Entity = Irow.GetCell(7).ToString(); ClientInfo.Entity = Irow.GetCell(7).ToString();
ClientInfo.Sex = Irow.GetCell(8) == null ? 1 : Irow.GetCell(8).ToString().Contains("男") ? 1 : 0; ClientInfo.Sex = Irow.GetCell(8) == null ? 1 : Irow.GetCell(8).ToString().Contains("男") ? 1 : 0;
if (Irow.GetCell(9) != null && string.IsNullOrEmpty(Irow.GetCell(9).ToString())) if (Irow.GetCell(9) != null && !string.IsNullOrEmpty(Irow.GetCell(9).ToString()))
{ {
DateTime dtDate; DateTime dtDate;
DateTime.TryParse(Irow.GetCell(9).ToString(), out dtDate); DateTime.TryParse(Irow.GetCell(9).ToString(), out dtDate);
ClientInfo.ReceivedDate = dtDate; ClientInfo.ReceivedDate = dtDate;
} }
if (Irow.GetCell(10) != null && string.IsNullOrEmpty(Irow.GetCell(10).ToString())) if (Irow.GetCell(10) != null &&!string.IsNullOrEmpty(Irow.GetCell(10).ToString()))
{ {
DateTime dtDate; DateTime dtDate;
DateTime.TryParse(Irow.GetCell(10).ToString(), out dtDate); DateTime.TryParse(Irow.GetCell(10).ToString(), out dtDate);
ClientInfo.ProjectDate = dtDate; ClientInfo.ProjectDate = dtDate;
} }
if (Irow.GetCell(11) != null && string.IsNullOrEmpty(Irow.GetCell(11).ToString())) if (Irow.GetCell(11) != null && !string.IsNullOrEmpty(Irow.GetCell(11).ToString()))
{ {
DateTime dtDate; DateTime dtDate;
DateTime.TryParse(Irow.GetCell(11).ToString(), out dtDate); DateTime.TryParse(Irow.GetCell(11).ToString(), out dtDate);
...@@ -427,7 +644,7 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC ...@@ -427,7 +644,7 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC
ClientInfo.Extracter = Irow.GetCell(17).ToString(); ClientInfo.Extracter = Irow.GetCell(17).ToString();
ClientInfo.QualityPeople = Irow.GetCell(18).ToString(); ClientInfo.QualityPeople = Irow.GetCell(18).ToString();
ClientInfo.LabOperator = Irow.GetCell(19).ToString(); ClientInfo.LabOperator = Irow.GetCell(19).ToString();
if (Irow.GetCell(20) != null && string.IsNullOrEmpty(Irow.GetCell(20).ToString())) if (Irow.GetCell(20) != null && !string.IsNullOrEmpty(Irow.GetCell(20).ToString()))
{ {
DateTime dtDate; DateTime dtDate;
...@@ -449,30 +666,22 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC ...@@ -449,30 +666,22 @@ namespace G.Buss.BaseInfo.Services.ClientInfoSVC
ClientInfo.Email = Irow.GetCell(31).ToString(); ClientInfo.Email = Irow.GetCell(31).ToString();
ClientInfo.Phone = Irow.GetCell(32).ToString(); ClientInfo.Phone = Irow.GetCell(32).ToString();
ClientInfo.ProjectNumber = Irow.GetCell(33).ToString(); ClientInfo.ProjectNumber = Irow.GetCell(33).ToString();
if (Irow.GetCell(34) != null && string.IsNullOrEmpty(Irow.GetCell(34).ToString())) if (Irow.GetCell(34) != null && !string.IsNullOrEmpty(Irow.GetCell(34).ToString()))
{ {
DateTime dtDate; DateTime dtDate;
DateTime.TryParse(Irow.GetCell(34).ToString(), out dtDate); DateTime.TryParse(Irow.GetCell(34).ToString(), out dtDate);
ClientInfo.Birth = dtDate; ClientInfo.Birth = dtDate;
} }
ClientInfo.IDCard = Irow.GetCell(35).ToString(); ClientInfo.IDCard = Irow.GetCell(35).ToString();
ClientInfo.SampleDetection = Irow.GetCell(36).ToString(); ClientInfo.CompanyPhone = Irow.GetCell(36).ToString();
ClientInfo.TechnologyDetection = Irow.GetCell(37).ToString(); ClientInfo.SampleDetection = Irow.GetCell(37).ToString();
ClientInfo.DetectingPlatform = Irow.GetCell(38).ToString(); ClientInfo.TechnologyDetection = Irow.GetCell(38).ToString();
ClientInfo.TBM = Irow.GetCell(39).ToString(); ClientInfo.DetectingPlatform = Irow.GetCell(39).ToString();
ClientInfo.IsEssential = Irow.GetCell(40) == null ? true : Irow.GetCell(40).ToString().Contains("是") ? true : false; ClientInfo.TNM = Irow.GetCell(40).ToString();
ClientInfo.ClinicalDiagnosis = Irow.GetCell(41).ToString(); ClientInfo.IsEssential = Irow.GetCell(41) == null ? true : Irow.GetCell(40).ToString().Contains("是") ? true : false;
ClientInfo.FamilyHistory = Irow.GetCell(42).ToString(); ClientInfo.ClinicalDiagnosis = Irow.GetCell(42).ToString();
ClientInfo.SampleCode = Irow.GetCell(43).ToString(); ClientInfo.FamilyHistory = Irow.GetCell(43).ToString();
if (Irow.GetCell(44) != null && string.IsNullOrEmpty(Irow.GetCell(44).ToString())) ClientInfo.PersonalHistory = Irow.GetCell(44).ToString();
{
DateTime dtDate;
DateTime.TryParse(Irow.GetCell(44).ToString(), out dtDate);
ClientInfo.SamplingTime = dtDate;
}
ClientInfo.TumorsType = Irow.GetCell(45).ToString();
ClientInfo.PersonalHistory = Irow.GetCell(46).ToString();
DoSaveClientInfo(ClientInfo, user); DoSaveClientInfo(ClientInfo, user);
......
G.MES.Business/G.BaseInfo/Services/ExportWordSVC/ReportDataSvc.cs
...@@ -44,7 +44,7 @@ namespace G.Buss.BaseInfo.Services.ExportWordSVC ...@@ -44,7 +44,7 @@ namespace G.Buss.BaseInfo.Services.ExportWordSVC
SampleDetection = a.SampleDetection, SampleDetection = a.SampleDetection,
TechnologyDetection = a.TechnologyDetection, TechnologyDetection = a.TechnologyDetection,
TumorsType = a.TumorsType, TumorsType = a.TumorsType,
TBM = a.TBM, TNM = a.TNM,
IsEssential = a.IsEssential, IsEssential = a.IsEssential,
ClinicalDiagnosis = a.ClinicalDiagnosis, ClinicalDiagnosis = a.ClinicalDiagnosis,
FamilyHistory = a.FamilyHistory, FamilyHistory = a.FamilyHistory,
......
G.MES.Business/G.BaseInfo/Services/SampleTypeSVC/SampleTypeSVC.cs
...@@ -26,14 +26,16 @@ namespace G.Buss.BaseInfo.Services.SampleTypeSVC ...@@ -26,14 +26,16 @@ namespace G.Buss.BaseInfo.Services.SampleTypeSVC
GetWhere(requestModel, user, out LamadaExtention<SampleTypeQueryModel> where); GetWhere(requestModel, user, out LamadaExtention<SampleTypeQueryModel> where);
using (var context = new MsSqlContext(sqlConn)) using (var context = new MsSqlContext(sqlConn))
{ {
var sampleTypeQuery = context.JoinQuery<SampleType, Sys_Organize>((sample, org) => new object[] { var sampleTypeQuery = context.JoinQuery<SampleType,ClientInfo, Sys_Organize>((sample,client, org) => new object[] {
JoinType.LeftJoin,sample.SYS_ORG == org.Sys_OrganizeOID JoinType.LeftJoin,sample.SYS_ORG == org.Sys_OrganizeOID,
}).Select((sample, org) => new SampleTypeQueryModel JoinType.LeftJoin,sample.SampleCode == client.SampleCode
}).Select((sample, client,org) => new SampleTypeQueryModel
{ {
SampleTypeOID = sample.SampleTypeOID, SampleTypeOID = sample.SampleTypeOID,
SampleCode = sample.SampleCode, SampleCode = sample.SampleCode,
SampleName = sample.SampleName, SampleName = sample.SampleName,
ClassCode = org.ClassCode ClassCode = org.ClassCode,
ClientOID = client.ClientInfoOID
}).Where(where.GetLambda()); }).Where(where.GetLambda());
int TotalNum = sampleTypeQuery.Count(); int TotalNum = sampleTypeQuery.Count();
......
G.MES.Business/G.BaseInfo/ViewModel/ClientInfoModel/ClientInfoRequestModel.cs
...@@ -55,6 +55,11 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel ...@@ -55,6 +55,11 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel
/// </summary> /// </summary>
[JsonConverter(typeof(ShortDateFormat))] [JsonConverter(typeof(ShortDateFormat))]
public DateTime? Birth { get; set; } public DateTime? Birth { get; set; }
/// <summary>
/// 公司号码
/// </summary>
public string CompanyPhone { get; set; }
/// <summary> /// <summary>
/// 样本编码 /// 样本编码
/// </summary> /// </summary>
...@@ -87,9 +92,9 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel ...@@ -87,9 +92,9 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel
/// </summary> /// </summary>
public string TumorsType { get; set; } public string TumorsType { get; set; }
/// <summary> /// <summary>
/// TBM分期 /// TNM分期
/// </summary> /// </summary>
public string TBM { get; set; } public string TNM { get; set; }
/// <summary> /// <summary>
/// 是否原发 1 是，0 否 /// 是否原发 1 是，0 否
/// </summary> /// </summary>
...@@ -287,6 +292,10 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel ...@@ -287,6 +292,10 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel
/// </summary> /// </summary>
public string IDCard { get; set; } public string IDCard { get; set; }
/// <summary> /// <summary>
/// 公司号码
/// </summary>
public string CompanyPhone { get; set; }
/// <summary>
/// 出生日期 /// 出生日期
/// </summary> /// </summary>
[JsonConverter(typeof(ShortDateFormat))] [JsonConverter(typeof(ShortDateFormat))]
...@@ -320,9 +329,9 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel ...@@ -320,9 +329,9 @@ namespace G.Buss.BaseInfo.ViewModel.ClientInfoModel
/// </summary> /// </summary>
public string TumorsType { get; set; } public string TumorsType { get; set; }
/// <summary> /// <summary>
/// TBM分期 /// TNM分期
/// </summary> /// </summary>
public string TBM { get; set; } public string TNM { get; set; }
/// <summary> /// <summary>
/// 是否原发 1 是，0 否 /// 是否原发 1 是，0 否
/// </summary> /// </summary>
......
G.MES.Business/G.BaseInfo/ViewModel/SampleTypeModel/SampleTypeRequestModel.cs
...@@ -49,6 +49,7 @@ namespace G.Buss.BaseInfo.ViewModel.SampleTypeModel ...@@ -49,6 +49,7 @@ namespace G.Buss.BaseInfo.ViewModel.SampleTypeModel
public string SampleName { get; set; } public string SampleName { get; set; }
public string ClassCode { get; set; } public string ClassCode { get; set; }
public Guid ClientOID { get; set; }
} }
public class SampleTypeSelectModel public class SampleTypeSelectModel
{ {
......
G.MES.DataModel/1.G.MES.DataModel.csproj
...@@ -104,6 +104,9 @@ ...@@ -104,6 +104,9 @@
<Compile Include="MISReport.cs"> <Compile Include="MISReport.cs">
<DependentUpon>DataTemplete.tt</DependentUpon> <DependentUpon>DataTemplete.tt</DependentUpon>
</Compile> </Compile>
<Compile Include="Mission.cs">
<DependentUpon>DataTemplete.tt</DependentUpon>
</Compile>
<Compile Include="PMID.cs"> <Compile Include="PMID.cs">
<DependentUpon>DataTemplete.tt</DependentUpon> <DependentUpon>DataTemplete.tt</DependentUpon>
</Compile> </Compile>
......
G.MES.DataModel/ClientInfo.cs
...@@ -44,7 +44,7 @@ namespace G.MES.DataModel ...@@ -44,7 +44,7 @@ namespace G.MES.DataModel
///<summary><summary> ///<summary><summary>
public virtual string TumorsType { get;set; } public virtual string TumorsType { get;set; }
///<summary><summary> ///<summary><summary>
public virtual string TBM { get;set; } public virtual string TNM { get;set; }
///<summary><summary> ///<summary><summary>
public virtual Nullable<bool> IsEssential { get;set; } public virtual Nullable<bool> IsEssential { get;set; }
///<summary><summary> ///<summary><summary>
...@@ -133,5 +133,7 @@ namespace G.MES.DataModel ...@@ -133,5 +133,7 @@ namespace G.MES.DataModel
public virtual string ProjectNumber { get;set; } public virtual string ProjectNumber { get;set; }
///<summary><summary> ///<summary><summary>
public virtual string DetectingPlatform { get;set; } public virtual string DetectingPlatform { get;set; }
///<summary><summary>
public virtual string CompanyPhone { get;set; }
} }
} }
G.MES.DataModel/Mission.cs 0 → 100644
//------------------------------------------------------------------------------
// <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 ...@@ -63,7 +63,8 @@ namespace G.MES.DataAdapter
public DbSet<Gene> Gene { get; set; } public DbSet<Gene> Gene { get; set; }
public DbSet<GeneCorrelation> GeneCorrelation { get; set; } public DbSet<GeneCorrelation> GeneCorrelation { get; set; }
public DbSet<Summary> Summary { get; set; } public DbSet<Summary> Summary { get; set; }
public DbSet<ClientInfo> ClientInfo { get; set; }
public DbSet<Chemotherapy> Chemotherapy { 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”。当在设计器中打开该模型时，此属性会出现在 // 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在
// “属性”窗口中。 // “属性”窗口中。
......
G.MES.DbAdapter/DbModel.edmx
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<Property Name="SampleDetection" Type="varchar" MaxLength="50" /> <Property Name="SampleDetection" Type="varchar" MaxLength="50" />
<Property Name="TechnologyDetection" Type="varchar" MaxLength="50" /> <Property Name="TechnologyDetection" Type="varchar" MaxLength="50" />
<Property Name="TumorsType" Type="varchar" MaxLength="50" /> <Property Name="TumorsType" Type="varchar" MaxLength="50" />
<Property Name="TBM" Type="varchar" MaxLength="50" /> <Property Name="TNM" Type="varchar" MaxLength="50" />
<Property Name="IsEssential" Type="bit" /> <Property Name="IsEssential" Type="bit" />
<Property Name="ClinicalDiagnosis" Type="text" /> <Property Name="ClinicalDiagnosis" Type="text" />
<Property Name="FamilyHistory" Type="text" /> <Property Name="FamilyHistory" Type="text" />
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
<Property Name="Email" Type="varchar" MaxLength="100" /> <Property Name="Email" Type="varchar" MaxLength="100" />
<Property Name="ProjectNumber" Type="varchar" MaxLength="50" /> <Property Name="ProjectNumber" Type="varchar" MaxLength="50" />
<Property Name="DetectingPlatform" Type="varchar" MaxLength="50" /> <Property Name="DetectingPlatform" Type="varchar" MaxLength="50" />
<Property Name="CompanyPhone" Type="varchar" MaxLength="50" />
</EntityType> </EntityType>
<EntityType Name="CodeClassify"> <EntityType Name="CodeClassify">
<Key> <Key>
...@@ -285,6 +286,19 @@ ...@@ -285,6 +286,19 @@
<Property Name="SYS_ORG" Type="uniqueidentifier" /> <Property Name="SYS_ORG" Type="uniqueidentifier" />
<Property Name="SYS_LAST_UPD_BY" Type="uniqueidentifier" /> <Property Name="SYS_LAST_UPD_BY" Type="uniqueidentifier" />
</EntityType> </EntityType>
<EntityType Name="Mission">
<Key>
<PropertyRef Name="MissionOID" />
</Key>
<Property Name="MissionOID" Type="uniqueidentifier" Nullable="false" />
<Property Name="MissionName" Type="varchar" MaxLength="50" />
<Property Name="StartTime" Type="datetime" />
<Property Name="EndTime" Type="datetime" />
<Property Name="CurrentProcess" Type="varchar" MaxLength="50" />
<Property Name="DownloadPath" Type="varchar" MaxLength="500" />
<Property Name="ExportPeople" Type="uniqueidentifier" />
<Property Name="SYS_ORG" Type="uniqueidentifier" />
</EntityType>
<EntityType Name="PMID"> <EntityType Name="PMID">
<Key> <Key>
<PropertyRef Name="PMIDOID" /> <PropertyRef Name="PMIDOID" />
...@@ -634,6 +648,7 @@ ...@@ -634,6 +648,7 @@
<EntitySet Name="Initi06" EntityType="Self.Initi06" Schema="dbo" store:Type="Tables" /> <EntitySet Name="Initi06" EntityType="Self.Initi06" Schema="dbo" store:Type="Tables" />
<EntitySet Name="Initi07" EntityType="Self.Initi07" Schema="dbo" store:Type="Tables" /> <EntitySet Name="Initi07" EntityType="Self.Initi07" Schema="dbo" store:Type="Tables" />
<EntitySet Name="MISReport" EntityType="Self.MISReport" Schema="dbo" store:Type="Tables" /> <EntitySet Name="MISReport" EntityType="Self.MISReport" Schema="dbo" store:Type="Tables" />
<EntitySet Name="Mission" EntityType="Self.Mission" Schema="dbo" store:Type="Tables" />
<EntitySet Name="PMID" EntityType="Self.PMID" Schema="dbo" store:Type="Tables" /> <EntitySet Name="PMID" EntityType="Self.PMID" Schema="dbo" store:Type="Tables" />
<EntitySet Name="SampleControl" EntityType="Self.SampleControl" Schema="dbo" store:Type="Tables" /> <EntitySet Name="SampleControl" EntityType="Self.SampleControl" Schema="dbo" store:Type="Tables" />
<EntitySet Name="SampleType" EntityType="Self.SampleType" Schema="dbo" store:Type="Tables" /> <EntitySet Name="SampleType" EntityType="Self.SampleType" Schema="dbo" store:Type="Tables" />
...@@ -731,8 +746,9 @@ ...@@ -731,8 +746,9 @@
<EntitySet Name="Gene" EntityType="DbModel.Gene" /> <EntitySet Name="Gene" EntityType="DbModel.Gene" />
<EntitySet Name="GeneCorrelation" EntityType="DbModel.GeneCorrelation" /> <EntitySet Name="GeneCorrelation" EntityType="DbModel.GeneCorrelation" />
<EntitySet Name="Summary" EntityType="DbModel.Summary" /> <EntitySet Name="Summary" EntityType="DbModel.Summary" />
<EntitySet Name="ClientInfo" EntityType="DbModel.ClientInfo" />
<EntitySet Name="Chemotherapy" EntityType="DbModel.Chemotherapy" /> <EntitySet Name="Chemotherapy" EntityType="DbModel.Chemotherapy" />
<EntitySet Name="ClientInfo" EntityType="DbModel.ClientInfo" />
<EntitySet Name="Mission" EntityType="DbModel.Mission" />
</EntityContainer> </EntityContainer>
<EntityType Name="Sys_BusiPortalMenu"> <EntityType Name="Sys_BusiPortalMenu">
...@@ -1308,6 +1324,22 @@ ...@@ -1308,6 +1324,22 @@
<Property Name="Sys_Create" Type="DateTime" Precision="3" /> <Property Name="Sys_Create" Type="DateTime" Precision="3" />
<Property Name="CurrentIndex" Type="Int32" /> <Property Name="CurrentIndex" Type="Int32" />
</EntityType> </EntityType>
<EntityType Name="Chemotherapy">
<Key>
<PropertyRef Name="ChemotherapyOID" />
</Key>
<Property Name="ChemotherapyOID" Type="Guid" Nullable="false" />
<Property Name="DrugPlan" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="Gene" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="TestSite" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="Genotype" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="MedicationPrompts" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
<Property Name="Levels" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="CurrentIndex" Type="Int32" />
<Property Name="Sys_Create" Type="DateTime" Precision="3" />
<Property Name="ParentOID" Type="Guid" Nullable="false" />
<Property Name="SampleNumber" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
</EntityType>
<EntityType Name="ClientInfo"> <EntityType Name="ClientInfo">
<Key> <Key>
<PropertyRef Name="ClientInfoOID" /> <PropertyRef Name="ClientInfoOID" />
...@@ -1324,7 +1356,7 @@ ...@@ -1324,7 +1356,7 @@
<Property Name="SampleDetection" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="SampleDetection" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="TechnologyDetection" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="TechnologyDetection" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="TumorsType" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="TumorsType" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="TBM" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="TNM" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="IsEssential" Type="Boolean" /> <Property Name="IsEssential" Type="Boolean" />
<Property Name="ClinicalDiagnosis" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" /> <Property Name="ClinicalDiagnosis" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
<Property Name="FamilyHistory" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" /> <Property Name="FamilyHistory" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
...@@ -1369,22 +1401,20 @@ ...@@ -1369,22 +1401,20 @@
<Property Name="Email" Type="String" MaxLength="100" FixedLength="false" Unicode="false" /> <Property Name="Email" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
<Property Name="ProjectNumber" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="ProjectNumber" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="DetectingPlatform" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="DetectingPlatform" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="CompanyPhone" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
</EntityType> </EntityType>
<EntityType Name="Chemotherapy"> <EntityType Name="Mission">
<Key> <Key>
<PropertyRef Name="ChemotherapyOID" /> <PropertyRef Name="MissionOID" />
</Key> </Key>
<Property Name="ChemotherapyOID" Type="Guid" Nullable="false" /> <Property Name="MissionOID" Type="Guid" Nullable="false" />
<Property Name="DrugPlan" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="MissionName" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="Gene" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="StartTime" Type="DateTime" Precision="3" />
<Property Name="TestSite" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="EndTime" Type="DateTime" Precision="3" />
<Property Name="Genotype" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="CurrentProcess" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="MedicationPrompts" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" /> <Property Name="DownloadPath" Type="String" MaxLength="500" FixedLength="false" Unicode="false" />
<Property Name="Levels" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="ExportPeople" Type="Guid" />
<Property Name="CurrentIndex" Type="Int32" /> <Property Name="SYS_ORG" Type="Guid" />
<Property Name="Sys_Create" Type="DateTime" Precision="3" />
<Property Name="ParentOID" Type="Guid" Nullable="false" />
<Property Name="SampleNumber" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
</EntityType> </EntityType>
</Schema> </Schema>
...@@ -1912,9 +1942,27 @@ ...@@ -1912,9 +1942,27 @@
</MappingFragment> </MappingFragment>
</EntityTypeMapping> </EntityTypeMapping>
</EntitySetMapping> </EntitySetMapping>
<EntitySetMapping Name="Chemotherapy">
<EntityTypeMapping TypeName="DbModel.Chemotherapy">
<MappingFragment StoreEntitySet="Chemotherapy">
<ScalarProperty Name="SampleNumber" ColumnName="SampleNumber" />
<ScalarProperty Name="ParentOID" ColumnName="ParentOID" />
<ScalarProperty Name="Sys_Create" ColumnName="Sys_Create" />
<ScalarProperty Name="CurrentIndex" ColumnName="CurrentIndex" />
<ScalarProperty Name="Levels" ColumnName="Levels" />
<ScalarProperty Name="MedicationPrompts" ColumnName="MedicationPrompts" />
<ScalarProperty Name="Genotype" ColumnName="Genotype" />
<ScalarProperty Name="TestSite" ColumnName="TestSite" />
<ScalarProperty Name="Gene" ColumnName="Gene" />
<ScalarProperty Name="DrugPlan" ColumnName="DrugPlan" />
<ScalarProperty Name="ChemotherapyOID" ColumnName="ChemotherapyOID" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="ClientInfo"> <EntitySetMapping Name="ClientInfo">
<EntityTypeMapping TypeName="DbModel.ClientInfo"> <EntityTypeMapping TypeName="DbModel.ClientInfo">
<MappingFragment StoreEntitySet="ClientInfo"> <MappingFragment StoreEntitySet="ClientInfo">
<ScalarProperty Name="CompanyPhone" ColumnName="CompanyPhone" />
<ScalarProperty Name="DetectingPlatform" ColumnName="DetectingPlatform" /> <ScalarProperty Name="DetectingPlatform" ColumnName="DetectingPlatform" />
<ScalarProperty Name="ProjectNumber" ColumnName="ProjectNumber" /> <ScalarProperty Name="ProjectNumber" ColumnName="ProjectNumber" />
<ScalarProperty Name="Email" ColumnName="Email" /> <ScalarProperty Name="Email" ColumnName="Email" />
...@@ -1959,7 +2007,7 @@ ...@@ -1959,7 +2007,7 @@
<ScalarProperty Name="FamilyHistory" ColumnName="FamilyHistory" /> <ScalarProperty Name="FamilyHistory" ColumnName="FamilyHistory" />
<ScalarProperty Name="ClinicalDiagnosis" ColumnName="ClinicalDiagnosis" /> <ScalarProperty Name="ClinicalDiagnosis" ColumnName="ClinicalDiagnosis" />
<ScalarProperty Name="IsEssential" ColumnName="IsEssential" /> <ScalarProperty Name="IsEssential" ColumnName="IsEssential" />
<ScalarProperty Name="TBM" ColumnName="TBM" /> <ScalarProperty Name="TNM" ColumnName="TNM" />
<ScalarProperty Name="TumorsType" ColumnName="TumorsType" /> <ScalarProperty Name="TumorsType" ColumnName="TumorsType" />
<ScalarProperty Name="TechnologyDetection" ColumnName="TechnologyDetection" /> <ScalarProperty Name="TechnologyDetection" ColumnName="TechnologyDetection" />
<ScalarProperty Name="SampleDetection" ColumnName="SampleDetection" /> <ScalarProperty Name="SampleDetection" ColumnName="SampleDetection" />
...@@ -1975,20 +2023,17 @@ ...@@ -1975,20 +2023,17 @@
</MappingFragment> </MappingFragment>
</EntityTypeMapping> </EntityTypeMapping>
</EntitySetMapping> </EntitySetMapping>
<EntitySetMapping Name="Chemotherapy"> <EntitySetMapping Name="Mission">
<EntityTypeMapping TypeName="DbModel.Chemotherapy"> <EntityTypeMapping TypeName="DbModel.Mission">
<MappingFragment StoreEntitySet="Chemotherapy"> <MappingFragment StoreEntitySet="Mission">
<ScalarProperty Name="SampleNumber" ColumnName="SampleNumber" /> <ScalarProperty Name="SYS_ORG" ColumnName="SYS_ORG" />
<ScalarProperty Name="ParentOID" ColumnName="ParentOID" /> <ScalarProperty Name="ExportPeople" ColumnName="ExportPeople" />
<ScalarProperty Name="Sys_Create" ColumnName="Sys_Create" /> <ScalarProperty Name="DownloadPath" ColumnName="DownloadPath" />
<ScalarProperty Name="CurrentIndex" ColumnName="CurrentIndex" /> <ScalarProperty Name="CurrentProcess" ColumnName="CurrentProcess" />
<ScalarProperty Name="Levels" ColumnName="Levels" /> <ScalarProperty Name="EndTime" ColumnName="EndTime" />
<ScalarProperty Name="MedicationPrompts" ColumnName="MedicationPrompts" /> <ScalarProperty Name="StartTime" ColumnName="StartTime" />
<ScalarProperty Name="Genotype" ColumnName="Genotype" /> <ScalarProperty Name="MissionName" ColumnName="MissionName" />
<ScalarProperty Name="TestSite" ColumnName="TestSite" /> <ScalarProperty Name="MissionOID" ColumnName="MissionOID" />
<ScalarProperty Name="Gene" ColumnName="Gene" />
<ScalarProperty Name="DrugPlan" ColumnName="DrugPlan" />
<ScalarProperty Name="ChemotherapyOID" ColumnName="ChemotherapyOID" />
</MappingFragment> </MappingFragment>
</EntityTypeMapping> </EntityTypeMapping>
</EntitySetMapping> </EntitySetMapping>
......
G.MES.DbAdapter/DbModel.edmx.diagram
...@@ -43,8 +43,9 @@ ...@@ -43,8 +43,9 @@
<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.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.Summary" Width="1.5" PointX="9.375" PointY="14.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.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> </Diagram>
</edmx:Diagrams> </edmx:Diagrams>
......
WordByDocx/Word/ReplaceText.cs
...@@ -44,7 +44,7 @@ namespace WordByDocx.Word ...@@ -44,7 +44,7 @@ namespace WordByDocx.Word
document.ReplaceFunc("#{SamplingTime}", clientInfo.SamplingTime.ToLocalLongTime()); document.ReplaceFunc("#{SamplingTime}", clientInfo.SamplingTime.ToLocalLongTime());
document.ReplaceFunc("#{TechnologyDetection}", clientInfo.TechnologyDetection); document.ReplaceFunc("#{TechnologyDetection}", clientInfo.TechnologyDetection);
document.ReplaceFunc("#{TumorsType}", clientInfo.TumorsType); document.ReplaceFunc("#{TumorsType}", clientInfo.TumorsType);
document.ReplaceFunc("#{TBM}", clientInfo.TBM); document.ReplaceFunc("#{TNM}", clientInfo.TNM);
document.ReplaceFunc("#{IsEssential}", clientInfo.IsEssential == true ? "是" : "否"); document.ReplaceFunc("#{IsEssential}", clientInfo.IsEssential == true ? "是" : "否");
document.ReplaceFunc("#{ClinicalDiagnosis}", clientInfo.ClinicalDiagnosis); document.ReplaceFunc("#{ClinicalDiagnosis}", clientInfo.ClinicalDiagnosis);
document.ReplaceFunc("#{FamilyHistory}", clientInfo.FamilyHistory); document.ReplaceFunc("#{FamilyHistory}", clientInfo.FamilyHistory);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论