新增开关控制是否自动同步

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -6833,36 +6833,11 @@
             医院状态 1 启用 2 禁用
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.sys_hospital.IsOpenWorkYear">
-            <summary>
-            是否开启年资系数 1 启用 2 禁用
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.sys_hospital.IsOpenDrugprop">
-            <summary>
-            是否开启药占比系数 1 启用 2 禁用
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.sys_hospital.IsOpenIncome">
-            <summary>
-            是否开启ICU有效收入系数 1 启用 2 禁用
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.sys_hospital.IsOpenDirector">
-            <summary>
-            是否开启规模/效率绩效 1 启用 2 禁用
-            </summary>
-        </member>
         <member name="P:Performance.EntityModels.sys_hospital.IsShowManage">
             <summary>
             是否显示绩效合计 1 显示绩效合计 2 显示管理绩效
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.sys_hospital.IsOpenCMIPercent">
-            <summary>
-            是否开启科室CMI占比 1 启用 2 禁用
-            </summary>
-        </member>
         <member name="P:Performance.EntityModels.sys_hospital.IsOpenNursingDeptAudit">
             <summary>
             是否开启护理部审核 1 启用 2 禁用
@@ -6873,9 +6848,9 @@
             是否显示二次绩效科主任1 启用 2 禁用
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.sys_hospital.IsOpenLogisticsSecondAllot">
+        <member name="P:Performance.EntityModels.sys_hospital.IsOpenTimedTasks">
             <summary>
-            是否开启行政后勤二次绩效分配 1 启用 2 禁用
+            是否开启定时抽取任务 1 是 2 否
             </summary>
         </member>
         <member name="P:Performance.EntityModels.sys_hospital.IsSingleProject">

performance/Performance.EntityModels/Entity/sys_hospital.cs

@@ -61,35 +61,35 @@ public class sys_hospital
         /// </summary>
         public Nullable<int> States { get; set; }
 
-        /// <summary>
-        /// 是否开启年资系数 1 启用 2 禁用
-        /// </summary>
-        public Nullable<int> IsOpenWorkYear { get; set; }
+        ///// <summary>
+        ///// 是否开启年资系数 1 启用 2 禁用
+        ///// </summary>
+        //public Nullable<int> IsOpenWorkYear { get; set; }
 
-        /// <summary>
-        /// 是否开启药占比系数 1 启用 2 禁用
-        /// </summary>
-        public Nullable<int> IsOpenDrugprop { get; set; }
+        ///// <summary>
+        ///// 是否开启药占比系数 1 启用 2 禁用
+        ///// </summary>
+        //public Nullable<int> IsOpenDrugprop { get; set; }
 
-        /// <summary>
-        /// 是否开启ICU有效收入系数 1 启用 2 禁用
-        /// </summary>
-        public Nullable<int> IsOpenIncome { get; set; }
+        ///// <summary>
+        ///// 是否开启ICU有效收入系数 1 启用 2 禁用
+        ///// </summary>
+        //public Nullable<int> IsOpenIncome { get; set; }
 
-        /// <summary>
-        /// 是否开启规模/效率绩效 1 启用 2 禁用
-        /// </summary>
-        public Nullable<int> IsOpenDirector { get; set; }
+        ///// <summary>
+        ///// 是否开启规模/效率绩效 1 启用 2 禁用
+        ///// </summary>
+        //public Nullable<int> IsOpenDirector { get; set; }
 
         /// <summary>
         /// 是否显示绩效合计 1 显示绩效合计 2 显示管理绩效
         /// </summary>
         public Nullable<int> IsShowManage { get; set; }
 
-        /// <summary>
-        /// 是否开启科室CMI占比 1 启用 2 禁用
-        /// </summary>
-        public Nullable<int> IsOpenCMIPercent { get; set; }
+        ///// <summary>
+        ///// 是否开启科室CMI占比 1 启用 2 禁用
+        ///// </summary>
+        //public Nullable<int> IsOpenCMIPercent { get; set; }
 
         /// <summary>
         /// 是否开启护理部审核 1 启用 2 禁用
@@ -101,10 +101,15 @@ public class sys_hospital
         /// </summary>
         public Nullable<int> IsShowSecondDirector { get; set; }
 
+        ///// <summary>
+        ///// 是否开启行政后勤二次绩效分配 1 启用 2 禁用
+        ///// </summary>
+        //public Nullable<int> IsOpenLogisticsSecondAllot { get; set; }
+
         /// <summary>
-        /// 是否开启行政后勤二次绩效分配 1 启用 2 禁用
+        /// 是否开启定时抽取任务 1 是 2 否
         /// </summary>
-        public Nullable<int> IsOpenLogisticsSecondAllot { get; set; }
+        public Nullable<int> IsOpenTimedTasks { get; set; }
 
         /// <summary>
         /// 抽取项目是否在同一环境 1 是 2 否

performance/Performance.Services/ConfigService.cs

@@ -324,7 +324,7 @@ public class ConfigService : IAutoInjection
         /// <returns></returns>
         public List<cof_drugtype> GetDrugtypeList(int HospitalId, int allotId)
         {
-            var list = _drugtypeRepository.GetEntities(t => t.AllotID == allotId && t.HospitalId==HospitalId);
+            var list = _drugtypeRepository.GetEntities(t => t.AllotID == allotId && t.HospitalId == HospitalId);
             return list;
         }
 
@@ -705,9 +705,9 @@ public void Copy(per_allot allot)
 
             logger.LogInformation($"workItem");
             var workItem = _workitemRepository.GetEntities(t => t.AllotID == allot.ID);
-            if (hospital != null && hospital?.IsOpenDrugprop == 1 && (workItem == null || workItem.Count == 0))
+            if (workItem == null || workItem.Count == 0)
             {
-                workItem = _workitemRepository.GetEntities(t => t.AllotID == allotId);
+                workItem = _workitemRepository.GetEntities(t => t.AllotID == allotId) ?? _workitemRepository.GetEntities(t => t.AllotID == -1);
                 if (workItem != null && workItem.Count > 0)
                 {
                     var newWorkItem = workItem.Select(t => new cof_workitem { AllotID = allot.ID, Type = t.Type, Item = t.Item });
@@ -720,7 +720,7 @@ public void Copy(per_allot allot)
             if (cofDrugtype == null || cofDrugtype.Count == 0)
             {
                 var drugtype = _drugtypeRepository.GetEntities(t => t.AllotID == allotId) ?? _drugtypeRepository.GetEntities(t => t.AllotID == -1);
-                var newAgains = drugtype.Select(t => new cof_drugtype {HospitalId=allot.HospitalId, AllotID = allot.ID, Charge = t.Charge, ChargeType = t.ChargeType });
+                var newAgains = drugtype.Select(t => new cof_drugtype { HospitalId = allot.HospitalId, AllotID = allot.ID, Charge = t.Charge, ChargeType = t.ChargeType });
                 _drugtypeRepository.AddRange(newAgains.ToArray());
             }
 
@@ -846,7 +846,7 @@ private void CopyAprData(int prevAllotId, int allotId)
 
         #region HRP人员科室
 
-        public HandsonTable GetHrpDeptHands(int HospitalId,int AllotId)
+        public HandsonTable GetHrpDeptHands(int HospitalId, int AllotId)
         {
             var result = new HandsonTable((int)SheetType.Unidentifiable, HrpDept.Select(t => t.Value).ToArray(), HrpDept.Select(t => new collect_permission
             {
@@ -921,13 +921,13 @@ public HandsonTable GetSecondaryAlias()
                     if (column.Data == "状态")
                     {
                         column.Type = "autocomplete";
-                        column.Source = new[] {"可用", "禁用"};
+                        column.Source = new[] { "可用", "禁用" };
                         column.Strict = true;
                     }
                 }
             }
-            var data = perforCofaliasRepository.GetEntities()?.OrderBy(t=>t.Route);
-            if (data==null) return result;
+            var data = perforCofaliasRepository.GetEntities()?.OrderBy(t => t.Route);
+            if (data == null) return result;
 
             List<HandsonRowData> rowDatas = new List<HandsonRowData>();
             int i = 0;
@@ -935,13 +935,13 @@ public HandsonTable GetSecondaryAlias()
             {
                 var json = JsonHelper.Serialize(item);
                 var firstDic = JsonHelper.Deserialize<Dictionary<string, string>>(json);
-                firstDic["states"]=firstDic["states"] == "1" ? "可用" : "禁用";
+                firstDic["states"] = firstDic["states"] == "1" ? "可用" : "禁用";
                 var cells = (from conf in Alias join fst in firstDic on conf.Key.ToUpper() equals fst.Key.ToUpper() select new HandsonCellData(conf.Value, fst.Value)).ToList();
 
-                rowDatas.Add(new HandsonRowData(i,cells));
+                rowDatas.Add(new HandsonRowData(i, cells));
                 i++;
             }
-            result.SetRowData(rowDatas,rowDatas!=null);
+            result.SetRowData(rowDatas, rowDatas != null);
             return result;
         }
 
@@ -952,8 +952,8 @@ public void SaveSecondaryAlias(SaveCollectData request)
             List<cof_alias> aliases = new List<cof_alias>();
             foreach (var item in dicData)
             {
-                var states = new[] {"可用", "禁用"};
-                if (item["States"]!=null && states.Contains(item["States"]))
+                var states = new[] { "可用", "禁用" };
+                if (item["States"] != null && states.Contains(item["States"]))
                 {
                     item["States"] = item["States"] == "可用" ? "1" : "0";
                 }
@@ -961,13 +961,13 @@ public void SaveSecondaryAlias(SaveCollectData request)
 
                 var json = JsonHelper.Serialize(item);
                 var data = JsonHelper.Deserialize<cof_alias>(json);
-                if (!string.IsNullOrEmpty(data.Name) && !string.IsNullOrEmpty(data.OriginalName)&& !string.IsNullOrEmpty(data.Route) && !string.IsNullOrEmpty(data.Alias))
+                if (!string.IsNullOrEmpty(data.Name) && !string.IsNullOrEmpty(data.OriginalName) && !string.IsNullOrEmpty(data.Route) && !string.IsNullOrEmpty(data.Alias))
                 {
                     aliases.Add(data);
                 }
             }
 
-            perforCofaliasRepository.Execute("delete from cof_alias",null);
+            perforCofaliasRepository.Execute("delete from cof_alias", null);
             perforCofaliasRepository.AddRange(aliases.ToArray());
         }
 

performance/Performance.Services/ExtractExcelService/ExtractJobService.cs

@@ -41,7 +41,7 @@ PerforPerallotRepository perallotRepository
 
         public void Execute()
         {
-            var hospitals = hospitalRepository.GetEntities();
+            var hospitals = hospitalRepository.GetEntities(w => w.IsOpenTimedTasks == 1);
             if (hospitals == null || !hospitals.Any()) return;
 
             var userId = userRepository.GetEntity(t => t.Login.ToLower() == "admin" && t.States == 1 && t.IsDelete == 1)?.ID ?? 1;

performance/Performance.Services/HospitalService.cs

@@ -131,9 +131,9 @@ public HospitalResponse Update(HospitalRequest request)
             hospital.States = request.States;
             //hospital.IsOpenWorkYear = request.IsOpenWorkYear;
             //hospital.IsOpenDirector = request.IsOpenDirector;
-            hospital.IsOpenDrugprop = request.IsOpenDrugprop;
+            //hospital.IsOpenDrugprop = request.IsOpenDrugprop;
             hospital.IsShowManage = request.IsShowManage;
-            hospital.IsOpenCMIPercent = request.IsOpenCMIPercent;
+            //hospital.IsOpenCMIPercent = request.IsOpenCMIPercent;
             //hospital.IsOpenLogisticsSecondAllot = request.IsOpenLogisticsSecondAllot;
             //hospital.IsOpenIncome = request.IsOpenIncome;