修复 LabExcelDate / LabExcel 导出"省份"列标签错误

song.jun

3 天以前 d5a91a2863a7bf4df8ee3008b108e7429c2efec1

 sbcLabSystem/Models/Backstage/QCDistributionRegisterInfoViewModel.cs

@@ -69,8 +69,14 @@
            {
                return null;
            }
            QCDistributionRegisterInfo entity = PalGainEngine.Instance.Resolve<QCService>().GetQcDistributionRegisters()
                .FirstOrDefault(p => p.QCDistributionId == regInfoivewModel.QCDistributionId && p.LabId == labId);
            var query = PalGainEngine.Instance.Resolve<QCService>().GetQcDistributionRegisters()
                .Where(p => p.QCDistributionId == regInfoivewModel.QCDistributionId
                         && p.LabId == labId);
            if (regInfoivewModel.ProjectId > 0)
            {
                query = query.Where(p => p.ProjectId == regInfoivewModel.ProjectId);
            }
            QCDistributionRegisterInfo entity = query.FirstOrDefault();
            if (entity != null)
            {
                return entity;
@@ -604,8 +610,14 @@
        }
        public static QCDistributionRegisterInfo ToEntity(QCDistributionRegisterInfoViewModel viewModel)
        {
            QCDistributionRegisterInfo entity = PalGainEngine.Instance.Resolve<QCService>()
            QCDistributionRegisterInfo existing = PalGainEngine.Instance.Resolve<QCService>()
                .GetQcDistributionRegisters().FirstOrDefault(p => p.Id == viewModel.Id);
            return ToEntity(viewModel, existing);
        }

        public static QCDistributionRegisterInfo ToEntity(QCDistributionRegisterInfoViewModel viewModel, QCDistributionRegisterInfo preloadedExisting)
        {
            QCDistributionRegisterInfo entity = preloadedExisting;
            if (entity == null)
            {
                entity = new QCDistributionRegisterInfo();
@@ -793,7 +805,7 @@
                }
                else if (value.Trim().ToLower() == "cb7_right222")
                {
                    ret = "阴性";
                    ret = "阴性"; 
                }
                else if (value.Trim().ToLower() == "cb7_right225")
                {