demoadmin 发布系统代码

app_EHRPim/CHANGELOG.md

+## v7.0.0-alpha.5 [2020-5-28]
+
+### Bug修复
+
+修复处理快速分组模型动态数据部分
+
+修复列表，数据视图默认排序
+
+修复门户部件flex布局
+
+修复表格选择框列样式出现省略号
+
+修复批删除传递参数调整
+
+修复表单上界面行为参数传递bug
+
+修复分页导航、编辑类视图标题
+
+修复界面行为多主键分隔符由";"改为","
+
+修复导航类视图宽度格式
+
+修复图表排序
+
+修复关系界面逻辑
+
+修复401跳登录页清除user和token
+
+修复树导航debug展示位置
+
+修复菜单默认展开
+
+修复快速搜索框bug
+
+### 功能新增及优化
+
+#### 模板
+
+补充单位选择器、部门选择器、人员选择器
+
+面板项支持偏移
+
+应用支持自定义默认端口
+
+门户部件图标和容器样式
+
+表格列头图片和头部样式
+
+表格操作列图标
+
+表格编辑项值规则
+
+增加树选择双击事件
+
+增加图表分组属性计数统计（srfcount）
+
+增加雷达图支持
+
+#### 基础文件
+
+补充单位选择器、部门选择器、人员选择器
+
+修复分页导航、编辑类视图标题
+
+修复界面行为多主键分隔符由";"改为","
+
+修复关系界面逻辑
+
+修复401跳登录页清除user和token
+
+修复树导航debug展示位置
+
+修复菜单默认展开
+
+修复快速搜索框bug
+
+## v7.0.0-alpha.4 [2020-5-21]
+
+### Bug修复
+
+修复表格视图搜索placeholder显示为搜索字段
+
+修复表单嵌表单分页异常
+
+修复门户视图操作栏标题
+
+修复看板部件高度自动撑
+
+修复表单分组，界面行为组不显示
+
+修复表格操作列数据异常
+
+### 功能新增及优化
+
+#### 模板
+
+支持拷贝功能
+
+支持实体甘特图视图
+
+支持面板项隐藏表单项
+
+支持表格列最小宽度和操作列样式支持
+
+支持列表项、面板代码表转化
+
+#### 基础文件
+
+支持列表项、面板代码表转化
+
+修复表单分组，界面行为组不显示
+
 ## v7.0.0-alpha.3 [2020-5-14]
 
 ### Bug修复

app_EHRPim/README.md

@@ -117,7 +117,9 @@ $ yarn build
         |─ ─ favicon.ico                        图标
 ​    |─ ─ src                                    工程文件夹
         |─ ─ assets                             静态资源
+        |─ ─ codelist                           动态代码表服务
         |─ ─ components                         基础组件，主要包含编辑器组件和其他全局使用的组件
+        |─ ─ counter                            计数器服务
         |─ ─ engine                             引擎文件，主要封装了内置视图的内置逻辑
         |─ ─ environments                       环境文件
 ​        |─ ─ interface                          接口文件
@@ -150,6 +152,7 @@ $ yarn build
                 |─ ─ YYY-ui-logic-base.ts       应用实体界面处理逻辑文件
                 |─ ─ YYY-ui-logic.ts            自定义应用实体界面处理逻辑文件
         |─ ─ utils                              工具类文件
+        |─ ─ utilservice                        应用功能服务
         |─ ─ widgets                            部件文件夹
             |─ ─ appde                          应用实体名称
 ​                |─ ─  XXX                       部件名称

app_EHRPim/package.json

@@ -18,12 +18,16 @@
     "@fullcalendar/list": "^4.4.0",
     "@fullcalendar/timegrid": "^4.4.0",
     "@fullcalendar/vue": "^4.4.0",
+    "vuedraggable": "^2.23.2",
+    "async-validator": "^3.3.0",
     "axios": "^0.19.1",
     "core-js": "^3.4.4",
     "echarts": "^4.6.0",
     "element-ui": "^2.13.0",
     "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
+    "ibiz-gantt-elastic": "^1.0.15",
+    "ibiz-vue-lib": "^0.1.9",
     "interactjs": "^1.9.4",
     "moment": "^2.24.0",
     "path-to-regexp": "^6.1.0",

app_EHRPim/public/assets/json/portlet-data.json

 [
 {"type":"appde",
-"appCodeName":"ORMORG",
+"appCodeName":"OrmOrg",
 "appName":"组织管理",
 "portletCodeName": "OrmPNumList",
 "portletName": "组织人数",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"LIST","componentName":"ormorg-orm-pnum-list-portlet"},
+"portletTYpe":"LIST","componentName":"orm-org-orm-pnum-list-portlet"},
 {"type":"appde",
-"appCodeName":"ORMORG",
+"appCodeName":"OrmOrg",
 "appName":"组织管理",
 "portletCodeName": "OrgBar",
 "portletName": "组织分布",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"ormorg-org-bar-portlet"},
+"portletTYpe":"CHART","componentName":"orm-org-org-bar-portlet"},
 {"type":"appde",
-"appCodeName":"PIMVOCATIONAL",
+"appCodeName":"PimVocational",
 "appName":"证书信息",
 "portletCodeName": "OrgVocNumList",
 "portletName": "职业资格",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"LIST","componentName":"pimvocational-org-voc-num-list-portlet"},
+"portletTYpe":"LIST","componentName":"pim-vocational-org-voc-num-list-portlet"},
 {"type":"appde",
-"appCodeName":"PIMOUTPUT",
+"appCodeName":"PimOutput",
 "appName":"产值表",
 "portletCodeName": "OrgOutPutLine",
 "portletName": "月均产值",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"pimoutput-org-out-put-line-portlet"},
+"portletTYpe":"CHART","componentName":"pim-output-org-out-put-line-portlet"},
 {"type":"appde",
-"appCodeName":"PIMPERSON",
+"appCodeName":"PimPerson",
 "appName":"人员信息",
 "portletCodeName": "OrgPersonAgeFunnel",
 "portletName": "年龄分布",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"pimperson-org-person-age-funnel-portlet"},
+"portletTYpe":"CHART","componentName":"pim-person-org-person-age-funnel-portlet"},
 {"type":"appde",
-"appCodeName":"PIMPERSON",
+"appCodeName":"PimPerson",
 "appName":"人员信息",
 "portletCodeName": "OrgPersonOrgTypePie",
 "portletName": "机关与项目人员",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"pimperson-org-person-org-type-pie-portlet"},
+"portletTYpe":"CHART","componentName":"pim-person-org-person-org-type-pie-portlet"},
 {"type":"app",
-"appCodeName":"PIMEDUCATION",
+"appCodeName":"PimEducation",
 "appName":"教育信息",
 "portletCodeName": "OrgEduPie",
 "portletName": "学历分布",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"app-pimeducation-org-edu-pie-portlet"},
+"portletTYpe":"CHART","componentName":"app-pim-education-org-edu-pie-portlet"},
 {"type":"app",
-"appCodeName":"PIMPERSON",
+"appCodeName":"PimPerson",
 "appName":"人员信息",
 "portletCodeName": "OrgPersonAgeFunnel",
 "portletName": "年龄分布",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"app-pimperson-org-person-age-funnel-portlet"},
+"portletTYpe":"CHART","componentName":"app-pim-person-org-person-age-funnel-portlet"},
 {"type":"app",
-"appCodeName":"PIMOUTPUT",
+"appCodeName":"PimOutput",
 "appName":"产值表",
 "portletCodeName": "OrgOutPutLine",
 "portletName": "月均产值",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"app-pimoutput-org-out-put-line-portlet"},
+"portletTYpe":"CHART","componentName":"app-pim-output-org-out-put-line-portlet"},
 {"type":"app",
-"appCodeName":"PIMPERSON",
+"appCodeName":"PimPerson",
 "appName":"人员信息",
 "portletCodeName": "OrgPersonOrgTypePie",
 "portletName": "机关与项目人员",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"app-pimperson-org-person-org-type-pie-portlet"},
+"portletTYpe":"CHART","componentName":"app-pim-person-org-person-org-type-pie-portlet"},
 {"type":"app",
-"appCodeName":"ORMORG",
+"appCodeName":"OrmOrg",
 "appName":"组织管理",
 "portletCodeName": "OrmPNumList",
 "portletName": "组织人数",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"LIST","componentName":"app-ormorg-orm-pnum-list-portlet"},
+"portletTYpe":"LIST","componentName":"app-orm-org-orm-pnum-list-portlet"},
 {"type":"app",
-"appCodeName":"ORMORG",
+"appCodeName":"OrmOrg",
 "appName":"组织管理",
 "portletCodeName": "OrgBar",
 "portletName": "组织分布",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"app-ormorg-org-bar-portlet"},
+"portletTYpe":"CHART","componentName":"app-orm-org-org-bar-portlet"},
 {"type":"app",
-"appCodeName":"PIMVOCATIONAL",
+"appCodeName":"PimVocational",
 "appName":"证书信息",
 "portletCodeName": "OrgVocNumList",
 "portletName": "职业资格",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"LIST","componentName":"app-pimvocational-org-voc-num-list-portlet"},
+"portletTYpe":"LIST","componentName":"app-pim-vocational-org-voc-num-list-portlet"},
 {"type":"app",
-"appCodeName":"PIMTITLE",
+"appCodeName":"PimTitle",
 "appName":"职称信息",
 "portletCodeName": "OrgTitleBar",
 "portletName": "职称分布",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"app-pimtitle-org-title-bar-portlet"}
+"portletTYpe":"CHART","componentName":"app-pim-title-org-title-bar-portlet"}
 ]
\ No newline at end of file

app_EHRPim/public/assets/json/view-config.json

@@ -113,7 +113,7 @@
     },
     "ormpostpickupview": {
         "title": "岗位管理数据选择视图",
-        "caption": "岗位集",
+        "caption": "岗位",
         "viewtype": "DEPICKUPVIEW",
         "viewmodule": "ORM",
         "viewname": "ORMPOSTPickupView",
@@ -849,7 +849,7 @@
     },
     "ormpostpickupgridview": {
         "title": "岗位管理选择表格视图",
-        "caption": "岗位集",
+        "caption": "岗位",
         "viewtype": "DEPICKUPGRIDVIEW",
         "viewmodule": "ORM",
         "viewname": "ORMPOSTPickupGridView",
@@ -865,7 +865,7 @@
     },
     "pcmdetailmpickupview": {
         "title": "人员明细表数据多项选择视图",
-        "caption": "人员明细表",
+        "caption": "人员花名册",
         "viewtype": "DEMPICKUPVIEW",
         "viewmodule": "PIM",
         "viewname": "PCMDETAILMPickupView",
@@ -1065,7 +1065,7 @@
     },
     "ormpostejormorgidpickupview": {
         "title": "岗位管理数据选择视图",
-        "caption": "岗位集",
+        "caption": "岗位",
         "viewtype": "DEPICKUPVIEW",
         "viewmodule": "ORM",
         "viewname": "ORMPOSTEJORMORGIDPickupView",
@@ -1084,7 +1084,7 @@
         "caption": "组织选择表格视图",
         "viewtype": "DEPICKUPGRIDVIEW",
         "viewmodule": "ORM",
-        "viewname": "ORMORGXMBQPickupGridView",
+        "viewname": "OrmOrgXMBQPickupGridView",
         "viewtag": "41632650e23fc6ab2bb7b231b594f6e2"
     },
     "pimpersongzdqgridview": {
@@ -1097,7 +1097,7 @@
     },
     "pcmdetaileditview": {
         "title": "人员明细表编辑视图",
-        "caption": "人员明细表",
+        "caption": "人员花名册",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "PIM",
         "viewname": "PCMDETAILEditView",
@@ -1263,14 +1263,6 @@
         "viewname": "OrmSignOrgBDWPickupGridView",
         "viewtag": "4d05a18be99502a79a879d5794ff6ab2"
     },
-    "pimexitandentryredirectview": {
-        "title": "出入境管理数据重定向视图",
-        "caption": "出入境管理",
-        "viewtype": "DEREDIRECTVIEW",
-        "viewmodule": "PIM",
-        "viewname": "PIMEXITANDENTRYRedirectView",
-        "viewtag": "4d18ce5c2ced758971d6b38d64dd4a36"
-    },
     "pimpersonkqjrypickupgridview": {
         "title": "请假人员",
         "caption": "人员信息",
@@ -3272,7 +3264,7 @@
         "viewtag": "ce1160d87a00bc775eaa92013a0f2ef3"
     },
     "contractsignorggridview": {
-        "title": "法人主体设置表格视图",
+        "title": "法人主体设置",
         "caption": "法人主体设置",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "PIM",
@@ -3409,7 +3401,7 @@
     },
     "pcmdetailpickupview": {
         "title": "人员明细表数据选择视图",
-        "caption": "人员明细表",
+        "caption": "人员花名册",
         "viewtype": "DEPICKUPVIEW",
         "viewmodule": "PIM",
         "viewname": "PCMDETAILPickupView",
@@ -3513,7 +3505,7 @@
     },
     "pcmdetailpickupgridview": {
         "title": "人员明细表选择表格视图",
-        "caption": "人员明细表",
+        "caption": "人员花名册",
         "viewtype": "DEPICKUPGRIDVIEW",
         "viewmodule": "PIM",
         "viewname": "PCMDETAILPickupGridView",
@@ -3897,7 +3889,7 @@
     },
     "pcmdetaileditview2": {
         "title": "人员明细表编辑视图",
-        "caption": "人员明细表",
+        "caption": "人员花名册",
         "viewtype": "DEEDITVIEW2",
         "viewmodule": "PIM",
         "viewname": "PCMDETAILEditView2",
@@ -4097,7 +4089,7 @@
     },
     "pcmdetailredirectview": {
         "title": "人员明细表数据重定向视图",
-        "caption": "人员明细表",
+        "caption": "人员花名册",
         "viewtype": "DEREDIRECTVIEW",
         "viewmodule": "PIM",
         "viewname": "PCMDETAILRedirectView",

app_EHRPim/public/view-config/view-config.json

@@ -127,7 +127,7 @@
     },
     "ormpostpickupview": {
         "title": "岗位管理数据选择视图",
-        "caption": "岗位集",
+        "caption": "岗位",
         "viewtype": "DEPICKUPVIEW",
         "viewmodule": "ORM",
         "viewname": "ORMPOSTPickupView",
@@ -955,7 +955,7 @@
     },
     "ormpostpickupgridview": {
         "title": "岗位管理选择表格视图",
-        "caption": "岗位集",
+        "caption": "岗位",
         "viewtype": "DEPICKUPGRIDVIEW",
         "viewmodule": "ORM",
         "viewname": "ORMPOSTPickupGridView",
@@ -973,7 +973,7 @@
     },
     "pcmdetailmpickupview": {
         "title": "人员明细表数据多项选择视图",
-        "caption": "人员明细表",
+        "caption": "人员花名册",
         "viewtype": "DEMPICKUPVIEW",
         "viewmodule": "PIM",
         "viewname": "PCMDETAILMPickupView",
@@ -1198,7 +1198,7 @@
     },
     "ormpostejormorgidpickupview": {
         "title": "岗位管理数据选择视图",
-        "caption": "岗位集",
+        "caption": "岗位",
         "viewtype": "DEPICKUPVIEW",
         "viewmodule": "ORM",
         "viewname": "ORMPOSTEJORMORGIDPickupView",
@@ -1219,7 +1219,7 @@
         "caption": "组织选择表格视图",
         "viewtype": "DEPICKUPGRIDVIEW",
         "viewmodule": "ORM",
-        "viewname": "ORMORGXMBQPickupGridView",
+        "viewname": "OrmOrgXMBQPickupGridView",
         "viewtag": "41632650e23fc6ab2bb7b231b594f6e2",
         "memo": "系统自动添加"
     },
@@ -1234,7 +1234,7 @@
     },
     "pcmdetaileditview": {
         "title": "人员明细表编辑视图",
-        "caption": "人员明细表",
+        "caption": "人员花名册",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "PIM",
         "viewname": "PCMDETAILEditView",
@@ -1421,15 +1421,6 @@
         "viewtag": "4d05a18be99502a79a879d5794ff6ab2",
         "memo": "系统自动添加"
     },
-    "pimexitandentryredirectview": {
-        "title": "出入境管理数据重定向视图",
-        "caption": "出入境管理",
-        "viewtype": "DEREDIRECTVIEW",
-        "viewmodule": "PIM",
-        "viewname": "PIMEXITANDENTRYRedirectView",
-        "viewtag": "4d18ce5c2ced758971d6b38d64dd4a36",
-        "memo": ""
-    },
     "pimpersonkqjrypickupgridview": {
         "title": "请假人员",
         "caption": "人员信息",
@@ -3681,7 +3672,7 @@
         "memo": "b507c5997d4a6a783d9d651e5da0f222"
     },
     "contractsignorggridview": {
-        "title": "法人主体设置表格视图",
+        "title": "法人主体设置",
         "caption": "法人主体设置",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "PIM",
@@ -3835,7 +3826,7 @@
     },
     "pcmdetailpickupview": {
         "title": "人员明细表数据选择视图",
-        "caption": "人员明细表",
+        "caption": "人员花名册",
         "viewtype": "DEPICKUPVIEW",
         "viewmodule": "PIM",
         "viewname": "PCMDETAILPickupView",
@@ -3952,7 +3943,7 @@
     },
     "pcmdetailpickupgridview": {
         "title": "人员明细表选择表格视图",
-        "caption": "人员明细表",
+        "caption": "人员花名册",
         "viewtype": "DEPICKUPGRIDVIEW",
         "viewmodule": "PIM",
         "viewname": "PCMDETAILPickupGridView",
@@ -4384,7 +4375,7 @@
     },
     "pcmdetaileditview2": {
         "title": "人员明细表编辑视图",
-        "caption": "人员明细表",
+        "caption": "人员花名册",
         "viewtype": "DEEDITVIEW2",
         "viewmodule": "PIM",
         "viewname": "PCMDETAILEditView2",
@@ -4609,7 +4600,7 @@
     },
     "pcmdetailredirectview": {
         "title": "人员明细表数据重定向视图",
-        "caption": "人员明细表",
+        "caption": "人员花名册",
         "viewtype": "DEREDIRECTVIEW",
         "viewmodule": "PIM",
         "viewname": "PCMDETAILRedirectView",

app_EHRPim/src/app-register.ts

@@ -71,6 +71,11 @@ import AppUploadFileInfo from './components/app-upload-file-info/app-upload-file
 import ContextMenu from './components/context-menu/context-menu'
 import AppColumnFormat from './components/app-column-format/app-column-format.vue'
 import AppQuickGroup from './components/app-quick-group/app-quick-group.vue'
+import AppOrgSelect from './components/app-org-select/app-org-select.vue'
+import AppDepartmentSelect from './components/app-department-select/app-department-select.vue'
+import IBizGroupSelect from './components/ibiz-group-select/ibiz-group-select.vue'
+import IBizGroupPicker from './components/ibiz-group-picker/ibiz-group-picker.vue'
+import AppWFApproval from './components/app-wf-approval/app-wf-approval.vue'
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -151,5 +156,10 @@ export const AppComponents = {
         v.component('context-menu',ContextMenu);
         v.component('app-column-format',AppColumnFormat);
         v.component('app-quick-group',AppQuickGroup);
+        v.component('app-org-select',AppOrgSelect);
+        v.component('app-department-select',AppDepartmentSelect);
+        v.component('ibiz-group-select',IBizGroupSelect);
+        v.component('ibiz-group-picker',IBizGroupPicker);
+        v.component('app-wf-approval',AppWFApproval);
     },
 };
\ No newline at end of file

app_EHRPim/src/codelist/ehr-code-list0001.ts

