bug修改-自动获取sheet类型

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

@@ -579,189 +579,189 @@
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.GuaranteeController.Guarantee(Performance.DtoModels.GuaranteeRequest)">
+        <member name="M:Performance.Api.Controllers.ExConfigController.Extract(Performance.DtoModels.ModModuleRequest)">
             <summary>
-            保底绩效配置列表
+            绩效数据抽取模板
             </summary>
-            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.GuaranteeController.GuarantInsert(Performance.DtoModels.GuaranteeRequest)">
+        <member name="M:Performance.Api.Controllers.ExConfigController.FeeType">
             <summary>
-            新增保底绩效配置
+            费用类型
             </summary>
-            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.GuaranteeController.GuarantUpdate(Performance.DtoModels.GuaranteeRequest)">
+        <member name="M:Performance.Api.Controllers.ExConfigController.FeeSource(Performance.DtoModels.ModModuleRequest)">
             <summary>
-            修改保底绩效配置
+            绩效考核项费用来源
             </summary>
-            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.GuaranteeController.GuarantDelete(Performance.DtoModels.GuaranteeRequest)">
+        <member name="M:Performance.Api.Controllers.ExConfigController.AddModule(Performance.DtoModels.ModModuleRequest)">
             <summary>
-            删除保底绩效配置
+            费用字典新增
             </summary>
-            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.GuaranteeController.Accounting(Performance.DtoModels.GuaranteeRequest)">
+        <member name="M:Performance.Api.Controllers.ExConfigController.Module(Performance.DtoModels.ModModuleRequest)">
             <summary>
-            医院核算单元
+            费用字典（绩效模板）
             </summary>
-            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.GuaranteeController.UnitType">
+        <member name="M:Performance.Api.Controllers.ExConfigController.EditModule(Performance.DtoModels.ModModuleRequest)">
             <summary>
-            医院核算单元
+            绩效模板修改
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.HospitalController.GetHospitalList">
+        <member name="M:Performance.Api.Controllers.ExConfigController.DelModule(Performance.DtoModels.ModModuleRequest)">
             <summary>
-            获取当前登录用户管辖医院列表
+            绩效模板删除
             </summary>
-            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.HospitalController.Insert(Performance.DtoModels.HospitalRequest)">
+        <member name="M:Performance.Api.Controllers.ExConfigController.AddItem(Performance.DtoModels.ItemListRequest)">
             <summary>
-            新增医院
+            绩效收入模板配置项新增
             </summary>
-            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.HospitalController.Update(Performance.DtoModels.HospitalRequest)">
+        <member name="M:Performance.Api.Controllers.ExConfigController.Items(Performance.DtoModels.ModItemRequest)">
             <summary>
-            修改医院信息
+            绩效收入模板配置项列表
             </summary>
-            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.HospitalController.Delete(Performance.DtoModels.HospitalRequest)">
+        <member name="M:Performance.Api.Controllers.ExConfigController.EditItem(Performance.DtoModels.ItemListRequest)">
             <summary>
-            删除医院
+            绩效收入模板配置项修改
             </summary>
-            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.HospitalController.Disabled(Performance.DtoModels.HospitalRequest)">
+        <member name="M:Performance.Api.Controllers.ExConfigController.DelItem(Performance.DtoModels.ModItemRequest)">
             <summary>
-            启用/禁用医院
+            绩效收入模板配置项删除
             </summary>
-            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.MenuController.MenuList">
+        <member name="M:Performance.Api.Controllers.ExConfigController.AddSpecial(Performance.DtoModels.SpecialListRequest)">
             <summary>
-            设置用户管辖医院
+            特殊科室模板配置项新增
             </summary>
-            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.Extract(Performance.DtoModels.ModModuleRequest)">
+        <member name="M:Performance.Api.Controllers.ExConfigController.Specials(Performance.DtoModels.ModSpecialRequest)">
             <summary>
-            绩效数据抽取模板
+            特殊科室模板配置项列表
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.FeeType">
+        <member name="M:Performance.Api.Controllers.ExConfigController.EditSpecial(Performance.DtoModels.SpecialListRequest)">
             <summary>
-            费用类型
+            特殊科室模板配置项修改
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.FeeSource(Performance.DtoModels.ModModuleRequest)">
+        <member name="M:Performance.Api.Controllers.ExConfigController.DelSpecial(Performance.DtoModels.ModSpecialRequest)">
             <summary>
-            绩效考核项费用来源
+            特殊科室模板配置项删除
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.AddModule(Performance.DtoModels.ModModuleRequest)">
+        <member name="M:Performance.Api.Controllers.ExConfigController.PerforType">
             <summary>
-            费用字典新增
+            特殊科室人均
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.Module(Performance.DtoModels.ModModuleRequest)">
+        <member name="M:Performance.Api.Controllers.ExConfigController.Config(Performance.DtoModels.ModModuleRequest)">
             <summary>
-            费用字典（绩效模板）
+            数据配置项
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.EditModule(Performance.DtoModels.ModModuleRequest)">
+        <member name="M:Performance.Api.Controllers.GuaranteeController.Guarantee(Performance.DtoModels.GuaranteeRequest)">
             <summary>
-            绩效模板修改
+            保底绩效配置列表
             </summary>
+            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.DelModule(Performance.DtoModels.ModModuleRequest)">
+        <member name="M:Performance.Api.Controllers.GuaranteeController.GuarantInsert(Performance.DtoModels.GuaranteeRequest)">
             <summary>
-            绩效模板删除
+            新增保底绩效配置
             </summary>
+            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.AddItem(Performance.DtoModels.ItemListRequest)">
+        <member name="M:Performance.Api.Controllers.GuaranteeController.GuarantUpdate(Performance.DtoModels.GuaranteeRequest)">
             <summary>
-            绩效收入模板配置项新增
+            修改保底绩效配置
             </summary>
+            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.Items(Performance.DtoModels.ModItemRequest)">
+        <member name="M:Performance.Api.Controllers.GuaranteeController.GuarantDelete(Performance.DtoModels.GuaranteeRequest)">
             <summary>
-            绩效收入模板配置项列表
+            删除保底绩效配置
             </summary>
+            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.EditItem(Performance.DtoModels.ItemListRequest)">
+        <member name="M:Performance.Api.Controllers.GuaranteeController.Accounting(Performance.DtoModels.GuaranteeRequest)">
             <summary>
-            绩效收入模板配置项修改
+            医院核算单元
             </summary>
+            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.DelItem(Performance.DtoModels.ModItemRequest)">
+        <member name="M:Performance.Api.Controllers.GuaranteeController.UnitType">
             <summary>
-            绩效收入模板配置项删除
+            医院核算单元
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.AddSpecial(Performance.DtoModels.SpecialListRequest)">
+        <member name="M:Performance.Api.Controllers.HospitalController.GetHospitalList">
             <summary>
-            特殊科室模板配置项新增
+            获取当前登录用户管辖医院列表
             </summary>
+            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.Specials(Performance.DtoModels.ModSpecialRequest)">
+        <member name="M:Performance.Api.Controllers.HospitalController.Insert(Performance.DtoModels.HospitalRequest)">
             <summary>
-            特殊科室模板配置项列表
+            新增医院
             </summary>
+            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.EditSpecial(Performance.DtoModels.SpecialListRequest)">
+        <member name="M:Performance.Api.Controllers.HospitalController.Update(Performance.DtoModels.HospitalRequest)">
             <summary>
-            特殊科室模板配置项修改
+            修改医院信息
             </summary>
+            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.DelSpecial(Performance.DtoModels.ModSpecialRequest)">
+        <member name="M:Performance.Api.Controllers.HospitalController.Delete(Performance.DtoModels.HospitalRequest)">
             <summary>
-            特殊科室模板配置项删除
+            删除医院
             </summary>
+            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.PerforType">
+        <member name="M:Performance.Api.Controllers.HospitalController.Disabled(Performance.DtoModels.HospitalRequest)">
             <summary>
-            特殊科室人均
+            启用/禁用医院
             </summary>
+            <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ModExtractController.Config(Performance.DtoModels.ModModuleRequest)">
+        <member name="M:Performance.Api.Controllers.MenuController.MenuList">
             <summary>
-            数据配置项
+            设置用户管辖医院
             </summary>
+            <param name="request"></param>
             <returns></returns>
         </member>
         <member name="T:Performance.Api.Controllers.OriginalController">
@@ -1037,13 +1037,6 @@
             <param name="form"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.TemplateController.ExtractData(Performance.DtoModels.AllotRequest)">
-            <summary>
-            提取绩效数据
-            </summary>
-            <param name="request"></param>
-            <returns></returns>
-        </member>
         <member name="M:Performance.Api.Controllers.TemplateController.NewExtractData(Performance.DtoModels.ExtractRequest)">
             <summary>
             提取绩效数据

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -64,16 +64,6 @@
             相对
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.AppSettings.WebapiUrl.ImportFirst">
-            <summary>
-            上传首次模板文件
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.AppSettings.WebapiUrl.ExtractData">
-            <summary>
-            抽取数据地址
-            </summary>
-        </member>
         <member name="P:Performance.DtoModels.AppSettings.WebapiUrl.ImportFile">
             <summary>
             上传文件地址

performance/Performance.Services/ExConfigService.cs

@@ -318,7 +318,7 @@ public bool QueryHosConfigs(int moduleId, out int sheetType)
             if (module == null)
                 throw new PerformanceException("绩效模板不存在，请重新选择！");
 
-            sheetType = (int)SheetType.Income;
+            sheetType = (int)module.SheetType;
             //if (module.SheetType != (int)SheetType.Income)
             //    throw new PerformanceException("当前模板不能进行考核项目自动添加");