人员字典标签保存功能

performance/Performance.Services/ReportGlobalService.cs

@@ -534,8 +534,7 @@ public HandsonTable GetReportPersonTag(int hospitalId, int allotId)
                 Visible = 1
             }).ToList());
 
-            var pdata = perforPeremployeeRepository.GetEntities(t => t.HospitalId == hospitalId && t.AllotId == allotId).Select(t=>new { t.PersonnelNumber,t.DoctorName,t.JobCategory,t.Duty,t.JobTitle,t.AttendanceDay,t.ReservedRatio,t.BankCard,t.Remark
-            });
+            var pdata = perforPeremployeeRepository.GetEntities(t => t.HospitalId == hospitalId && t.AllotId == allotId);
             var tdata = reportperformancepersontagsRepository.GetEntities(t => t.HospitalId == hospitalId)?.OrderBy(t => ConvertHelper.To<long>(t.PersonnelNumber));
 
             var data = (from t1 in pdata
@@ -544,6 +543,7 @@ public HandsonTable GetReportPersonTag(int hospitalId, int allotId)
                         from t in temp.DefaultIfEmpty()
                         select new 
                         {
+                            Id = t1.Id,
                             PersonnelNumber = t1.PersonnelNumber,
                             DoctorName = t1.DoctorName,
                             JobCategory = t1.JobCategory,
@@ -602,17 +602,43 @@ public void SaveReportPersonTag(int hospitalId, SaveCollectData request)
             var dicData = CreateDataRow(hospitalId, request, PersonTag);
 
             List<report_performance_person_tags> personTags = new List<report_performance_person_tags>();
+
             foreach (var item in dicData)
             {
                 var json = JsonHelper.Serialize(item);
-                var data = JsonHelper.Deserialize<report_performance_person_tags>(json);
-                if (/*!string.IsNullOrEmpty(data.UnitType) && !string.IsNullOrEmpty(data.AccountingUnit) && */!string.IsNullOrEmpty(data.PersonnelName) && !string.IsNullOrEmpty(data.PersonnelNumber) && !string.IsNullOrEmpty(data.Tag1) && !string.IsNullOrEmpty(data.Tag2))
+
+                var tdata = JsonHelper.Deserialize<report_performance_person_tags>(json);
+
+                tdata.Id = 0;
+                tdata.PersonnelName = item["DoctorName"]?.ToString();
+                if (/*!string.IsNullOrEmpty(data.UnitType) && !string.IsNullOrEmpty(data.AccountingUnit) && */!string.IsNullOrEmpty(tdata.PersonnelName) && !string.IsNullOrEmpty(tdata.PersonnelNumber) && !string.IsNullOrEmpty(tdata.Tag1) && !string.IsNullOrEmpty(tdata.Tag2))
                 {
-                    data.CreateTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-                    personTags.Add(data);
+                    tdata.CreateTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                    personTags.Add(tdata);
                 }
+
+                var table = perforPeremployeeRepository.GetEntities(t => t.Id.ToString() == item["Id"]).FirstOrDefault();
+                var pdata = JsonHelper.Deserialize<per_employee>(json);
+                if (/*!string.IsNullOrEmpty(data.UnitType) && !string.IsNullOrEmpty(pdata.AccountingUnit) && */ !string.IsNullOrEmpty(pdata.DoctorName) && !string.IsNullOrEmpty(pdata.PersonnelNumber) && table!=null)
+                {
+                    pdata.CreateTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                    table.PersonnelNumber = pdata.PersonnelNumber;
+                    table.DoctorName = pdata.DoctorName;
+                    table.JobCategory = pdata.JobCategory;
+                    table.Duty = pdata.Duty;
+                    table.JobTitle = pdata.JobTitle;
+                    table.AttendanceDay = pdata.AttendanceDay;
+                    table.ReservedRatio = pdata.ReservedRatio;
+                    table.BankCard = pdata.BankCard;
+                    table.Remark = pdata.Remark;
+                    perforPeremployeeRepository.Update(table);
+                }
+                if (table == null)
+                    perforPeremployeeRepository.Add(pdata);
             }
 
+           
+
             reportperformancepersontagsRepository.Execute("delete from report_performance_person_tags where HospitalId=@hospitalId", new { hospitalId });
             reportperformancepersontagsRepository.AddRange(personTags.ToArray());
         }
@@ -669,6 +695,7 @@ public void SaveReportTag(int hospitalId, SaveCollectData request)
             //{nameof(report_performance_person_tags.UnitType), "核算单元类型"},
             //{nameof(report_performance_person_tags.AccountingUnit), "科室"},
 
+            {nameof(per_employee.Id), "Id"},
             {nameof(per_employee.PersonnelNumber), "工号"},
             {nameof(per_employee.DoctorName), "姓名"},
             {nameof(per_employee.JobCategory), "正式/临聘" },