+import CodeItemService from '@service/code-item/code-item-service';
+/**
+ * 代码表--籍贯（户籍所在地）
+ *
+ * @export
+ * @class EhrCodeList0001
+ */
+export default class EhrCodeList0001 {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof EhrCodeList0001
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof EhrCodeList0001
+     */
+    public expirationTime:any;
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof EhrCodeList0001
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof EhrCodeList0001
+     */
+    public codelistModel:any = {
+        codelistid:"EhrCodeList0001"
+    };
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0001
+     */
+    public userParamNames:any ={
+        codelistid:"E3905F82-CCC9-4894-93D8-4AFBE40BEEF0"
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0001
+     */
+    public queryParamNames:any ={
+        sort: 'ordervalue,asc'
+    }
+
+    /**
+     * 代码项应用实体服务对象
+     *
+     * @type {CodeItemService}
+     * @memberof EhrCodeList0001
+     */
+    public codeitemService: CodeItemService = new CodeItemService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof EhrCodeList0001
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        items.forEach((item: any) => {
+            let itemdata:any = {};
+            Object.assign(itemdata,{id:item.codeitemvalue});
+            Object.assign(itemdata,{value:item.codeitemvalue});
+            Object.assign(itemdata,{text:item.codeitemname});
+            
+            _items.push(itemdata);
+        });
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EhrCodeList0001
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.codeitemService.FetchCurCL(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof EhrCodeList0001
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_EHRPim/src/codelist/ehr-code-list0014.ts

+import PersonStateMgrService from '@service/person-state-mgr/person-state-mgr-service';
+/**
+ * 代码表--员工状态
+ *
+ * @export
+ * @class EhrCodeList0014
+ */
+export default class EhrCodeList0014 {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof EhrCodeList0014
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof EhrCodeList0014
+     */
+    public expirationTime:any;
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof EhrCodeList0014
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof EhrCodeList0014
+     */
+    public codelistModel:any = {
+        codelistid:"EhrCodeList0014"
+    };
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0014
+     */
+    public userParamNames:any ={
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0014
+     */
+    public queryParamNames:any ={
+        sort: 'orderno,asc'
+    }
+
+    /**
+     * 员工状态管理应用实体服务对象
+     *
+     * @type {PersonStateMgrService}
+     * @memberof EhrCodeList0014
+     */
+    public personstatemgrService: PersonStateMgrService = new PersonStateMgrService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof EhrCodeList0014
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        items.forEach((item: any) => {
+            let itemdata:any = {};
+            Object.assign(itemdata,{id:item.personstatecode});
+            Object.assign(itemdata,{value:item.personstatecode});
+            Object.assign(itemdata,{text:item.personstatemgrname});
+            
+            _items.push(itemdata);
+        });
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EhrCodeList0014
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.personstatemgrService.FetchDefault(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof EhrCodeList0014
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_EHRPim/src/codelist/ehr-code-list0018.ts

+import CodeItemService from '@service/code-item/code-item-service';
+/**
+ * 代码表--血型
+ *
+ * @export
+ * @class EhrCodeList0018
+ */
+export default class EhrCodeList0018 {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof EhrCodeList0018
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof EhrCodeList0018
+     */
+    public expirationTime:any;
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof EhrCodeList0018
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof EhrCodeList0018
+     */
+    public codelistModel:any = {
+        codelistid:"EhrCodeList0018"
+    };
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0018
+     */
+    public userParamNames:any ={
+        codelistid:"2AAC77E1-C58A-4C53-95DB-350783975A21"
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0018
+     */
+    public queryParamNames:any ={
+        sort: 'ordervalue,asc'
+    }
+
+    /**
+     * 代码项应用实体服务对象
+     *
+     * @type {CodeItemService}
+     * @memberof EhrCodeList0018
+     */
+    public codeitemService: CodeItemService = new CodeItemService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof EhrCodeList0018
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        items.forEach((item: any) => {
+            let itemdata:any = {};
+            Object.assign(itemdata,{id:item.codeitemvalue});
+            Object.assign(itemdata,{value:item.codeitemvalue});
+            Object.assign(itemdata,{text:item.codeitemname});
+            
+            _items.push(itemdata);
+        });
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EhrCodeList0018
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.codeitemService.FetchCurCL(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof EhrCodeList0018
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_EHRPim/src/codelist/ehr-code-list0024.ts

+import CodeItemService from '@service/code-item/code-item-service';
+/**
+ * 代码表--职称等级
+ *
+ * @export
+ * @class EhrCodeList0024
+ */
+export default class EhrCodeList0024 {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof EhrCodeList0024
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof EhrCodeList0024
+     */
+    public expirationTime:any;
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof EhrCodeList0024
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof EhrCodeList0024
+     */
+    public codelistModel:any = {
+        codelistid:"EhrCodeList0024"
+    };
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0024
+     */
+    public userParamNames:any ={
+        codelistid:"A794C86F-0433-4620-90B7-32CEB0764120"
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0024
+     */
+    public queryParamNames:any ={
+        sort: 'ordervalue,asc'
+    }
+
+    /**
+     * 代码项应用实体服务对象
+     *
+     * @type {CodeItemService}
+     * @memberof EhrCodeList0024
+     */
+    public codeitemService: CodeItemService = new CodeItemService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof EhrCodeList0024
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        items.forEach((item: any) => {
+            let itemdata:any = {};
+            Object.assign(itemdata,{id:item.codeitemvalue});
+            Object.assign(itemdata,{value:item.codeitemvalue});
+            Object.assign(itemdata,{text:item.codeitemname});
+            
+            _items.push(itemdata);
+        });
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EhrCodeList0024
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.codeitemService.FetchCurCL(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof EhrCodeList0024
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_EHRPim/src/codelist/ehr-code-list0025.ts

+import OrmRankService from '@service/orm-rank/orm-rank-service';
+/**
+ * 代码表--职级
+ *
+ * @export
+ * @class EhrCodeList0025
+ */
+export default class EhrCodeList0025 {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof EhrCodeList0025
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof EhrCodeList0025
+     */
+    public expirationTime:any;
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof EhrCodeList0025
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof EhrCodeList0025
+     */
+    public codelistModel:any = {
+        codelistid:"EhrCodeList0025"
+    };
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0025
+     */
+    public userParamNames:any ={
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0025
+     */
+    public queryParamNames:any ={
+        sort: 'xh,asc'
+    }
+
+    /**
+     * 职级管理应用实体服务对象
+     *
+     * @type {OrmRankService}
+     * @memberof EhrCodeList0025
+     */
+    public ormrankService: OrmRankService = new OrmRankService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof EhrCodeList0025
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        items.forEach((item: any) => {
+            let itemdata:any = {};
+            Object.assign(itemdata,{id:item.ormrankid});
+            Object.assign(itemdata,{value:item.ormrankid});
+            Object.assign(itemdata,{text:item.ormrankname});
+            
+            _items.push(itemdata);
+        });
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EhrCodeList0025
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.ormrankService.FetchDefault(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof EhrCodeList0025
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_EHRPim/src/codelist/ehr-code-list0029.ts

+import CodeItemService from '@service/code-item/code-item-service';
+/**
+ * 代码表--政治面貌
+ *
+ * @export
+ * @class EhrCodeList0029
+ */
+export default class EhrCodeList0029 {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof EhrCodeList0029
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof EhrCodeList0029
+     */
+    public expirationTime:any;
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof EhrCodeList0029
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof EhrCodeList0029
+     */
+    public codelistModel:any = {
+        codelistid:"EhrCodeList0029"
+    };
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0029
+     */
+    public userParamNames:any ={
+        codelistid:"3549897D-7184-4EC4-9522-808725645EEF"
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0029
+     */
+    public queryParamNames:any ={
+        sort: 'ordervalue,asc'
+    }
+
+    /**
+     * 代码项应用实体服务对象
+     *
+     * @type {CodeItemService}
+     * @memberof EhrCodeList0029
+     */
+    public codeitemService: CodeItemService = new CodeItemService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof EhrCodeList0029
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        items.forEach((item: any) => {
+            let itemdata:any = {};
+            Object.assign(itemdata,{id:item.codeitemvalue});
+            Object.assign(itemdata,{value:item.codeitemvalue});
+            Object.assign(itemdata,{text:item.codeitemname});
+            
+            _items.push(itemdata);
+        });
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EhrCodeList0029
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.codeitemService.FetchCurCL(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof EhrCodeList0029
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_EHRPim/src/codelist/ehr-code-list0033.ts

+import CodeItemService from '@service/code-item/code-item-service';
+/**
+ * 代码表--档级
+ *
+ * @export
+ * @class EhrCodeList0033
+ */
+export default class EhrCodeList0033 {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof EhrCodeList0033
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof EhrCodeList0033
+     */
+    public expirationTime:any;
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof EhrCodeList0033
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof EhrCodeList0033
+     */
+    public codelistModel:any = {
+        codelistid:"EhrCodeList0033"
+    };
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0033
+     */
+    public userParamNames:any ={
+        codelistid:"D69ACE43-CB47-498F-AB5F-91B8E0BB9211"
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0033
+     */
+    public queryParamNames:any ={
+    }
+
+    /**
+     * 代码项应用实体服务对象
+     *
+     * @type {CodeItemService}
+     * @memberof EhrCodeList0033
+     */
+    public codeitemService: CodeItemService = new CodeItemService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof EhrCodeList0033
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        items.forEach((item: any) => {
+            let itemdata:any = {};
+            Object.assign(itemdata,{id:item.codeitemvalue});
+            Object.assign(itemdata,{value:item.codeitemvalue});
+            Object.assign(itemdata,{text:item.codeitemname});
+            
+            _items.push(itemdata);
+        });
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EhrCodeList0033
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.codeitemService.FetchCurCL(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof EhrCodeList0033
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_EHRPim/src/codelist/ehr-code-list0035.ts

+import CodeItemService from '@service/code-item/code-item-service';
+/**
+ * 代码表--军转类型
+ *
+ * @export
+ * @class EhrCodeList0035
+ */
+export default class EhrCodeList0035 {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof EhrCodeList0035
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof EhrCodeList0035
+     */
+    public expirationTime:any;
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof EhrCodeList0035
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof EhrCodeList0035
+     */
+    public codelistModel:any = {
+        codelistid:"EhrCodeList0035"
+    };
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0035
+     */
+    public userParamNames:any ={
+        codelistid:"8E620A0E-E783-4369-9343-86EA2F16BB38"
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0035
+     */
+    public queryParamNames:any ={
+    }
+
+    /**
+     * 代码项应用实体服务对象
+     *
+     * @type {CodeItemService}
+     * @memberof EhrCodeList0035
+     */
+    public codeitemService: CodeItemService = new CodeItemService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof EhrCodeList0035
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        items.forEach((item: any) => {
+            let itemdata:any = {};
+            Object.assign(itemdata,{id:item.codeitemvalue});
+            Object.assign(itemdata,{value:item.codeitemvalue});
+            Object.assign(itemdata,{text:item.codeitemname});
+            
+            _items.push(itemdata);
+        });
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EhrCodeList0035
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.codeitemService.FetchCurCL(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof EhrCodeList0035
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_EHRPim/src/codelist/ehr-code-list0098.ts

+/**
+ * 代码表--考勤类型
+ *
+ * @export
+ * @class EhrCodeList0098
+ */
+export default class EhrCodeList0098 {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof EhrCodeList0098
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof EhrCodeList0098
+     */
+    public expirationTime:any;
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof EhrCodeList0098
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof EhrCodeList0098
+     */
+    public codelistModel:any = {
+        codelistid:"EhrCodeList0098"
+    };
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0098
+     */
+    public userParamNames:any ={
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0098
+     */
+    public queryParamNames:any ={
+    }
+
+
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EhrCodeList0098
+     */
+    public getItems(data: any={}, isloading?: boolean): Promise<any> {
+        return Promise.reject([]);
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof EhrCodeList0098
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}