ibizdev提交

app_EHRPim/src/components/login/login.less

 .login{
     width: 100vh;
     height: 100vh;
-    > img{
-        width: 100vw;
-        height: 100vh;
-    }
-    .login-logo{
-        position: fixed;
-        left: 80px;
-        top: 80px;
-    }
-    .login-content{
-        position: fixed;
-        left: 10%;
-        top: 30%;
-        width: 60%;
-        >span{
-            color: #fff;
-            font-size: 84px;
-        }
-    }
+    // background-image: url('../assets/images/login_bg.jpg');
+    background-size: cover;
+    background-position: center;
+    position: relative;
     &-con{
         position: fixed;
         right: 160px;
         top: 50%;
         transform: translateY(-60%);
         width: 300px;
-        .ivu-card-head {
-            padding: 14px 6px;
-            >p{
-                line-height: 20px;
-                font-size: 14px;
-                color: #17233d;
-                font-weight: 700;
-            }
-        }
         &-header{
             font-size: 16px;
             font-weight: 300;

app_EHRPim/src/components/login/login.vue

 <template>
     <div class='login'>
-        <img src="/assets/img/login_bg.png"/>
-        <div class="login-logo">
-            <img src ="/assets/img/logo.svg"/>
-        </div>
-        <div class="login-content">
-            <span>{{appTitle}}</span>
-        </div>
         <div class='login-con'>
             <card :bordered="false">
                 <p slot='title'>
@@ -62,15 +55,7 @@ export default class Login extends Vue {
      * @type {*}
      * @memberof Login
      */
-    public form: any = { loginname: 'guest', password: 'guest' };
-
-    /**
-     * 应用标题
-     *
-     * @type {string}
-     * @memberof Login
-     */
-    public appTitle:string = Environment.AppTitle;
+    public form: any = { loginname: null, password: null };
 
     /**
      * 值规则
@@ -133,12 +118,8 @@ export default class Login extends Vue {
         post.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
-                if(data && data.token){
-                    localStorage.setItem('token', data.token);
-                }
-                if(data && data.user){
-                    localStorage.setItem('user', JSON.stringify(data.user));
-                }
+                localStorage.setItem('token', data.token);
+                localStorage.setItem('user', JSON.stringify(data.user));
                 const url: any = this.$route.query.redirect ? this.$route.query.redirect : '*';
                 this.$router.push({ path: url });
             }

app_EHRPim/src/crm-core/components/app-layout/app-layout.less

@@ -154,8 +154,7 @@ body {
   .dashboard{
     padding: 8px;
   }
-  .portlet-card, .portlet-container{
-  // .portlet-container{
+  .portlet-container{
     background: #efefef;
   }
   .portlet-container::after{

app_EHRPim/src/mock/entity/pimeducations/pimeducations.ts

@@ -4,12 +4,12 @@ const mock = MockAdapter.getInstance();
 
 // 模拟数据
 const mockDatas: Array<any> = [
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 22:28:50","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"1","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息","pimeducationid":"1","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 22:28:50","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 22:28:50","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"2","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(1)","pimeducationid":"2","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 22:28:50","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 22:28:50","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"3","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(2)","pimeducationid":"3","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 22:28:50","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 22:28:50","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"4","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(3)","pimeducationid":"4","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 22:28:50","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 22:28:50","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"5","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(4)","pimeducationid":"5","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 22:28:50","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 22:28:50","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"6","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(5)","pimeducationid":"6","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 22:28:50","createman":"示例操作者","pimpersonname":null}
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 23:36:49","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"1","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息","pimeducationid":"1","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 23:36:49","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 23:36:49","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"2","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(1)","pimeducationid":"2","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 23:36:49","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 23:36:49","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"3","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(2)","pimeducationid":"3","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 23:36:49","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 23:36:49","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"4","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(3)","pimeducationid":"4","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 23:36:49","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 23:36:49","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"5","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(4)","pimeducationid":"5","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 23:36:49","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 23:36:49","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"6","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(5)","pimeducationid":"6","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 23:36:49","createman":"示例操作者","pimpersonname":null}
 ];
 
 

app_EHRPim/src/service/pimarchives/pimarchives-service-base.ts

@@ -85,9 +85,9 @@ export default class PIMARCHIVESServiceBase extends EntityService {
         }
         let res:any = await  Http.getInstance().get(`/pimarchives/getdraft`,isloading);
         res.data.pimarchives = data.pimarchives;
+            this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
             this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns));
             this.tempStorage.setItem(context.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
         return res;
     }
 
@@ -105,6 +105,21 @@ export default class PIMARCHIVESServiceBase extends EntityService {
             return Http.getInstance().post(`/pimpeople/${context.pimperson}/pimarchives/${context.pimarchives}/save`,data,isloading);
         }
         let masterData:any = {};
+        let pimarchivesrecordsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords'),'undefined')){
+            pimarchivesrecordsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords') as any);
+            if(pimarchivesrecordsData && pimarchivesrecordsData.length && pimarchivesrecordsData.length > 0){
+                pimarchivesrecordsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimarchivesrecordid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimarchivesrecords = pimarchivesrecordsData;
         let pimarchivesloanandreturnsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns'),'undefined')){
             pimarchivesloanandreturnsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns') as any);
@@ -135,26 +150,11 @@ export default class PIMARCHIVESServiceBase extends EntityService {
             }
         }
         masterData.pimarchiveschanges = pimarchiveschangesData;
-        let pimarchivesrecordsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords'),'undefined')){
-            pimarchivesrecordsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords') as any);
-            if(pimarchivesrecordsData && pimarchivesrecordsData.length && pimarchivesrecordsData.length > 0){
-                pimarchivesrecordsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimarchivesrecordid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimarchivesrecords = pimarchivesrecordsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/pimarchives/${context.pimarchives}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
             this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns));
             this.tempStorage.setItem(context.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
             return res;
     }
 
@@ -172,9 +172,9 @@ export default class PIMARCHIVESServiceBase extends EntityService {
             return Http.getInstance().get(`/pimpeople/${context.pimperson}/pimarchives/${context.pimarchives}`,isloading);
         }
             let res:any = await Http.getInstance().get(`/pimarchives/${context.pimarchives}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
             this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns));
             this.tempStorage.setItem(context.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
             return res;
 
     }
@@ -193,6 +193,21 @@ export default class PIMARCHIVESServiceBase extends EntityService {
             return Http.getInstance().put(`/pimpeople/${context.pimperson}/pimarchives/${context.pimarchives}`,data,isloading);
         }
         let masterData:any = {};
+        let pimarchivesrecordsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords'),'undefined')){
+            pimarchivesrecordsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords') as any);
+            if(pimarchivesrecordsData && pimarchivesrecordsData.length && pimarchivesrecordsData.length > 0){
+                pimarchivesrecordsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimarchivesrecordid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimarchivesrecords = pimarchivesrecordsData;
         let pimarchivesloanandreturnsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns'),'undefined')){
             pimarchivesloanandreturnsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns') as any);
@@ -223,26 +238,11 @@ export default class PIMARCHIVESServiceBase extends EntityService {
             }
         }
         masterData.pimarchiveschanges = pimarchiveschangesData;
-        let pimarchivesrecordsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords'),'undefined')){
-            pimarchivesrecordsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords') as any);
-            if(pimarchivesrecordsData && pimarchivesrecordsData.length && pimarchivesrecordsData.length > 0){
-                pimarchivesrecordsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimarchivesrecordid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimarchivesrecords = pimarchivesrecordsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/pimarchives/${context.pimarchives}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
             this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns));
             this.tempStorage.setItem(context.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
             return res;
     }
 
@@ -282,6 +282,21 @@ export default class PIMARCHIVESServiceBase extends EntityService {
             return Http.getInstance().post(`/pimpeople/${context.pimperson}/pimarchives`,data,isloading);
         }
         let masterData:any = {};
+        let pimarchivesrecordsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords'),'undefined')){
+            pimarchivesrecordsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords') as any);
+            if(pimarchivesrecordsData && pimarchivesrecordsData.length && pimarchivesrecordsData.length > 0){
+                pimarchivesrecordsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimarchivesrecordid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimarchivesrecords = pimarchivesrecordsData;
         let pimarchivesloanandreturnsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns'),'undefined')){
             pimarchivesloanandreturnsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns') as any);
@@ -312,21 +327,6 @@ export default class PIMARCHIVESServiceBase extends EntityService {
             }
         }
         masterData.pimarchiveschanges = pimarchiveschangesData;
-        let pimarchivesrecordsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords'),'undefined')){
-            pimarchivesrecordsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords') as any);
-            if(pimarchivesrecordsData && pimarchivesrecordsData.length && pimarchivesrecordsData.length > 0){
-                pimarchivesrecordsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimarchivesrecordid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimarchivesrecords = pimarchivesrecordsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -336,9 +336,9 @@ export default class PIMARCHIVESServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/pimarchives`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
         return res;
     }
 

app_EHRPim/src/service/pimperson/pimperson-service-base.ts

@@ -80,36 +80,21 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.attendancemreportmxes = attendancemreportmxesData;
-        let pimeducationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations'),'undefined')){
-            pimeducationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations') as any);
-            if(pimeducationsData && pimeducationsData.length && pimeducationsData.length > 0){
-                pimeducationsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimeducationid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimeducations = pimeducationsData;
-        let pimpersonchangesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges'),'undefined')){
-            pimpersonchangesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges') as any);
-            if(pimpersonchangesData && pimpersonchangesData.length && pimpersonchangesData.length > 0){
-                pimpersonchangesData.forEach((item:any) => {
+        let pimdistirbutionsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions'),'undefined')){
+            pimdistirbutionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions') as any);
+            if(pimdistirbutionsData && pimdistirbutionsData.length && pimdistirbutionsData.length > 0){
+                pimdistirbutionsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimpersonchangeid = null;
+                            item.pimdistirbutionid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimpersonchanges = pimpersonchangesData;
+        masterData.pimdistirbutions = pimdistirbutionsData;
         let pimtitlesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles'),'undefined')){
             pimtitlesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles') as any);
@@ -125,36 +110,6 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimtitles = pimtitlesData;
-        let pimpersonabilitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities'),'undefined')){
-            pimpersonabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities') as any);
-            if(pimpersonabilitiesData && pimpersonabilitiesData.length && pimpersonabilitiesData.length > 0){
-                pimpersonabilitiesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimpersonabilityid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimpersonabilities = pimpersonabilitiesData;
-        let pimexitandentriesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries'),'undefined')){
-            pimexitandentriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries') as any);
-            if(pimexitandentriesData && pimexitandentriesData.length && pimexitandentriesData.length > 0){
-                pimexitandentriesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimexitandentryid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimexitandentries = pimexitandentriesData;
         let pimfaminfosData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos'),'undefined')){
             pimfaminfosData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos') as any);
@@ -170,36 +125,21 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimfaminfos = pimfaminfosData;
-        let pimdistirbutionsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions'),'undefined')){
-            pimdistirbutionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions') as any);
-            if(pimdistirbutionsData && pimdistirbutionsData.length && pimdistirbutionsData.length > 0){
-                pimdistirbutionsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimdistirbutionid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimdistirbutions = pimdistirbutionsData;
-        let pimarmycadresData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres'),'undefined')){
-            pimarmycadresData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres') as any);
-            if(pimarmycadresData && pimarmycadresData.length && pimarmycadresData.length > 0){
-                pimarmycadresData.forEach((item:any) => {
+        let pimresearchfindingsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings'),'undefined')){
+            pimresearchfindingsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings') as any);
+            if(pimresearchfindingsData && pimresearchfindingsData.length && pimresearchfindingsData.length > 0){
+                pimresearchfindingsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimarmycadresid = null;
+                            item.pimresearchfindingsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimarmycadres = pimarmycadresData;
+        masterData.pimresearchfindings = pimresearchfindingsData;
         let pimworkhistoriesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories'),'undefined')){
             pimworkhistoriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories') as any);
@@ -215,36 +155,21 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimworkhistories = pimworkhistoriesData;
-        let pimpatentsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents'),'undefined')){
-            pimpatentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents') as any);
-            if(pimpatentsData && pimpatentsData.length && pimpatentsData.length > 0){
-                pimpatentsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimpatentid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimpatents = pimpatentsData;
-        let pimvacationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations'),'undefined')){
-            pimvacationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations') as any);
-            if(pimvacationsData && pimvacationsData.length && pimvacationsData.length > 0){
-                pimvacationsData.forEach((item:any) => {
+        let pimvocationalsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals'),'undefined')){
+            pimvocationalsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals') as any);
+            if(pimvocationalsData && pimvocationalsData.length && pimvocationalsData.length > 0){
+                pimvocationalsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimvacationid = null;
+                            item.pimvocationalid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimvacations = pimvacationsData;
+        masterData.pimvocationals = pimvocationalsData;
         let pimarchivesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives'),'undefined')){
             pimarchivesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives') as any);
@@ -305,21 +230,36 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimpapers = pimpapersData;
-        let pimresearchfindingsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings'),'undefined')){
-            pimresearchfindingsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings') as any);
-            if(pimresearchfindingsData && pimresearchfindingsData.length && pimresearchfindingsData.length > 0){
-                pimresearchfindingsData.forEach((item:any) => {
+        let pimpersonchangesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges'),'undefined')){
+            pimpersonchangesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges') as any);
+            if(pimpersonchangesData && pimpersonchangesData.length && pimpersonchangesData.length > 0){
+                pimpersonchangesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimresearchfindingsid = null;
+                            item.pimpersonchangeid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimresearchfindings = pimresearchfindingsData;
+        masterData.pimpersonchanges = pimpersonchangesData;
+        let pimexitandentriesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries'),'undefined')){
+            pimexitandentriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries') as any);
+            if(pimexitandentriesData && pimexitandentriesData.length && pimexitandentriesData.length > 0){
+                pimexitandentriesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimexitandentryid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimexitandentries = pimexitandentriesData;
         let pimrewardpunishmentsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments'),'undefined')){
             pimrewardpunishmentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments') as any);
@@ -335,36 +275,36 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimrewardpunishments = pimrewardpunishmentsData;
-        let pimvocationalsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals'),'undefined')){
-            pimvocationalsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals') as any);
-            if(pimvocationalsData && pimvocationalsData.length && pimvocationalsData.length > 0){
-                pimvocationalsData.forEach((item:any) => {
+        let pimarmycadresData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres'),'undefined')){
+            pimarmycadresData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres') as any);
+            if(pimarmycadresData && pimarmycadresData.length && pimarmycadresData.length > 0){
+                pimarmycadresData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimvocationalid = null;
+                            item.pimarmycadresid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimvocationals = pimvocationalsData;
-        let pimlanguageabilitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities'),'undefined')){
-            pimlanguageabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities') as any);
-            if(pimlanguageabilitiesData && pimlanguageabilitiesData.length && pimlanguageabilitiesData.length > 0){
-                pimlanguageabilitiesData.forEach((item:any) => {
+        masterData.pimarmycadres = pimarmycadresData;
+        let pimpatentsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents'),'undefined')){
+            pimpatentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents') as any);
+            if(pimpatentsData && pimpatentsData.length && pimpatentsData.length > 0){
+                pimpatentsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimlanguageabilityid = null;
+                            item.pimpatentid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimlanguageabilities = pimlanguageabilitiesData;
+        masterData.pimpatents = pimpatentsData;
         let pimcontractsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts'),'undefined')){
             pimcontractsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts') as any);
@@ -380,29 +320,89 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimcontracts = pimcontractsData;
+        let pimeducationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations'),'undefined')){
+            pimeducationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations') as any);
+            if(pimeducationsData && pimeducationsData.length && pimeducationsData.length > 0){
+                pimeducationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimeducationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimeducations = pimeducationsData;
+        let pimvacationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations'),'undefined')){
+            pimvacationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations') as any);
+            if(pimvacationsData && pimvacationsData.length && pimvacationsData.length > 0){
+                pimvacationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimvacationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimvacations = pimvacationsData;
+        let pimlanguageabilitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities'),'undefined')){
+            pimlanguageabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities') as any);
+            if(pimlanguageabilitiesData && pimlanguageabilitiesData.length && pimlanguageabilitiesData.length > 0){
+                pimlanguageabilitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimlanguageabilityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimlanguageabilities = pimlanguageabilitiesData;
+        let pimpersonabilitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities'),'undefined')){
+            pimpersonabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities') as any);
+            if(pimpersonabilitiesData && pimpersonabilitiesData.length && pimpersonabilitiesData.length > 0){
+                pimpersonabilitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimpersonabilityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimpersonabilities = pimpersonabilitiesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/pimpeople/${context.pimperson}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
             this.tempStorage.setItem(context.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
             this.tempStorage.setItem(context.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
             this.tempStorage.setItem(context.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
             this.tempStorage.setItem(context.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives));
             this.tempStorage.setItem(context.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople));
             this.tempStorage.setItem(context.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements));
             this.tempStorage.setItem(context.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
             this.tempStorage.setItem(context.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
             this.tempStorage.setItem(context.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
             return res;
     }
 
@@ -444,26 +444,26 @@ export default class PIMPERSONServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/pimpeople/${context.pimperson}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
             this.tempStorage.setItem(context.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
             this.tempStorage.setItem(context.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
             this.tempStorage.setItem(context.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
             this.tempStorage.setItem(context.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives));
             this.tempStorage.setItem(context.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople));
             this.tempStorage.setItem(context.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements));
             this.tempStorage.setItem(context.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
             this.tempStorage.setItem(context.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
             this.tempStorage.setItem(context.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
             return res;
 
     }
@@ -520,36 +520,21 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.attendancemreportmxes = attendancemreportmxesData;
-        let pimeducationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations'),'undefined')){
-            pimeducationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations') as any);
-            if(pimeducationsData && pimeducationsData.length && pimeducationsData.length > 0){
-                pimeducationsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimeducationid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimeducations = pimeducationsData;
-        let pimpersonchangesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges'),'undefined')){
-            pimpersonchangesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges') as any);
-            if(pimpersonchangesData && pimpersonchangesData.length && pimpersonchangesData.length > 0){
-                pimpersonchangesData.forEach((item:any) => {
+        let pimdistirbutionsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions'),'undefined')){
+            pimdistirbutionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions') as any);
+            if(pimdistirbutionsData && pimdistirbutionsData.length && pimdistirbutionsData.length > 0){
+                pimdistirbutionsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimpersonchangeid = null;
+                            item.pimdistirbutionid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimpersonchanges = pimpersonchangesData;
+        masterData.pimdistirbutions = pimdistirbutionsData;
         let pimtitlesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles'),'undefined')){
             pimtitlesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles') as any);
@@ -565,36 +550,6 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimtitles = pimtitlesData;
-        let pimpersonabilitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities'),'undefined')){
-            pimpersonabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities') as any);
-            if(pimpersonabilitiesData && pimpersonabilitiesData.length && pimpersonabilitiesData.length > 0){
-                pimpersonabilitiesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimpersonabilityid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimpersonabilities = pimpersonabilitiesData;
-        let pimexitandentriesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries'),'undefined')){
-            pimexitandentriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries') as any);
-            if(pimexitandentriesData && pimexitandentriesData.length && pimexitandentriesData.length > 0){
-                pimexitandentriesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimexitandentryid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimexitandentries = pimexitandentriesData;
         let pimfaminfosData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos'),'undefined')){
             pimfaminfosData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos') as any);
@@ -610,36 +565,21 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimfaminfos = pimfaminfosData;
-        let pimdistirbutionsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions'),'undefined')){
-            pimdistirbutionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions') as any);
-            if(pimdistirbutionsData && pimdistirbutionsData.length && pimdistirbutionsData.length > 0){
-                pimdistirbutionsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimdistirbutionid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimdistirbutions = pimdistirbutionsData;
-        let pimarmycadresData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres'),'undefined')){
-            pimarmycadresData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres') as any);
-            if(pimarmycadresData && pimarmycadresData.length && pimarmycadresData.length > 0){
-                pimarmycadresData.forEach((item:any) => {
+        let pimresearchfindingsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings'),'undefined')){
+            pimresearchfindingsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings') as any);
+            if(pimresearchfindingsData && pimresearchfindingsData.length && pimresearchfindingsData.length > 0){
+                pimresearchfindingsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimarmycadresid = null;
+                            item.pimresearchfindingsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimarmycadres = pimarmycadresData;
+        masterData.pimresearchfindings = pimresearchfindingsData;
         let pimworkhistoriesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories'),'undefined')){
             pimworkhistoriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories') as any);
@@ -655,36 +595,21 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimworkhistories = pimworkhistoriesData;
-        let pimpatentsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents'),'undefined')){
-            pimpatentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents') as any);
-            if(pimpatentsData && pimpatentsData.length && pimpatentsData.length > 0){
-                pimpatentsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimpatentid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimpatents = pimpatentsData;
-        let pimvacationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations'),'undefined')){
-            pimvacationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations') as any);
-            if(pimvacationsData && pimvacationsData.length && pimvacationsData.length > 0){
-                pimvacationsData.forEach((item:any) => {
+        let pimvocationalsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals'),'undefined')){
+            pimvocationalsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals') as any);
+            if(pimvocationalsData && pimvocationalsData.length && pimvocationalsData.length > 0){
+                pimvocationalsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimvacationid = null;
+                            item.pimvocationalid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimvacations = pimvacationsData;
+        masterData.pimvocationals = pimvocationalsData;
         let pimarchivesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives'),'undefined')){
             pimarchivesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives') as any);
@@ -745,21 +670,36 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimpapers = pimpapersData;
-        let pimresearchfindingsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings'),'undefined')){
-            pimresearchfindingsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings') as any);
-            if(pimresearchfindingsData && pimresearchfindingsData.length && pimresearchfindingsData.length > 0){
-                pimresearchfindingsData.forEach((item:any) => {
+        let pimpersonchangesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges'),'undefined')){
+            pimpersonchangesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges') as any);
+            if(pimpersonchangesData && pimpersonchangesData.length && pimpersonchangesData.length > 0){
+                pimpersonchangesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimresearchfindingsid = null;
+                            item.pimpersonchangeid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimresearchfindings = pimresearchfindingsData;
+        masterData.pimpersonchanges = pimpersonchangesData;
+        let pimexitandentriesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries'),'undefined')){
+            pimexitandentriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries') as any);
+            if(pimexitandentriesData && pimexitandentriesData.length && pimexitandentriesData.length > 0){
+                pimexitandentriesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimexitandentryid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimexitandentries = pimexitandentriesData;
         let pimrewardpunishmentsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments'),'undefined')){
             pimrewardpunishmentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments') as any);
@@ -775,36 +715,36 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimrewardpunishments = pimrewardpunishmentsData;
-        let pimvocationalsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals'),'undefined')){
-            pimvocationalsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals') as any);
-            if(pimvocationalsData && pimvocationalsData.length && pimvocationalsData.length > 0){
-                pimvocationalsData.forEach((item:any) => {
+        let pimarmycadresData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres'),'undefined')){
+            pimarmycadresData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres') as any);
+            if(pimarmycadresData && pimarmycadresData.length && pimarmycadresData.length > 0){
+                pimarmycadresData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimvocationalid = null;
+                            item.pimarmycadresid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimvocationals = pimvocationalsData;
-        let pimlanguageabilitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities'),'undefined')){
-            pimlanguageabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities') as any);
-            if(pimlanguageabilitiesData && pimlanguageabilitiesData.length && pimlanguageabilitiesData.length > 0){
-                pimlanguageabilitiesData.forEach((item:any) => {
+        masterData.pimarmycadres = pimarmycadresData;
+        let pimpatentsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents'),'undefined')){
+            pimpatentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents') as any);
+            if(pimpatentsData && pimpatentsData.length && pimpatentsData.length > 0){
+                pimpatentsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimlanguageabilityid = null;
+                            item.pimpatentid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimlanguageabilities = pimlanguageabilitiesData;
+        masterData.pimpatents = pimpatentsData;
         let pimcontractsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts'),'undefined')){
             pimcontractsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts') as any);
@@ -820,6 +760,66 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimcontracts = pimcontractsData;
+        let pimeducationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations'),'undefined')){
+            pimeducationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations') as any);
+            if(pimeducationsData && pimeducationsData.length && pimeducationsData.length > 0){
+                pimeducationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimeducationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimeducations = pimeducationsData;
+        let pimvacationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations'),'undefined')){
+            pimvacationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations') as any);
+            if(pimvacationsData && pimvacationsData.length && pimvacationsData.length > 0){
+                pimvacationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimvacationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimvacations = pimvacationsData;
+        let pimlanguageabilitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities'),'undefined')){
+            pimlanguageabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities') as any);
+            if(pimlanguageabilitiesData && pimlanguageabilitiesData.length && pimlanguageabilitiesData.length > 0){
+                pimlanguageabilitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimlanguageabilityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimlanguageabilities = pimlanguageabilitiesData;
+        let pimpersonabilitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities'),'undefined')){
+            pimpersonabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities') as any);
+            if(pimpersonabilitiesData && pimpersonabilitiesData.length && pimpersonabilitiesData.length > 0){
+                pimpersonabilitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimpersonabilityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimpersonabilities = pimpersonabilitiesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -830,26 +830,26 @@ export default class PIMPERSONServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/pimpeople`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
         return res;
     }
 
@@ -864,96 +864,51 @@ export default class PIMPERSONServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let attendancemreportmxesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_attendancemreportmxes'),'undefined')){
-            attendancemreportmxesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_attendancemreportmxes') as any);
-            if(attendancemreportmxesData && attendancemreportmxesData.length && attendancemreportmxesData.length > 0){
-                attendancemreportmxesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.attendancemreportmxid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.attendancemreportmxes = attendancemreportmxesData;
-        let pimeducationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations'),'undefined')){
-            pimeducationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations') as any);
-            if(pimeducationsData && pimeducationsData.length && pimeducationsData.length > 0){
-                pimeducationsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimeducationid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimeducations = pimeducationsData;
-        let pimpersonchangesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges'),'undefined')){
-            pimpersonchangesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges') as any);
-            if(pimpersonchangesData && pimpersonchangesData.length && pimpersonchangesData.length > 0){
-                pimpersonchangesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimpersonchangeid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimpersonchanges = pimpersonchangesData;
-        let pimtitlesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles'),'undefined')){
-            pimtitlesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles') as any);
-            if(pimtitlesData && pimtitlesData.length && pimtitlesData.length > 0){
-                pimtitlesData.forEach((item:any) => {
+        let attendancemreportmxesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_attendancemreportmxes'),'undefined')){
+            attendancemreportmxesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_attendancemreportmxes') as any);
+            if(attendancemreportmxesData && attendancemreportmxesData.length && attendancemreportmxesData.length > 0){
+                attendancemreportmxesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimtitleid = null;
+                            item.attendancemreportmxid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimtitles = pimtitlesData;
-        let pimpersonabilitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities'),'undefined')){
-            pimpersonabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities') as any);
-            if(pimpersonabilitiesData && pimpersonabilitiesData.length && pimpersonabilitiesData.length > 0){
-                pimpersonabilitiesData.forEach((item:any) => {
+        masterData.attendancemreportmxes = attendancemreportmxesData;
+        let pimdistirbutionsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions'),'undefined')){
+            pimdistirbutionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions') as any);
+            if(pimdistirbutionsData && pimdistirbutionsData.length && pimdistirbutionsData.length > 0){
+                pimdistirbutionsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimpersonabilityid = null;
+                            item.pimdistirbutionid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimpersonabilities = pimpersonabilitiesData;
-        let pimexitandentriesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries'),'undefined')){
-            pimexitandentriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries') as any);
-            if(pimexitandentriesData && pimexitandentriesData.length && pimexitandentriesData.length > 0){
-                pimexitandentriesData.forEach((item:any) => {
+        masterData.pimdistirbutions = pimdistirbutionsData;
+        let pimtitlesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles'),'undefined')){
+            pimtitlesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles') as any);
+            if(pimtitlesData && pimtitlesData.length && pimtitlesData.length > 0){
+                pimtitlesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimexitandentryid = null;
+                            item.pimtitleid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimexitandentries = pimexitandentriesData;
+        masterData.pimtitles = pimtitlesData;
         let pimfaminfosData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos'),'undefined')){
             pimfaminfosData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos') as any);
@@ -969,36 +924,21 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimfaminfos = pimfaminfosData;
-        let pimdistirbutionsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions'),'undefined')){
-            pimdistirbutionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions') as any);
-            if(pimdistirbutionsData && pimdistirbutionsData.length && pimdistirbutionsData.length > 0){
-                pimdistirbutionsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimdistirbutionid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimdistirbutions = pimdistirbutionsData;
-        let pimarmycadresData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres'),'undefined')){
-            pimarmycadresData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres') as any);
-            if(pimarmycadresData && pimarmycadresData.length && pimarmycadresData.length > 0){
-                pimarmycadresData.forEach((item:any) => {
+        let pimresearchfindingsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings'),'undefined')){
+            pimresearchfindingsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings') as any);
+            if(pimresearchfindingsData && pimresearchfindingsData.length && pimresearchfindingsData.length > 0){
+                pimresearchfindingsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimarmycadresid = null;
+                            item.pimresearchfindingsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimarmycadres = pimarmycadresData;
+        masterData.pimresearchfindings = pimresearchfindingsData;
         let pimworkhistoriesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories'),'undefined')){
             pimworkhistoriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories') as any);
@@ -1014,36 +954,21 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimworkhistories = pimworkhistoriesData;
-        let pimpatentsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents'),'undefined')){
-            pimpatentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents') as any);
-            if(pimpatentsData && pimpatentsData.length && pimpatentsData.length > 0){
-                pimpatentsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.pimpatentid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.pimpatents = pimpatentsData;
-        let pimvacationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations'),'undefined')){
-            pimvacationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations') as any);
-            if(pimvacationsData && pimvacationsData.length && pimvacationsData.length > 0){
-                pimvacationsData.forEach((item:any) => {
+        let pimvocationalsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals'),'undefined')){
+            pimvocationalsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals') as any);
+            if(pimvocationalsData && pimvocationalsData.length && pimvocationalsData.length > 0){
+                pimvocationalsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimvacationid = null;
+                            item.pimvocationalid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimvacations = pimvacationsData;
+        masterData.pimvocationals = pimvocationalsData;
         let pimarchivesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives'),'undefined')){
             pimarchivesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives') as any);
@@ -1104,21 +1029,36 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimpapers = pimpapersData;
-        let pimresearchfindingsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings'),'undefined')){
-            pimresearchfindingsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings') as any);
-            if(pimresearchfindingsData && pimresearchfindingsData.length && pimresearchfindingsData.length > 0){
-                pimresearchfindingsData.forEach((item:any) => {
+        let pimpersonchangesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges'),'undefined')){
+            pimpersonchangesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges') as any);
+            if(pimpersonchangesData && pimpersonchangesData.length && pimpersonchangesData.length > 0){
+                pimpersonchangesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimresearchfindingsid = null;
+                            item.pimpersonchangeid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimresearchfindings = pimresearchfindingsData;
+        masterData.pimpersonchanges = pimpersonchangesData;
+        let pimexitandentriesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries'),'undefined')){
+            pimexitandentriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries') as any);
+            if(pimexitandentriesData && pimexitandentriesData.length && pimexitandentriesData.length > 0){
+                pimexitandentriesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimexitandentryid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimexitandentries = pimexitandentriesData;
         let pimrewardpunishmentsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments'),'undefined')){
             pimrewardpunishmentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments') as any);
@@ -1134,36 +1074,36 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimrewardpunishments = pimrewardpunishmentsData;
-        let pimvocationalsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals'),'undefined')){
-            pimvocationalsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals') as any);
-            if(pimvocationalsData && pimvocationalsData.length && pimvocationalsData.length > 0){
-                pimvocationalsData.forEach((item:any) => {
+        let pimarmycadresData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres'),'undefined')){
+            pimarmycadresData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres') as any);
+            if(pimarmycadresData && pimarmycadresData.length && pimarmycadresData.length > 0){
+                pimarmycadresData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimvocationalid = null;
+                            item.pimarmycadresid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimvocationals = pimvocationalsData;
-        let pimlanguageabilitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities'),'undefined')){
-            pimlanguageabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities') as any);
-            if(pimlanguageabilitiesData && pimlanguageabilitiesData.length && pimlanguageabilitiesData.length > 0){
-                pimlanguageabilitiesData.forEach((item:any) => {
+        masterData.pimarmycadres = pimarmycadresData;
+        let pimpatentsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents'),'undefined')){
+            pimpatentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents') as any);
+            if(pimpatentsData && pimpatentsData.length && pimpatentsData.length > 0){
+                pimpatentsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.pimlanguageabilityid = null;
+                            item.pimpatentid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.pimlanguageabilities = pimlanguageabilitiesData;
+        masterData.pimpatents = pimpatentsData;
         let pimcontractsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts'),'undefined')){
             pimcontractsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts') as any);
@@ -1179,29 +1119,89 @@ export default class PIMPERSONServiceBase extends EntityService {
             }
         }
         masterData.pimcontracts = pimcontractsData;
+        let pimeducationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations'),'undefined')){
+            pimeducationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations') as any);
+            if(pimeducationsData && pimeducationsData.length && pimeducationsData.length > 0){
+                pimeducationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimeducationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimeducations = pimeducationsData;
+        let pimvacationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations'),'undefined')){
+            pimvacationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations') as any);
+            if(pimvacationsData && pimvacationsData.length && pimvacationsData.length > 0){
+                pimvacationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimvacationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimvacations = pimvacationsData;
+        let pimlanguageabilitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities'),'undefined')){
+            pimlanguageabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities') as any);
+            if(pimlanguageabilitiesData && pimlanguageabilitiesData.length && pimlanguageabilitiesData.length > 0){
+                pimlanguageabilitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimlanguageabilityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimlanguageabilities = pimlanguageabilitiesData;
+        let pimpersonabilitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities'),'undefined')){
+            pimpersonabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities') as any);
+            if(pimpersonabilitiesData && pimpersonabilitiesData.length && pimpersonabilitiesData.length > 0){
+                pimpersonabilitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.pimpersonabilityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.pimpersonabilities = pimpersonabilitiesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/pimpeople/${context.pimperson}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
             this.tempStorage.setItem(context.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
             this.tempStorage.setItem(context.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
             this.tempStorage.setItem(context.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
             this.tempStorage.setItem(context.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives));
             this.tempStorage.setItem(context.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople));
             this.tempStorage.setItem(context.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements));
             this.tempStorage.setItem(context.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
             this.tempStorage.setItem(context.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
             this.tempStorage.setItem(context.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
             return res;
     }
 
@@ -1286,26 +1286,26 @@ export default class PIMPERSONServiceBase extends EntityService {
         let res:any = await  Http.getInstance().get(`/pimpeople/getdraft`,isloading);
         res.data.pimperson = data.pimperson;
             this.tempStorage.setItem(context.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
             this.tempStorage.setItem(context.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
             this.tempStorage.setItem(context.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
             this.tempStorage.setItem(context.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
             this.tempStorage.setItem(context.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives));
             this.tempStorage.setItem(context.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople));
             this.tempStorage.setItem(context.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements));
             this.tempStorage.setItem(context.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
             this.tempStorage.setItem(context.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
-            this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
             this.tempStorage.setItem(context.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
+            this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
         return res;
     }
 

app_EHRPim/src/user-register.ts

 import { UserDefaultComponent } from './user-default-register';
-import AppOrgPNum from './components/app-org-p-num/app-org-p-num.vue'
-import AppOrgVocNumList from './components/app-org-voc-num-list/app-org-voc-num-list.vue'
 
 export const UserComponent = {
     install(v: any, opt: any) {
         UserDefaultComponent.install(v, opt);
-        v.component('app-org-p-num', AppOrgPNum);
-        v.component('app-org-voc-num-list', AppOrgVocNumList);
-        
     }
 };
\ No newline at end of file

app_EHRPim/src/widgets/app/pim-portal-view-db-dashboard/pim-portal-view-db-dashboard-base.vue

@@ -6,72 +6,72 @@
     <row v-if="!isHasCustomized">
           <div style = ''>
       <i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }">
-        <card class="portlet-card" :bordered="false" dis-hover :padding="0">
+        <card :bordered="false" dis-hover :padding="0">
           <span>
-          <view_db_sysportlet1 
-              :viewState="viewState"  
-              :viewparams="viewparams" 
-              :context="context" 
-              name="db_sysportlet1"  
-              ref='db_sysportlet1' 
-              @closeview="closeView($event)">
-          </view_db_sysportlet1>
+          <view_db_sysportlet1 
+              :viewState="viewState"  
+              :viewparams="viewparams" 
+              :context="context" 
+              name="db_sysportlet1"  
+              ref='db_sysportlet1' 
+              @closeview="closeView($event)">
+          </view_db_sysportlet1>
           </span>
         </card>
       </i-col>
       <i-col :xs="{ span: 16, offset: 0}" :sm="{ span: 16, offset: 0}" :md="{ span: 16, offset: 0 }" :lg="{ span: 16, offset: 0 }">
-        <card class="portlet-card" :bordered="false" dis-hover :padding="0">
+        <card :bordered="false" dis-hover :padding="0">
           <span>
-          <view_db_sysportlet2 
-              :viewState="viewState"  
-              :viewparams="viewparams" 
-              :context="context" 
-              name="db_sysportlet2"  
-              ref='db_sysportlet2' 
-              @closeview="closeView($event)">
-          </view_db_sysportlet2>
+          <view_db_sysportlet2 
+              :viewState="viewState"  
+              :viewparams="viewparams" 
+              :context="context" 
+              name="db_sysportlet2"  
+              ref='db_sysportlet2' 
+              @closeview="closeView($event)">
+          </view_db_sysportlet2>
           </span>
         </card>
       </i-col>
       <i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }">
-        <card class="portlet-card" :bordered="false" dis-hover :padding="0">
+        <card :bordered="false" dis-hover :padding="0">
           <span>
-          <view_db_sysportlet4 
-              :viewState="viewState"  
-              :viewparams="viewparams" 
-              :context="context" 
-              name="db_sysportlet4"  
-              ref='db_sysportlet4' 
-              @closeview="closeView($event)">
-          </view_db_sysportlet4>
+          <view_db_sysportlet4 
+              :viewState="viewState"  
+              :viewparams="viewparams" 
+              :context="context" 
+              name="db_sysportlet4"  
+              ref='db_sysportlet4' 
+              @closeview="closeView($event)">
+          </view_db_sysportlet4>
           </span>
         </card>
       </i-col>
       <i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }">
-        <card class="portlet-card" :bordered="false" dis-hover :padding="0">
+        <card :bordered="false" dis-hover :padding="0">
           <span>
-          <view_db_sysportlet3 
-              :viewState="viewState"  
-              :viewparams="viewparams" 
-              :context="context" 
-              name="db_sysportlet3"  
-              ref='db_sysportlet3' 
-              @closeview="closeView($event)">
-          </view_db_sysportlet3>
+          <view_db_sysportlet3 
+              :viewState="viewState"  
+              :viewparams="viewparams" 
+              :context="context" 
+              name="db_sysportlet3"  
+              ref='db_sysportlet3' 
+              @closeview="closeView($event)">
+          </view_db_sysportlet3>
           </span>
         </card>
       </i-col>
       <i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }">
-        <card class="portlet-card" :bordered="false" dis-hover :padding="0">
+        <card :bordered="false" dis-hover :padding="0">
           <span>
-          <view_db_sysportlet5 
-              :viewState="viewState"  
-              :viewparams="viewparams" 
-              :context="context" 
-              name="db_sysportlet5"  
-              ref='db_sysportlet5' 
-              @closeview="closeView($event)">
-          </view_db_sysportlet5>
+          <view_db_sysportlet5 
+              :viewState="viewState"  
+              :viewparams="viewparams" 
+              :context="context" 
+              name="db_sysportlet5"  
+              ref='db_sysportlet5' 
+              @closeview="closeView($event)">
+          </view_db_sysportlet5>
           </span>
         </card>
       </i-col>

app_EHRPim/src/widgets/pimvocational/org-voc-num-list-list/org-voc-num-list-list.less

@@ -3,10 +3,6 @@
 .app-list {
     flex-grow: 1;
     overflow-y: auto;
-    height: 100%;
-    >div{
-      height: 100%;
-    }
     .app-list-item {
         line-height: 34px;
     }

config.xml

@@ -38,6 +38,11 @@
 	  git clone -b master $para2 ehr/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ehr/
+      mvn clean package -Pehrpim
+      cd ehr-app/ehr-app-ehrpim
+      mvn -Pehrpim docker:build
+      mvn -Pehrpim docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ehr-app-ehrpim.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ehr-app/ehr-app-ehr/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehr.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehr.jar /ehr-app-ehr.jar

ehr-app/ehr-app-ehr/src/main/docker/ehr-app-ehr.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehr:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehr:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehr/src/main/resources/application-ehr-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehr/src/main/resources/application-ehr-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrapp/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrapp.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrapp.jar /ehr-app-ehrapp.jar

ehr-app/ehr-app-ehrapp/src/main/docker/ehr-app-ehrapp.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrapp:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrapp:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrapp/src/main/resources/application-ehrapp-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrapp/src/main/resources/application-ehrapp-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrhelp/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrhelp.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrhelp.jar /ehr-app-ehrhelp.jar

ehr-app/ehr-app-ehrhelp/src/main/docker/ehr-app-ehrhelp.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrhelp:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrhelp:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrhelp/src/main/resources/application-ehrhelp-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrhelp/src/main/resources/application-ehrhelp-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrmob/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrmob.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrmob.jar /ehr-app-ehrmob.jar

ehr-app/ehr-app-ehrmob/src/main/docker/ehr-app-ehrmob.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrmob:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrmob:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrmob/src/main/resources/application-ehrmob-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrmob/src/main/resources/application-ehrmob-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrorm/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrorm.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrorm.jar /ehr-app-ehrorm.jar

ehr-app/ehr-app-ehrorm/src/main/docker/ehr-app-ehrorm.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrorm:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrorm:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrorm/src/main/resources/application-ehrorm-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrorm/src/main/resources/application-ehrorm-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrpcm/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrpcm.jar /ehr-app-ehrpcm.jar

ehr-app/ehr-app-ehrpcm/src/main/docker/ehr-app-ehrpcm.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrpcm:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrpcm/src/main/resources/application-ehrpcm-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrpcm/src/main/resources/application-ehrpcm-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrpcm2/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm2.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrpcm2.jar /ehr-app-ehrpcm2.jar

ehr-app/ehr-app-ehrpcm2/src/main/docker/ehr-app-ehrpcm2.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrpcm2:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm2:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrpcm2/src/main/resources/application-ehrpcm2-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrpcm2/src/main/resources/application-ehrpcm2-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrpim/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpim.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrpim.jar /ehr-app-ehrpim.jar

ehr-app/ehr-app-ehrpim/src/main/docker/ehr-app-ehrpim.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrpim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpim:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrpim/src/main/resources/application-ehrpim-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrpim/src/main/resources/application-ehrpim-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrweb/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrweb.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrweb.jar /ehr-app-ehrweb.jar

ehr-app/ehr-app-ehrweb/src/main/docker/ehr-app-ehrweb.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrweb:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrweb:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrweb/src/main/resources/application-ehrweb-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrweb/src/main/resources/application-ehrweb-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-web.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-web.jar /ehr-app-web.jar

ehr-app/ehr-app-web/src/main/docker/ehr-app-web.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-web:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-util/src/main/java/cn/ibizlab/ehr/util/job/PermissionSyncJob.java

@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
     @Value("${ibiz.enablePermissionValid:false}")
     boolean enablePermissionValid;  //是否开启权限校验
 
-    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
+    @Value("${ibiz.systemid:1A92486F-D8D6-42F7-BD14-426751088CC5}")
     private String systemId;
 
     @Override

ehr-util/src/main/resources/application-sys.yml

@@ -3,7 +3,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 172.16.102.211:8848
+        server-addr: 172.16.240.110:8848
   cache:
     redis:
       time-to-live: 3600
@@ -20,6 +20,32 @@ spring:
         max-wait: 300ms
         max-idle: 16
         min-idle: 8
+  datasource:
+    username: BPMEHR
+    password: 'sys'
+    url: jdbc:oracle:thin:@172.16.170.71:1521:localorcl
+    driver-class-name: oracle.jdbc.driver.OracleDriver
+    filters: stat,wall,log4j2
+    #配置初始化大小/最小/最大
+    initial-size: 1
+    min-idle: 1
+    max-active: 20
+    #获取连接等待超时时间
+    max-wait: 60000
+    #间隔多久进行一次检测，检测需要关闭的空闲连接
+    time-between-eviction-runs-millis: 60000
+    #一个连接在池中最小生存的时间
+    min-evictable-idle-time-millis: 300000
+    validation-query: SELECT 1 FROM DUAL
+    test-while-idle: true
+    test-on-borrow: false
+    test-on-return: false
+    #打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
+    pool-prepared-statements: false
+    max-pool-prepared-statement-per-connection-size: 20
+    isSyncDBSchema: false
+    defaultSchema: BPMEHR
+    conf: classpath:liquibase/master.xml
 
 #Mybatis-plus配置
 mybatis-plus: