zhouli 部署微服务接口

a9de1fc3 · ibizdev · 6f133e35 · a9de1fc3 · a9de1fc3 · a9de1fc3
--- a/config.xml
+++ b/config.xml
@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ehr_practice05/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd ehr_practice05/
-      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 iBizPractice --with-registry-auth
+      mvn clean package -Pwebapi
+      cd ehr-provider/ehr-provider-webapi
+      mvn -Pwebapi docker:build
+      mvn -Pwebapi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ehr-provider-webapi.yaml iBizPractice --with-registry-auth      
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/ehr-app/ehr-app-ehr/src/main/docker/Dockerfile
+++ b/ehr-app/ehr-app-ehr/src/main/docker/Dockerfile
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehr.jar

-EXPOSE 30005
+EXPOSE 8080

 ADD ehr-app-ehr.jar /ehr-app-ehr.jar
--- a/ehr-app/ehr-app-ehr/src/main/docker/ehr-app-ehr.yaml
+++ b/ehr-app/ehr-app-ehr/src/main/docker/ehr-app-ehr.yaml
@@ -3,23 +3,9 @@ services:
  ehr-app-ehr:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehr:latest
    ports:
-      - "30005:30005"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
-      - SERVER_PORT=30005
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:28848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_fb710d59e
-      - SPRING_DATASOURCE_PASSWORD=bD@@681@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_fb710d59e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_fb710d59e
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:28848
    deploy:
      resources:
           limits:

--- a/ehr-app/ehr-app-ehratt/src/main/docker/Dockerfile
+++ b/ehr-app/ehr-app-ehratt/src/main/docker/Dockerfile
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehratt.jar

-EXPOSE 30005
+EXPOSE 8080

 ADD ehr-app-ehratt.jar /ehr-app-ehratt.jar
--- a/ehr-app/ehr-app-ehratt/src/main/docker/ehr-app-ehratt.yaml
+++ b/ehr-app/ehr-app-ehratt/src/main/docker/ehr-app-ehratt.yaml
@@ -3,23 +3,9 @@ services:
  ehr-app-ehratt:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehratt:latest
    ports:
-      - "30005:30005"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
-      - SERVER_PORT=30005
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:28848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_fb710d59e
-      - SPRING_DATASOURCE_PASSWORD=bD@@681@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_fb710d59e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_fb710d59e
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:28848
    deploy:
      resources:
           limits:

--- a/ehr-app/ehr-app-ehrhelp/src/main/docker/Dockerfile
+++ b/ehr-app/ehr-app-ehrhelp/src/main/docker/Dockerfile
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrhelp.jar

-EXPOSE 30005
+EXPOSE 8080

 ADD ehr-app-ehrhelp.jar /ehr-app-ehrhelp.jar
--- a/ehr-app/ehr-app-ehrhelp/src/main/docker/ehr-app-ehrhelp.yaml
+++ b/ehr-app/ehr-app-ehrhelp/src/main/docker/ehr-app-ehrhelp.yaml
@@ -3,23 +3,9 @@ services:
  ehr-app-ehrhelp:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrhelp:latest
    ports:
-      - "30005:30005"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
-      - SERVER_PORT=30005
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:28848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_fb710d59e
-      - SPRING_DATASOURCE_PASSWORD=bD@@681@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_fb710d59e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_fb710d59e
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:28848
    deploy:
      resources:
           limits:

--- a/ehr-app/ehr-app-ehrmob/src/main/docker/Dockerfile
+++ b/ehr-app/ehr-app-ehrmob/src/main/docker/Dockerfile
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrmob.jar

-EXPOSE 30005
+EXPOSE 8080

 ADD ehr-app-ehrmob.jar /ehr-app-ehrmob.jar
--- a/ehr-app/ehr-app-ehrmob/src/main/docker/ehr-app-ehrmob.yaml
+++ b/ehr-app/ehr-app-ehrmob/src/main/docker/ehr-app-ehrmob.yaml
@@ -3,23 +3,9 @@ services:
  ehr-app-ehrmob:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrmob:latest
    ports:
-      - "30005:30005"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
-      - SERVER_PORT=30005
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:28848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_fb710d59e
-      - SPRING_DATASOURCE_PASSWORD=bD@@681@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_fb710d59e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_fb710d59e
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:28848
    deploy:
      resources:
           limits:

--- a/ehr-app/ehr-app-ehrorm/src/main/docker/Dockerfile
+++ b/ehr-app/ehr-app-ehrorm/src/main/docker/Dockerfile
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrorm.jar

-EXPOSE 30005
+EXPOSE 8080

 ADD ehr-app-ehrorm.jar /ehr-app-ehrorm.jar
--- a/ehr-app/ehr-app-ehrorm/src/main/docker/ehr-app-ehrorm.yaml
+++ b/ehr-app/ehr-app-ehrorm/src/main/docker/ehr-app-ehrorm.yaml
@@ -3,23 +3,9 @@ services:
  ehr-app-ehrorm:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrorm:latest
    ports:
-      - "30005:30005"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
-      - SERVER_PORT=30005
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:28848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_fb710d59e
-      - SPRING_DATASOURCE_PASSWORD=bD@@681@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_fb710d59e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_fb710d59e
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:28848
    deploy:
      resources:
           limits:

--- a/ehr-app/ehr-app-ehrpar/src/main/docker/Dockerfile
+++ b/ehr-app/ehr-app-ehrpar/src/main/docker/Dockerfile
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpar.jar

-EXPOSE 30005
+EXPOSE 8080

 ADD ehr-app-ehrpar.jar /ehr-app-ehrpar.jar
--- a/ehr-app/ehr-app-ehrpar/src/main/docker/ehr-app-ehrpar.yaml
+++ b/ehr-app/ehr-app-ehrpar/src/main/docker/ehr-app-ehrpar.yaml
@@ -3,23 +3,9 @@ services:
  ehr-app-ehrpar:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpar:latest
    ports:
-      - "30005:30005"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
-      - SERVER_PORT=30005
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:28848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_fb710d59e
-      - SPRING_DATASOURCE_PASSWORD=bD@@681@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_fb710d59e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_fb710d59e
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:28848
    deploy:
      resources:
           limits:

--- a/ehr-app/ehr-app-ehrpcm/src/main/docker/Dockerfile
+++ b/ehr-app/ehr-app-ehrpcm/src/main/docker/Dockerfile
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm.jar

-EXPOSE 30005
+EXPOSE 8080

 ADD ehr-app-ehrpcm.jar /ehr-app-ehrpcm.jar
--- a/ehr-app/ehr-app-ehrpcm/src/main/docker/ehr-app-ehrpcm.yaml
+++ b/ehr-app/ehr-app-ehrpcm/src/main/docker/ehr-app-ehrpcm.yaml
@@ -3,23 +3,9 @@ services:
  ehr-app-ehrpcm:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm:latest
    ports:
-      - "30005:30005"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
-      - SERVER_PORT=30005
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:28848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_fb710d59e
-      - SPRING_DATASOURCE_PASSWORD=bD@@681@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_fb710d59e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_fb710d59e
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:28848
    deploy:
      resources:
           limits:

--- a/ehr-app/ehr-app-ehrpcm2/src/main/docker/Dockerfile
+++ b/ehr-app/ehr-app-ehrpcm2/src/main/docker/Dockerfile
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm2.jar

-EXPOSE 30005
+EXPOSE 8080

 ADD ehr-app-ehrpcm2.jar /ehr-app-ehrpcm2.jar
--- a/ehr-app/ehr-app-ehrpcm2/src/main/docker/ehr-app-ehrpcm2.yaml
+++ b/ehr-app/ehr-app-ehrpcm2/src/main/docker/ehr-app-ehrpcm2.yaml
@@ -3,23 +3,9 @@ services:
  ehr-app-ehrpcm2:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm2:latest
    ports:
-      - "30005:30005"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
-      - SERVER_PORT=30005
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:28848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_fb710d59e
-      - SPRING_DATASOURCE_PASSWORD=bD@@681@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_fb710d59e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_fb710d59e
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:28848
    deploy:
      resources:
           limits:

--- a/ehr-app/ehr-app-ehrpim/src/main/docker/Dockerfile
+++ b/ehr-app/ehr-app-ehrpim/src/main/docker/Dockerfile
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpim.jar

-EXPOSE 30005
+EXPOSE 8080

 ADD ehr-app-ehrpim.jar /ehr-app-ehrpim.jar
--- a/ehr-app/ehr-app-ehrpim/src/main/docker/ehr-app-ehrpim.yaml
+++ b/ehr-app/ehr-app-ehrpim/src/main/docker/ehr-app-ehrpim.yaml
@@ -3,23 +3,9 @@ services:
  ehr-app-ehrpim:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpim:latest
    ports:
-      - "30005:30005"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
-      - SERVER_PORT=30005
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:28848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_fb710d59e
-      - SPRING_DATASOURCE_PASSWORD=bD@@681@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_fb710d59e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_fb710d59e
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:28848
    deploy:
      resources:
           limits:

--- a/ehr-app/ehr-app-ehrsal/src/main/docker/Dockerfile
+++ b/ehr-app/ehr-app-ehrsal/src/main/docker/Dockerfile
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrsal.jar

-EXPOSE 30005
+EXPOSE 8080

 ADD ehr-app-ehrsal.jar /ehr-app-ehrsal.jar
--- a/ehr-app/ehr-app-ehrsal/src/main/docker/ehr-app-ehrsal.yaml
+++ b/ehr-app/ehr-app-ehrsal/src/main/docker/ehr-app-ehrsal.yaml
@@ -3,23 +3,9 @@ services:
  ehr-app-ehrsal:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrsal:latest
    ports:
-      - "30005:30005"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
-      - SERVER_PORT=30005
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:28848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_fb710d59e
-      - SPRING_DATASOURCE_PASSWORD=bD@@681@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_fb710d59e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_fb710d59e
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:28848
    deploy:
      resources:
           limits:

--- a/ehr-app/ehr-app-ehrsoc/src/main/docker/Dockerfile
+++ b/ehr-app/ehr-app-ehrsoc/src/main/docker/Dockerfile
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrsoc.jar

-EXPOSE 30005
+EXPOSE 8080

 ADD ehr-app-ehrsoc.jar /ehr-app-ehrsoc.jar
--- a/ehr-app/ehr-app-ehrsoc/src/main/docker/ehr-app-ehrsoc.yaml
+++ b/ehr-app/ehr-app-ehrsoc/src/main/docker/ehr-app-ehrsoc.yaml
@@ -3,23 +3,9 @@ services:
  ehr-app-ehrsoc:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrsoc:latest
    ports:
-      - "30005:30005"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
-      - SERVER_PORT=30005
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:28848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_fb710d59e
-      - SPRING_DATASOURCE_PASSWORD=bD@@681@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_fb710d59e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_fb710d59e
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:28848
    deploy:
      resources:
           limits:

--- a/ehr-app/ehr-app-ehrtrm/src/main/docker/Dockerfile
+++ b/ehr-app/ehr-app-ehrtrm/src/main/docker/Dockerfile
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrtrm.jar

-EXPOSE 30005
+EXPOSE 8080

 ADD ehr-app-ehrtrm.jar /ehr-app-ehrtrm.jar
--- a/ehr-app/ehr-app-ehrtrm/src/main/docker/ehr-app-ehrtrm.yaml
+++ b/ehr-app/ehr-app-ehrtrm/src/main/docker/ehr-app-ehrtrm.yaml
@@ -3,23 +3,9 @@ services:
  ehr-app-ehrtrm:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrtrm:latest
    ports:
-      - "30005:30005"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
-      - SERVER_PORT=30005
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:28848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_fb710d59e
-      - SPRING_DATASOURCE_PASSWORD=bD@@681@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_fb710d59e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_fb710d59e
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:28848
    deploy:
      resources:
           limits:

--- a/ehr-core/src/main/resources/mapper/att/attendancedate/AttEndanceDateMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attendancedate/AttEndanceDateMapper.xml
@@ -27,14 +27,14 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEDATEID`, t1.`ATTENDANCEDATENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY`, t1.`ENABLE`, t1.`MONTH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YEAR` FROM `T_ATTENDANCEDATE` t1  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDANCEDATEID`, t1.`ATTENDANCEDATENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY`, t1.`ENABLE`, t1.`MONTH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YEAR` FROM `T_ATTENDANCEDATE` t1  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEDATEID`, t1.`ATTENDANCEDATENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY`, t1.`ENABLE`, t1.`MONTH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YEAR` FROM `T_ATTENDANCEDATE` t1  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDANCEDATEID`, t1.`ATTENDANCEDATENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY`, t1.`ENABLE`, t1.`MONTH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YEAR` FROM `T_ATTENDANCEDATE` t1  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/att/attendancemreport/AttEndanceMreportMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attendancemreport/AttEndanceMreportMapper.xml
@@ -83,47 +83,47 @@

    <!--数据查询[CurORMORGKQYB]-->
    <sql id="CurORMORGKQYB" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
-				 WHERE 	t1.ENABLE = 1
-					 AND ( ( t1.`ORMORGID` =  #{srf.webcontext.nodeid}  OR  EXISTS (select orgid from T_SRFORG where ORGCODE='BG' and orgid=  #{srf.webcontext.nodeid})  OR  t1.ORMORGID IN (select orgid from T_SRFORG where  COMPANYFLAG= #{srf.webcontext.nodeid})  OR  t1.ORMORGID IN (select orgid from T_SRFORG where  porgid= #{srf.webcontext.nodeid}) ) )
+		<![CDATA[ SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
+					 WHERE 	t1.ENABLE = 1
+						 AND ( ( t1.`ORMORGID` =  #{srf.webcontext.nodeid}  OR  EXISTS (select orgid from T_SRFORG where ORGCODE='BG' and orgid=  #{srf.webcontext.nodeid})  OR  t1.ORMORGID IN (select orgid from T_SRFORG where  COMPANYFLAG= #{srf.webcontext.nodeid})  OR  t1.ORMORGID IN (select orgid from T_SRFORG where  porgid= #{srf.webcontext.nodeid}) ) )
 			]]>
    </sql>
    <!--数据查询[CurORMORGSECTORKQYB]-->
    <sql id="CurORMORGSECTORKQYB" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[KQYBDY]-->
    <sql id="KQYBDY" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[KQYCZKQYB]-->
    <sql id="KQYCZKQYB" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
-				 WHERE 	t1.ENABLE = 1
-					 AND ( t21.`PIMPERSONID` =  #{srf.sessioncontext.srfpersonid} )
+		<![CDATA[ SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
+					 WHERE 	t1.ENABLE = 1
+						 AND ( t21.`PIMPERSONID` =  #{srf.sessioncontext.srfpersonid} )
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[WQRDYB]-->
    <sql id="WQRDYB" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
-				 WHERE 	t1.ENABLE = 1
-					 AND ( t1.`ZT` <> '20' )
+		<![CDATA[ SELECT t1.`ATTENDANCEMREPORTID`, t1.`ATTENDANCEMREPORTNAME`, t1.`ATTENDENCESETUPID`, t21.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`ND`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ZZDZS` AS `ORMORGNAME`, t21.`PIMPERSONID`, t31.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t1.`ZT` FROM `T_ATTENDANCEMREPORT` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_ATTENDENCESETUP t21 ON t1.ATTENDENCESETUPID = t21.ATTENDENCESETUPID  LEFT JOIN T_PIMPERSON t31 ON t21.PIMPERSONID = t31.PIMPERSONID  
+					 WHERE 	t1.ENABLE = 1
+						 AND ( t1.`ZT` <> '20' )
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/att/attendancemreportmx/AttEndanceMreportmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attendancemreportmx/AttEndanceMreportmxMapper.xml
@@ -66,24 +66,24 @@

    <!--数据查询[CurPerson]-->
    <sql id="CurPerson" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEMREPORTID2`, t1.`ATTENDANCEMREPORTMXID`, t1.`ATTENDANCEMREPORTMXNAME`, t1.`ATTENDENCESETUPID`, t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY1`, t1.`DAY10`, t1.`DAY11`, t1.`DAY12`, t1.`DAY13`, t1.`DAY14`, t1.`DAY15`, t1.`DAY16`, t1.`DAY17`, t1.`DAY18`, t1.`DAY19`, t1.`DAY2`, t1.`DAY20`, t1.`DAY21`, t1.`DAY22`, t1.`DAY23`, t1.`DAY24`, t1.`DAY25`, t1.`DAY26`, t1.`DAY27`, t1.`DAY28`, t1.`DAY29`, t1.`DAY3`, t1.`DAY30`, t1.`DAY31`, t1.`DAY4`, t1.`DAY5`, t1.`DAY6`, t1.`DAY7`, t1.`DAY8`, t1.`DAY9`, t11.`GW`, t1.`KQHZ`, t1.`ND`, t1.`ORMROGID`, t1.`ORMROGNAME`, t1.`ORMROGSECTORID`, t1.`ORMROGSECTORNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t11.`YGBH` FROM `T_ATTENDANCEMREPORTMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
-				 WHERE 	( t1.`PIMPERSONID` =  #{srf.webcontext.pimpersonid} )
+		<![CDATA[ SELECT t1.`ATTENDANCEMREPORTID2`, t1.`ATTENDANCEMREPORTMXID`, t1.`ATTENDANCEMREPORTMXNAME`, t1.`ATTENDENCESETUPID`, t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY1`, t1.`DAY10`, t1.`DAY11`, t1.`DAY12`, t1.`DAY13`, t1.`DAY14`, t1.`DAY15`, t1.`DAY16`, t1.`DAY17`, t1.`DAY18`, t1.`DAY19`, t1.`DAY2`, t1.`DAY20`, t1.`DAY21`, t1.`DAY22`, t1.`DAY23`, t1.`DAY24`, t1.`DAY25`, t1.`DAY26`, t1.`DAY27`, t1.`DAY28`, t1.`DAY29`, t1.`DAY3`, t1.`DAY30`, t1.`DAY31`, t1.`DAY4`, t1.`DAY5`, t1.`DAY6`, t1.`DAY7`, t1.`DAY8`, t1.`DAY9`, t11.`GW`, t1.`KQHZ`, t1.`ND`, t1.`ORMROGID`, t1.`ORMROGNAME`, t1.`ORMROGSECTORID`, t1.`ORMROGSECTORNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t11.`YGBH` FROM `T_ATTENDANCEMREPORTMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
+					 WHERE 	( t1.`PIMPERSONID` =  #{srf.webcontext.pimpersonid} )
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEMREPORTID2`, t1.`ATTENDANCEMREPORTMXID`, t1.`ATTENDANCEMREPORTMXNAME`, t1.`ATTENDENCESETUPID`, t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY1`, t1.`DAY10`, t1.`DAY11`, t1.`DAY12`, t1.`DAY13`, t1.`DAY14`, t1.`DAY15`, t1.`DAY16`, t1.`DAY17`, t1.`DAY18`, t1.`DAY19`, t1.`DAY2`, t1.`DAY20`, t1.`DAY21`, t1.`DAY22`, t1.`DAY23`, t1.`DAY24`, t1.`DAY25`, t1.`DAY26`, t1.`DAY27`, t1.`DAY28`, t1.`DAY29`, t1.`DAY3`, t1.`DAY30`, t1.`DAY31`, t1.`DAY4`, t1.`DAY5`, t1.`DAY6`, t1.`DAY7`, t1.`DAY8`, t1.`DAY9`, t11.`GW`, t1.`KQHZ`, t1.`ND`, t1.`ORMROGID`, t1.`ORMROGNAME`, t1.`ORMROGSECTORID`, t1.`ORMROGSECTORNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t11.`YGBH` FROM `T_ATTENDANCEMREPORTMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
+		<![CDATA[ SELECT t1.`ATTENDANCEMREPORTID2`, t1.`ATTENDANCEMREPORTMXID`, t1.`ATTENDANCEMREPORTMXNAME`, t1.`ATTENDENCESETUPID`, t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY1`, t1.`DAY10`, t1.`DAY11`, t1.`DAY12`, t1.`DAY13`, t1.`DAY14`, t1.`DAY15`, t1.`DAY16`, t1.`DAY17`, t1.`DAY18`, t1.`DAY19`, t1.`DAY2`, t1.`DAY20`, t1.`DAY21`, t1.`DAY22`, t1.`DAY23`, t1.`DAY24`, t1.`DAY25`, t1.`DAY26`, t1.`DAY27`, t1.`DAY28`, t1.`DAY29`, t1.`DAY3`, t1.`DAY30`, t1.`DAY31`, t1.`DAY4`, t1.`DAY5`, t1.`DAY6`, t1.`DAY7`, t1.`DAY8`, t1.`DAY9`, t11.`GW`, t1.`KQHZ`, t1.`ND`, t1.`ORMROGID`, t1.`ORMROGNAME`, t1.`ORMROGSECTORID`, t1.`ORMROGSECTORNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t11.`YGBH` FROM `T_ATTENDANCEMREPORTMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
 			]]>
    </sql>
    <!--数据查询[KQYBMXDY]-->
    <sql id="KQYBMXDY" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEMREPORTID2`, t1.`ATTENDANCEMREPORTMXID`, t1.`ATTENDANCEMREPORTMXNAME`, t1.`ATTENDENCESETUPID`, t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY1`, t1.`DAY10`, t1.`DAY11`, t1.`DAY12`, t1.`DAY13`, t1.`DAY14`, t1.`DAY15`, t1.`DAY16`, t1.`DAY17`, t1.`DAY18`, t1.`DAY19`, t1.`DAY2`, t1.`DAY20`, t1.`DAY21`, t1.`DAY22`, t1.`DAY23`, t1.`DAY24`, t1.`DAY25`, t1.`DAY26`, t1.`DAY27`, t1.`DAY28`, t1.`DAY29`, t1.`DAY3`, t1.`DAY30`, t1.`DAY31`, t1.`DAY4`, t1.`DAY5`, t1.`DAY6`, t1.`DAY7`, t1.`DAY8`, t1.`DAY9`, t11.`GW`, t1.`KQHZ`, t1.`ND`, t1.`ORMROGID`, t1.`ORMROGNAME`, t1.`ORMROGSECTORID`, t1.`ORMROGSECTORNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t11.`YGBH` FROM `T_ATTENDANCEMREPORTMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
-				 WHERE 	( t1.`ATTENDANCEMREPORTID2` =  #{srf.webcontext.srfkey} )
+		<![CDATA[ SELECT t1.`ATTENDANCEMREPORTID2`, t1.`ATTENDANCEMREPORTMXID`, t1.`ATTENDANCEMREPORTMXNAME`, t1.`ATTENDENCESETUPID`, t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY1`, t1.`DAY10`, t1.`DAY11`, t1.`DAY12`, t1.`DAY13`, t1.`DAY14`, t1.`DAY15`, t1.`DAY16`, t1.`DAY17`, t1.`DAY18`, t1.`DAY19`, t1.`DAY2`, t1.`DAY20`, t1.`DAY21`, t1.`DAY22`, t1.`DAY23`, t1.`DAY24`, t1.`DAY25`, t1.`DAY26`, t1.`DAY27`, t1.`DAY28`, t1.`DAY29`, t1.`DAY3`, t1.`DAY30`, t1.`DAY31`, t1.`DAY4`, t1.`DAY5`, t1.`DAY6`, t1.`DAY7`, t1.`DAY8`, t1.`DAY9`, t11.`GW`, t1.`KQHZ`, t1.`ND`, t1.`ORMROGID`, t1.`ORMROGNAME`, t1.`ORMROGSECTORID`, t1.`ORMROGSECTORNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t11.`YGBH` FROM `T_ATTENDANCEMREPORTMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
+					 WHERE 	( t1.`ATTENDANCEMREPORTID2` =  #{srf.webcontext.srfkey} )
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEMREPORTID2`, t1.`ATTENDANCEMREPORTMXID`, t1.`ATTENDANCEMREPORTMXNAME`, t1.`ATTENDENCESETUPID`, t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY1`, t1.`DAY10`, t1.`DAY11`, t1.`DAY12`, t1.`DAY13`, t1.`DAY14`, t1.`DAY15`, t1.`DAY16`, t1.`DAY17`, t1.`DAY18`, t1.`DAY19`, t1.`DAY2`, t1.`DAY20`, t1.`DAY21`, t1.`DAY22`, t1.`DAY23`, t1.`DAY24`, t1.`DAY25`, t1.`DAY26`, t1.`DAY27`, t1.`DAY28`, t1.`DAY29`, t1.`DAY3`, t1.`DAY30`, t1.`DAY31`, t1.`DAY4`, t1.`DAY5`, t1.`DAY6`, t1.`DAY7`, t1.`DAY8`, t1.`DAY9`, t11.`GW`, t1.`KQHZ`, t1.`ND`, t1.`ORMROGID`, t1.`ORMROGNAME`, t1.`ORMROGSECTORID`, t1.`ORMROGSECTORNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t11.`YGBH` FROM `T_ATTENDANCEMREPORTMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
+		<![CDATA[ SELECT t1.`ATTENDANCEMREPORTID2`, t1.`ATTENDANCEMREPORTMXID`, t1.`ATTENDANCEMREPORTMXNAME`, t1.`ATTENDENCESETUPID`, t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY1`, t1.`DAY10`, t1.`DAY11`, t1.`DAY12`, t1.`DAY13`, t1.`DAY14`, t1.`DAY15`, t1.`DAY16`, t1.`DAY17`, t1.`DAY18`, t1.`DAY19`, t1.`DAY2`, t1.`DAY20`, t1.`DAY21`, t1.`DAY22`, t1.`DAY23`, t1.`DAY24`, t1.`DAY25`, t1.`DAY26`, t1.`DAY27`, t1.`DAY28`, t1.`DAY29`, t1.`DAY3`, t1.`DAY30`, t1.`DAY31`, t1.`DAY4`, t1.`DAY5`, t1.`DAY6`, t1.`DAY7`, t1.`DAY8`, t1.`DAY9`, t11.`GW`, t1.`KQHZ`, t1.`ND`, t1.`ORMROGID`, t1.`ORMROGNAME`, t1.`ORMROGSECTORID`, t1.`ORMROGSECTORNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YF`, t11.`YGBH` FROM `T_ATTENDANCEMREPORTMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/att/attendancerecord/AttEndanceRecordMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attendancerecord/AttEndanceRecordMapper.xml
@@ -67,14 +67,14 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEMREPORTMXID`, t61.`ATTENDANCEMREPORTMXNAME`, t1.`ATTENDANCERECORDID`, t1.`ATTENDANCERECORDNAME`, t1.`ATTENDDATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`DKSJQD`, t1.`DKSJQT`, t1.`ENABLE`, t1.`ISOUTLEAVE`, t1.`ISOUTOFFICE`, t11.`ORMORGID` AS `ORGID`, t11.`ORMORGSECTORID` AS `ORGSECTORID`, t1.`ORMBMKQDZID`, t41.`ORMBMKQDZNAME`, t11.`ORMORGID`, t51.`ZZDZS` AS `ORMORGNAME`, t11.`ORMORGSECTORID`, t21.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`TRMTRAINPLANTERMID`, t31.`TRMTRAINPLANTERMNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`YGBH`, t11.`ZJHM`, t51.`ZZDZS` FROM `T_ATTENDANCERECORD` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_TRMTRAINPLANTERM t31 ON t1.TRMTRAINPLANTERMID = t31.TRMTRAINPLANTERMID  LEFT JOIN T_ORMBMKQDZ t41 ON t1.ORMBMKQDZID = t41.ORMBMKQDZID  LEFT JOIN T_SRFORG t51 ON t11.ORMORGID = t51.ORGID  LEFT JOIN T_ATTENDANCEMREPORTMX t61 ON t1.ATTENDANCEMREPORTMXID = t61.ATTENDANCEMREPORTMXID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDANCEMREPORTMXID`, t61.`ATTENDANCEMREPORTMXNAME`, t1.`ATTENDANCERECORDID`, t1.`ATTENDANCERECORDNAME`, t1.`ATTENDDATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`DKSJQD`, t1.`DKSJQT`, t1.`ENABLE`, t1.`ISOUTLEAVE`, t1.`ISOUTOFFICE`, t11.`ORMORGID` AS `ORGID`, t11.`ORMORGSECTORID` AS `ORGSECTORID`, t1.`ORMBMKQDZID`, t41.`ORMBMKQDZNAME`, t11.`ORMORGID`, t51.`ZZDZS` AS `ORMORGNAME`, t11.`ORMORGSECTORID`, t21.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`TRMTRAINPLANTERMID`, t31.`TRMTRAINPLANTERMNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`YGBH`, t11.`ZJHM`, t51.`ZZDZS` FROM `T_ATTENDANCERECORD` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_TRMTRAINPLANTERM t31 ON t1.TRMTRAINPLANTERMID = t31.TRMTRAINPLANTERMID  LEFT JOIN T_ORMBMKQDZ t41 ON t1.ORMBMKQDZID = t41.ORMBMKQDZID  LEFT JOIN T_SRFORG t51 ON t11.ORMORGID = t51.ORGID  LEFT JOIN T_ATTENDANCEMREPORTMX t61 ON t1.ATTENDANCEMREPORTMXID = t61.ATTENDANCEMREPORTMXID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCEMREPORTMXID`, t61.`ATTENDANCEMREPORTMXNAME`, t1.`ATTENDANCERECORDID`, t1.`ATTENDANCERECORDNAME`, t1.`ATTENDDATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`DKSJQD`, t1.`DKSJQT`, t1.`ENABLE`, t1.`ISOUTLEAVE`, t1.`ISOUTOFFICE`, t11.`ORMORGID` AS `ORGID`, t11.`ORMORGSECTORID` AS `ORGSECTORID`, t1.`ORMBMKQDZID`, t41.`ORMBMKQDZNAME`, t11.`ORMORGID`, t51.`ZZDZS` AS `ORMORGNAME`, t11.`ORMORGSECTORID`, t21.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`TRMTRAINPLANTERMID`, t31.`TRMTRAINPLANTERMNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`YGBH`, t11.`ZJHM`, t51.`ZZDZS` FROM `T_ATTENDANCERECORD` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_TRMTRAINPLANTERM t31 ON t1.TRMTRAINPLANTERMID = t31.TRMTRAINPLANTERMID  LEFT JOIN T_ORMBMKQDZ t41 ON t1.ORMBMKQDZID = t41.ORMBMKQDZID  LEFT JOIN T_SRFORG t51 ON t11.ORMORGID = t51.ORGID  LEFT JOIN T_ATTENDANCEMREPORTMX t61 ON t1.ATTENDANCEMREPORTMXID = t61.ATTENDANCEMREPORTMXID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDANCEMREPORTMXID`, t61.`ATTENDANCEMREPORTMXNAME`, t1.`ATTENDANCERECORDID`, t1.`ATTENDANCERECORDNAME`, t1.`ATTENDDATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`DKSJQD`, t1.`DKSJQT`, t1.`ENABLE`, t1.`ISOUTLEAVE`, t1.`ISOUTOFFICE`, t11.`ORMORGID` AS `ORGID`, t11.`ORMORGSECTORID` AS `ORGSECTORID`, t1.`ORMBMKQDZID`, t41.`ORMBMKQDZNAME`, t11.`ORMORGID`, t51.`ZZDZS` AS `ORMORGNAME`, t11.`ORMORGSECTORID`, t21.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`TRMTRAINPLANTERMID`, t31.`TRMTRAINPLANTERMNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`YGBH`, t11.`ZJHM`, t51.`ZZDZS` FROM `T_ATTENDANCERECORD` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_TRMTRAINPLANTERM t31 ON t1.TRMTRAINPLANTERMID = t31.TRMTRAINPLANTERMID  LEFT JOIN T_ORMBMKQDZ t41 ON t1.ORMBMKQDZID = t41.ORMBMKQDZID  LEFT JOIN T_SRFORG t51 ON t11.ORMORGID = t51.ORGID  LEFT JOIN T_ATTENDANCEMREPORTMX t61 ON t1.ATTENDANCEMREPORTMXID = t61.ATTENDANCEMREPORTMXID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/att/attendancerecordtemp/AttEndanceRecordTempMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attendancerecordtemp/AttEndanceRecordTempMapper.xml
@@ -57,14 +57,14 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCERECORDTEMPID`, t1.`ATTENDANCERECORDTEMPNAME`, t1.`CDF`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY`, t1.`DKSJQD`, t1.`DKSJQT`, t1.`ENABLE`, t1.`ISOUTLEAVE`, t1.`ISOUTOFFICE`, t1.`ISWEEKEND`, t1.`KQLX`, t1.`KQRQ`, t1.`ND`, t1.`ORMBMKQDZID`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`RSHD`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XBSJ`, t1.`YF`, t1.`YGBH`, t1.`ZTF` FROM `T_ATTENDANCERECORDTEMP` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDANCERECORDTEMPID`, t1.`ATTENDANCERECORDTEMPNAME`, t1.`CDF`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY`, t1.`DKSJQD`, t1.`DKSJQT`, t1.`ENABLE`, t1.`ISOUTLEAVE`, t1.`ISOUTOFFICE`, t1.`ISWEEKEND`, t1.`KQLX`, t1.`KQRQ`, t1.`ND`, t1.`ORMBMKQDZID`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`RSHD`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XBSJ`, t1.`YF`, t1.`YGBH`, t1.`ZTF` FROM `T_ATTENDANCERECORDTEMP` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCERECORDTEMPID`, t1.`ATTENDANCERECORDTEMPNAME`, t1.`CDF`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY`, t1.`DKSJQD`, t1.`DKSJQT`, t1.`ENABLE`, t1.`ISOUTLEAVE`, t1.`ISOUTOFFICE`, t1.`ISWEEKEND`, t1.`KQLX`, t1.`KQRQ`, t1.`ND`, t1.`ORMBMKQDZID`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`RSHD`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XBSJ`, t1.`YF`, t1.`YGBH`, t1.`ZTF` FROM `T_ATTENDANCERECORDTEMP` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDANCERECORDTEMPID`, t1.`ATTENDANCERECORDTEMPNAME`, t1.`CDF`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DAY`, t1.`DKSJQD`, t1.`DKSJQT`, t1.`ENABLE`, t1.`ISOUTLEAVE`, t1.`ISOUTOFFICE`, t1.`ISWEEKEND`, t1.`KQLX`, t1.`KQRQ`, t1.`ND`, t1.`ORMBMKQDZID`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`RSHD`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XBSJ`, t1.`YF`, t1.`YGBH`, t1.`ZTF` FROM `T_ATTENDANCERECORDTEMP` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/att/attendancesettings/AttEndanceSettingsMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attendancesettings/AttEndanceSettingsMapper.xml
@@ -65,22 +65,22 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCESETTINGSID`, t1.`ATTENDANCESETTINGSNAME`, t1.`ATTENDENCESETUPID`, t11.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t31.`ORMORGID`, t11.`ORMORGID` AS `ORMORGID2`, t21.`ZZDZS` AS `ORMORGNAME2`, t31.`ORMORGSECTORID`, t41.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGBH`, t31.`YGZT`, t51.`ZZDZS` FROM `T_ATTENDANCESETTINGS` t1  LEFT JOIN T_ATTENDENCESETUP t11 ON t1.ATTENDENCESETUPID = t11.ATTENDENCESETUPID  LEFT JOIN T_SRFORG t21 ON t11.ORMORGID = t21.ORGID  LEFT JOIN T_PIMPERSON t31 ON t1.PIMPERSONID = t31.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t41 ON t31.ORMORGSECTORID = t41.ORGSECTORID  LEFT JOIN T_SRFORG t51 ON t31.ORMORGID = t51.ORGID  
+		<![CDATA[ SELECT t1.`ATTENDANCESETTINGSID`, t1.`ATTENDANCESETTINGSNAME`, t1.`ATTENDENCESETUPID`, t11.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t31.`ORMORGID`, t11.`ORMORGID` AS `ORMORGID2`, t21.`ZZDZS` AS `ORMORGNAME2`, t31.`ORMORGSECTORID`, t41.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGBH`, t31.`YGZT`, t51.`ZZDZS` FROM `T_ATTENDANCESETTINGS` t1  LEFT JOIN T_ATTENDENCESETUP t11 ON t1.ATTENDENCESETUPID = t11.ATTENDENCESETUPID  LEFT JOIN T_SRFORG t21 ON t11.ORMORGID = t21.ORGID  LEFT JOIN T_PIMPERSON t31 ON t1.PIMPERSONID = t31.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t41 ON t31.ORMORGSECTORID = t41.ORGSECTORID  LEFT JOIN T_SRFORG t51 ON t31.ORMORGID = t51.ORGID  
 			]]>
    </sql>
    <!--数据查询[FYGZZKQ]-->
    <sql id="FYGZZKQ" databaseId="mysql">
-       <![CDATA[	SELECT t1.ATTENDANCESETTINGSNAME AS ATTENDANCESETTINGSNAME, t1.ATTENDANCESETTINGSID AS ATTENDANCESETTINGSID, t1.PIMPERSONID AS PIMPERSONID, t1.PIMPERSONNAME AS PIMPERSONNAME, t1.YGBH AS YGBH, t1.ATTENDENCESETUPID AS ATTENDENCESETUPID, t3.Attendencesetupname AS ATTENDENCESETUPNAME, t21.SHORTNAME AS ORMORGSECTORNAME, t11.ORMORGSECTORID AS ORMORGSECTORID, t1.DKFS AS DKFS, t11.ormorgid AS ORMORGID, t12.ZZDZS AS ZZDZS, t3.ormorgid AS ORMORGID2, t31.orgname AS ORMORGNAME2, t11.ygzt AS YGZT FROM T_ATTENDANCESETTINGS t1 LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID left join T_SRFORG t12 on t11.ORMORGID=t12.ORGID LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID LEFT JOIN T_ATTENDENCESETUP t3 ON t1.attendencesetupid=t3.attendencesetupid left join T_SRFORG t31 on t3.ORMORGID = t31.ORGID WHERE EXISTS (       select 1 from T_PIMPERSON temp left join T_SRFORG  temp1 on temp1.ORGID = temp.ormorgid       WHERE temp.PIMPERSONID=t1.PIMPERSONID       AND temp.ENABLE=1 and temp.JLSS = '10'       AND (INSTR(temp1.companyflag,t31.companyflag) <> 1 OR temp.ygzt IN('40','50','60','130','51')) )
+		<![CDATA[ SELECT t1.ATTENDANCESETTINGSNAME AS ATTENDANCESETTINGSNAME, t1.ATTENDANCESETTINGSID AS ATTENDANCESETTINGSID, t1.PIMPERSONID AS PIMPERSONID, t1.PIMPERSONNAME AS PIMPERSONNAME, t1.YGBH AS YGBH, t1.ATTENDENCESETUPID AS ATTENDENCESETUPID, t3.Attendencesetupname AS ATTENDENCESETUPNAME, t21.SHORTNAME AS ORMORGSECTORNAME, t11.ORMORGSECTORID AS ORMORGSECTORID, t1.DKFS AS DKFS, t11.ormorgid AS ORMORGID, t12.ZZDZS AS ZZDZS, t3.ormorgid AS ORMORGID2, t31.orgname AS ORMORGNAME2, t11.ygzt AS YGZT FROM T_ATTENDANCESETTINGS t1 LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID left join T_SRFORG t12 on t11.ORMORGID=t12.ORGID LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID LEFT JOIN T_ATTENDENCESETUP t3 ON t1.attendencesetupid=t3.attendencesetupid left join T_SRFORG t31 on t3.ORMORGID = t31.ORGID WHERE EXISTS (       select 1 from T_PIMPERSON temp left join T_SRFORG  temp1 on temp1.ORGID = temp.ormorgid       WHERE temp.PIMPERSONID=t1.PIMPERSONID       AND temp.ENABLE=1 and temp.JLSS = '10'       AND (INSTR(temp1.companyflag,t31.companyflag) <> 1 OR temp.ygzt IN('40','50','60','130','51')) )
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCESETTINGSID`, t1.`ATTENDANCESETTINGSNAME`, t1.`ATTENDENCESETUPID`, t11.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t31.`ORMORGID`, t11.`ORMORGID` AS `ORMORGID2`, t21.`ZZDZS` AS `ORMORGNAME2`, t31.`ORMORGSECTORID`, t41.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGBH`, t31.`YGZT`, t51.`ZZDZS` FROM `T_ATTENDANCESETTINGS` t1  LEFT JOIN T_ATTENDENCESETUP t11 ON t1.ATTENDENCESETUPID = t11.ATTENDENCESETUPID  LEFT JOIN T_SRFORG t21 ON t11.ORMORGID = t21.ORGID  LEFT JOIN T_PIMPERSON t31 ON t1.PIMPERSONID = t31.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t41 ON t31.ORMORGSECTORID = t41.ORGSECTORID  LEFT JOIN T_SRFORG t51 ON t31.ORMORGID = t51.ORGID  
+		<![CDATA[ SELECT t1.`ATTENDANCESETTINGSID`, t1.`ATTENDANCESETTINGSNAME`, t1.`ATTENDENCESETUPID`, t11.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t31.`ORMORGID`, t11.`ORMORGID` AS `ORMORGID2`, t21.`ZZDZS` AS `ORMORGNAME2`, t31.`ORMORGSECTORID`, t41.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGBH`, t31.`YGZT`, t51.`ZZDZS` FROM `T_ATTENDANCESETTINGS` t1  LEFT JOIN T_ATTENDENCESETUP t11 ON t1.ATTENDENCESETUPID = t11.ATTENDENCESETUPID  LEFT JOIN T_SRFORG t21 ON t11.ORMORGID = t21.ORGID  LEFT JOIN T_PIMPERSON t31 ON t1.PIMPERSONID = t31.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t41 ON t31.ORMORGSECTORID = t41.ORGSECTORID  LEFT JOIN T_SRFORG t51 ON t31.ORMORGID = t51.ORGID  
 			]]>
    </sql>
    <!--数据查询[YGSZKQ]-->
    <sql id="YGSZKQ" databaseId="mysql">
-       <![CDATA[	SELECT NULL AS ATTENDANCESETTINGSNAME, t11.pimpersonid AS ATTENDANCESETTINGSID, t11.PIMPERSONID AS PIMPERSONID, t11.PIMPERSONNAME AS PIMPERSONNAME, t11.YGBH AS YGBH, NULL AS ATTENDENCESETUPID, NULL AS ATTENDENCESETUPNAME, t21.SHORTNAME AS ORMORGSECTORNAME, t11.ORMORGSECTORID AS ORMORGSECTORID, NULL AS DKFS, t11.ormorgid AS ORMORGID, t31.ZZDZS AS ZZDZS, t31.orgid AS ORMORGID2, t31.zzdzs AS ORMORGNAME2, t11.ygzt AS YGZT FROM T_PIMPERSON t11 LEFT JOIN T_SRFORG t31 ON t11.ORMORGID = t31.ORGID LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID WHERE t11.ENABLE=1 and t11.JLSS = '10' and t11.YGZT <>'40' and t11.YGZT <>'50' and t11.YGZT <>'60' and t11.YGZT <>'130' and t11.YGZT <>'51' AND NOT EXISTS(     SELECT 1 FROM T_ATTENDANCESETTINGS temp WHERE temp.pimpersonid=t11.pimpersonid )
+		<![CDATA[ SELECT NULL AS ATTENDANCESETTINGSNAME, t11.pimpersonid AS ATTENDANCESETTINGSID, t11.PIMPERSONID AS PIMPERSONID, t11.PIMPERSONNAME AS PIMPERSONNAME, t11.YGBH AS YGBH, NULL AS ATTENDENCESETUPID, NULL AS ATTENDENCESETUPNAME, t21.SHORTNAME AS ORMORGSECTORNAME, t11.ORMORGSECTORID AS ORMORGSECTORID, NULL AS DKFS, t11.ormorgid AS ORMORGID, t31.ZZDZS AS ZZDZS, t31.orgid AS ORMORGID2, t31.zzdzs AS ORMORGNAME2, t11.ygzt AS YGZT FROM T_PIMPERSON t11 LEFT JOIN T_SRFORG t31 ON t11.ORMORGID = t31.ORGID LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID WHERE t11.ENABLE=1 and t11.JLSS = '10' and t11.YGZT <>'40' and t11.YGZT <>'50' and t11.YGZT <>'60' and t11.YGZT <>'130' and t11.YGZT <>'51' AND NOT EXISTS(     SELECT 1 FROM T_ATTENDANCESETTINGS temp WHERE temp.pimpersonid=t11.pimpersonid )
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/att/attendencecalendar/AttEndenceCalendarMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attendencecalendar/AttEndenceCalendarMapper.xml
@@ -47,14 +47,14 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDENCECALENDARID`, t1.`ATTENDENCECALENDARNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t21.`JJRLX`, t1.`LX1`, t1.`ND`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`RQ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYID`, t21.`VACHOLIDAYNAME`, t11.`ZZDZS` FROM `T_ATTENDENCECALENDAR` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_VACHOLIDAY t21 ON t1.VACHOLIDAYID = t21.VACHOLIDAYID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDENCECALENDARID`, t1.`ATTENDENCECALENDARNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t21.`JJRLX`, t1.`LX1`, t1.`ND`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`RQ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYID`, t21.`VACHOLIDAYNAME`, t11.`ZZDZS` FROM `T_ATTENDENCECALENDAR` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_VACHOLIDAY t21 ON t1.VACHOLIDAYID = t21.VACHOLIDAYID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDENCECALENDARID`, t1.`ATTENDENCECALENDARNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t21.`JJRLX`, t1.`LX1`, t1.`ND`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`RQ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYID`, t21.`VACHOLIDAYNAME`, t11.`ZZDZS` FROM `T_ATTENDENCECALENDAR` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_VACHOLIDAY t21 ON t1.VACHOLIDAYID = t21.VACHOLIDAYID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDENCECALENDARID`, t1.`ATTENDENCECALENDARNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t21.`JJRLX`, t1.`LX1`, t1.`ND`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`RQ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYID`, t21.`VACHOLIDAYNAME`, t11.`ZZDZS` FROM `T_ATTENDENCECALENDAR` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  LEFT JOIN T_VACHOLIDAY t21 ON t1.VACHOLIDAYID = t21.VACHOLIDAYID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/att/attendenceormorgscetor/AttEndenceOrmorgscetorMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attendenceormorgscetor/AttEndenceOrmorgscetorMapper.xml
@@ -47,12 +47,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDENCEORMORGSECTORID`, t1.`ATTENDENCEORMORGSECTORNAME`, t1.`ATTENDENCESETUPID`, t11.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, (SELECT group_concat(ORMBMKQDZname) FROM T_ORMBMKQDZ WHERE ormorgsectorid=t1.`ORMORGSECTORID`) AS `DZ`, t1.`KQDZ`, t21.`ORGID`, t31.`ORGNAME`, t1.`ORMORGSECTORID`, t21.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENDENCEORMORGSECTOR` t1  LEFT JOIN T_ATTENDENCESETUP t11 ON t1.ATTENDENCESETUPID = t11.ATTENDENCESETUPID  LEFT JOIN T_SRFORGSECTOR t21 ON t1.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_SRFORG t31 ON t21.ORGID = t31.ORGID  
+		<![CDATA[ SELECT t1.`ATTENDENCEORMORGSECTORID`, t1.`ATTENDENCEORMORGSECTORNAME`, t1.`ATTENDENCESETUPID`, t11.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, (SELECT group_concat(ORMBMKQDZname) FROM T_ORMBMKQDZ WHERE ormorgsectorid=t1.`ORMORGSECTORID`) AS `DZ`, t1.`KQDZ`, t21.`ORGID`, t31.`ORGNAME`, t1.`ORMORGSECTORID`, t21.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENDENCEORMORGSECTOR` t1  LEFT JOIN T_ATTENDENCESETUP t11 ON t1.ATTENDENCESETUPID = t11.ATTENDENCESETUPID  LEFT JOIN T_SRFORGSECTOR t21 ON t1.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_SRFORG t31 ON t21.ORGID = t31.ORGID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDENCEORMORGSECTORID`, t1.`ATTENDENCEORMORGSECTORNAME`, t1.`ATTENDENCESETUPID`, t11.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, (SELECT group_concat(ORMBMKQDZname) FROM T_ORMBMKQDZ WHERE ormorgsectorid=t1.`ORMORGSECTORID`) AS `DZ`, t1.`KQDZ`, t21.`ORGID`, t31.`ORGNAME`, t1.`ORMORGSECTORID`, t21.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENDENCEORMORGSECTOR` t1  LEFT JOIN T_ATTENDENCESETUP t11 ON t1.ATTENDENCESETUPID = t11.ATTENDENCESETUPID  LEFT JOIN T_SRFORGSECTOR t21 ON t1.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_SRFORG t31 ON t21.ORGID = t31.ORGID  
+		<![CDATA[ SELECT t1.`ATTENDENCEORMORGSECTORID`, t1.`ATTENDENCEORMORGSECTORNAME`, t1.`ATTENDENCESETUPID`, t11.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, (SELECT group_concat(ORMBMKQDZname) FROM T_ORMBMKQDZ WHERE ormorgsectorid=t1.`ORMORGSECTORID`) AS `DZ`, t1.`KQDZ`, t21.`ORGID`, t31.`ORGNAME`, t1.`ORMORGSECTORID`, t21.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENDENCEORMORGSECTOR` t1  LEFT JOIN T_ATTENDENCESETUP t11 ON t1.ATTENDENCESETUPID = t11.ATTENDENCESETUPID  LEFT JOIN T_SRFORGSECTOR t21 ON t1.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_SRFORG t31 ON t21.ORGID = t31.ORGID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/att/attendencesetup/AttEndenceSetupMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attendencesetup/AttEndenceSetupMapper.xml
@@ -84,35 +84,35 @@

    <!--数据查询[CurOrgKQSZ]-->
    <sql id="CurOrgKQSZ" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ALLOWOUTWORK`, t1.`ATTENDENCESETUPID`, t1.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`ENABLE`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t31.`ZZDZS` AS `ORMORGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`PORGID`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYRULESID`, t21.`VACHOLIDAYRULESNAME`, t1.`XBSJ` FROM `T_ATTENDENCESETUP` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_VACHOLIDAYRULES t21 ON t1.VACHOLIDAYRULESID = t21.VACHOLIDAYRULESID  LEFT JOIN T_SRFORG t31 ON t1.ORMORGID = t31.ORGID  
-				 WHERE 	t1.ENABLE = 1
-					 AND ( ( t1.`ORMORGID` =  #{srf.webcontext.nodeid}  OR  EXISTS (select orgid from T_SRFORG where ORGCODE='BG' and orgid=  #{srf.webcontext.nodeid})  OR  t1.ORMORGID IN (select orgid from T_SRFORG where  COMPANYFLAG= #{srf.webcontext.nodeid})  OR  t1.ORMORGID IN (select orgid from T_SRFORG where  porgid= #{srf.webcontext.nodeid}) ) )
+		<![CDATA[ SELECT t1.`ALLOWOUTWORK`, t1.`ATTENDENCESETUPID`, t1.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`ENABLE`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t31.`ZZDZS` AS `ORMORGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`PORGID`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYRULESID`, t21.`VACHOLIDAYRULESNAME`, t1.`XBSJ` FROM `T_ATTENDENCESETUP` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_VACHOLIDAYRULES t21 ON t1.VACHOLIDAYRULESID = t21.VACHOLIDAYRULESID  LEFT JOIN T_SRFORG t31 ON t1.ORMORGID = t31.ORGID  
+					 WHERE 	t1.ENABLE = 1
+						 AND ( ( t1.`ORMORGID` =  #{srf.webcontext.nodeid}  OR  EXISTS (select orgid from T_SRFORG where ORGCODE='BG' and orgid=  #{srf.webcontext.nodeid})  OR  t1.ORMORGID IN (select orgid from T_SRFORG where  COMPANYFLAG= #{srf.webcontext.nodeid})  OR  t1.ORMORGID IN (select orgid from T_SRFORG where  porgid= #{srf.webcontext.nodeid}) ) )
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ALLOWOUTWORK`, t1.`ATTENDENCESETUPID`, t1.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`ENABLE`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t31.`ZZDZS` AS `ORMORGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`PORGID`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYRULESID`, t21.`VACHOLIDAYRULESNAME`, t1.`XBSJ` FROM `T_ATTENDENCESETUP` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_VACHOLIDAYRULES t21 ON t1.VACHOLIDAYRULESID = t21.VACHOLIDAYRULESID  LEFT JOIN T_SRFORG t31 ON t1.ORMORGID = t31.ORGID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ALLOWOUTWORK`, t1.`ATTENDENCESETUPID`, t1.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`ENABLE`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t31.`ZZDZS` AS `ORMORGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`PORGID`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYRULESID`, t21.`VACHOLIDAYRULESNAME`, t1.`XBSJ` FROM `T_ATTENDENCESETUP` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_VACHOLIDAYRULES t21 ON t1.VACHOLIDAYRULESID = t21.VACHOLIDAYRULESID  LEFT JOIN T_SRFORG t31 ON t1.ORMORGID = t31.ORGID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[KQYBXKQB]-->
    <sql id="KQYBXKQB" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ALLOWOUTWORK`, t1.`ATTENDENCESETUPID`, t1.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`ENABLE`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t31.`ZZDZS` AS `ORMORGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`PORGID`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYRULESID`, t21.`VACHOLIDAYRULESNAME`, t1.`XBSJ` FROM `T_ATTENDENCESETUP` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_VACHOLIDAYRULES t21 ON t1.VACHOLIDAYRULESID = t21.VACHOLIDAYRULESID  LEFT JOIN T_SRFORG t31 ON t1.ORMORGID = t31.ORGID  
-				 WHERE 	t1.ENABLE = 1
-					 AND ( ( t1.`ORMORGID` =  #{srf.sessioncontext.srforgid}  OR  instr(t21.levelcode, ( select a.levelcode from t_srforg a where a.orgid = #{srf.sessioncontext.srforgid} ) )=1 ) )
+		<![CDATA[ SELECT t1.`ALLOWOUTWORK`, t1.`ATTENDENCESETUPID`, t1.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`ENABLE`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t31.`ZZDZS` AS `ORMORGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`PORGID`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYRULESID`, t21.`VACHOLIDAYRULESNAME`, t1.`XBSJ` FROM `T_ATTENDENCESETUP` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_VACHOLIDAYRULES t21 ON t1.VACHOLIDAYRULESID = t21.VACHOLIDAYRULESID  LEFT JOIN T_SRFORG t31 ON t1.ORMORGID = t31.ORGID  
+					 WHERE 	t1.ENABLE = 1
+						 AND ( ( t1.`ORMORGID` =  #{srf.sessioncontext.srforgid}  OR  instr(t21.levelcode, ( select a.levelcode from t_srforg a where a.orgid = #{srf.sessioncontext.srforgid} ) )=1 ) )
 			]]>
    </sql>
    <!--数据查询[KQYCZKQSZ]-->
    <sql id="KQYCZKQSZ" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ALLOWOUTWORK`, t1.`ATTENDENCESETUPID`, t1.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`ENABLE`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t31.`ZZDZS` AS `ORMORGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`PORGID`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYRULESID`, t21.`VACHOLIDAYRULESNAME`, t1.`XBSJ` FROM `T_ATTENDENCESETUP` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_VACHOLIDAYRULES t21 ON t1.VACHOLIDAYRULESID = t21.VACHOLIDAYRULESID  LEFT JOIN T_SRFORG t31 ON t1.ORMORGID = t31.ORGID  
-				 WHERE 	t1.ENABLE = 1
-					 AND ( t1.`PIMPERSONID` =  #{srf.sessioncontext.srfpersonid} )
+		<![CDATA[ SELECT t1.`ALLOWOUTWORK`, t1.`ATTENDENCESETUPID`, t1.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`ENABLE`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t31.`ZZDZS` AS `ORMORGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`PORGID`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYRULESID`, t21.`VACHOLIDAYRULESNAME`, t1.`XBSJ` FROM `T_ATTENDENCESETUP` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_VACHOLIDAYRULES t21 ON t1.VACHOLIDAYRULESID = t21.VACHOLIDAYRULESID  LEFT JOIN T_SRFORG t31 ON t1.ORMORGID = t31.ORGID  
+					 WHERE 	t1.ENABLE = 1
+						 AND ( t1.`PIMPERSONID` =  #{srf.sessioncontext.srfpersonid} )
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ALLOWOUTWORK`, t1.`ATTENDENCESETUPID`, t1.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`ENABLE`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t31.`ZZDZS` AS `ORMORGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`PORGID`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYRULESID`, t21.`VACHOLIDAYRULESNAME`, t1.`XBSJ` FROM `T_ATTENDENCESETUP` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_VACHOLIDAYRULES t21 ON t1.VACHOLIDAYRULESID = t21.VACHOLIDAYRULESID  LEFT JOIN T_SRFORG t31 ON t1.ORMORGID = t31.ORGID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ALLOWOUTWORK`, t1.`ATTENDENCESETUPID`, t1.`ATTENDENCESETUPNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DKFS`, t1.`ENABLE`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t31.`ZZDZS` AS `ORMORGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`PORGID`, t1.`SBSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VACHOLIDAYRULESID`, t21.`VACHOLIDAYRULESNAME`, t1.`XBSJ` FROM `T_ATTENDENCESETUP` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_VACHOLIDAYRULES t21 ON t1.VACHOLIDAYRULESID = t21.VACHOLIDAYRULESID  LEFT JOIN T_SRFORG t31 ON t1.ORMORGID = t31.ORGID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/att/attendencetype/AttEndenceTypeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attendencetype/AttEndenceTypeMapper.xml
@@ -27,14 +27,14 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDENCETYPEID`, t1.`ATTENDENCETYPENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENDENCETYPE` t1  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDENCETYPEID`, t1.`ATTENDENCETYPENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENDENCETYPE` t1  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDENCETYPEID`, t1.`ATTENDENCETYPENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENDENCETYPE` t1  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENDENCETYPEID`, t1.`ATTENDENCETYPENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENDENCETYPE` t1  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/att/attendrecorddetail/AttendRecordDetailMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attendrecorddetail/AttendRecordDetailMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCERECORDID`, t11.`ATTENDANCERECORDNAME`, t1.`ATTENDRECORDDETAILID`, t1.`ATTENDRECORDDETAILNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LAT`, t1.`LNG`, t1.`SIGNLOCATION`, t1.`SIGNTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENDRECORDDETAIL` t1  LEFT JOIN T_ATTENDANCERECORD t11 ON t1.ATTENDANCERECORDID = t11.ATTENDANCERECORDID  
+		<![CDATA[ SELECT t1.`ATTENDANCERECORDID`, t11.`ATTENDANCERECORDNAME`, t1.`ATTENDRECORDDETAILID`, t1.`ATTENDRECORDDETAILNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LAT`, t1.`LNG`, t1.`SIGNLOCATION`, t1.`SIGNTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENDRECORDDETAIL` t1  LEFT JOIN T_ATTENDANCERECORD t11 ON t1.ATTENDANCERECORDID = t11.ATTENDANCERECORDID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCERECORDID`, t11.`ATTENDANCERECORDNAME`, t1.`ATTENDRECORDDETAILID`, t1.`ATTENDRECORDDETAILNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LAT`, t1.`LNG`, t1.`SIGNLOCATION`, t1.`SIGNTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENDRECORDDETAIL` t1  LEFT JOIN T_ATTENDANCERECORD t11 ON t1.ATTENDANCERECORDID = t11.ATTENDANCERECORDID  
+		<![CDATA[ SELECT t1.`ATTENDANCERECORDID`, t11.`ATTENDANCERECORDNAME`, t1.`ATTENDRECORDDETAILID`, t1.`ATTENDRECORDDETAILNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LAT`, t1.`LNG`, t1.`SIGNLOCATION`, t1.`SIGNTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENDRECORDDETAIL` t1  LEFT JOIN T_ATTENDANCERECORD t11 ON t1.ATTENDANCERECORDID = t11.ATTENDANCERECORDID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/att/attenmembwes/AttEnmembwesMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attenmembwes/AttEnmembwesMapper.xml
@@ -27,12 +27,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENMEMBWESID`, t1.`ATTENMEMBWESNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ATTENMEMBWES` t1  
+		<![CDATA[ SELECT t1.`ATTENMEMBWESID`, t1.`ATTENMEMBWESNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ATTENMEMBWES` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENMEMBWESID`, t1.`ATTENMEMBWESNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ATTENMEMBWES` t1  
+		<![CDATA[ SELECT t1.`ATTENMEMBWESID`, t1.`ATTENMEMBWESNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ATTENMEMBWES` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/att/attensummary/AttEnsummaryMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attensummary/AttEnsummaryMapper.xml
@@ -46,21 +46,21 @@

    <!--数据查询[CurZZKQHZ]-->
    <sql id="CurZZKQHZ" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENSUMMARYID`, t1.`ATTENSUMMARYNAME`, t1.`BEGINDATE`, t1.`BJ`, t1.`BQ`, t1.`BR`, t1.`BZ`, t1.`CC`, t1.`CD`, t1.`CDC`, t1.`CDF`, t1.`CJ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENABLE`, t1.`ENDDATE`, t1.`FDJRJB`, t1.`GS`, t1.`GZRJB`, t1.`JH`, t1.`JS`, t1.`KG`, t1.`ND`, t1.`NX`, t11.`ORMORGID` AS `ORGID`, t11.`ORMORGSECTORID` AS `ORGSECTORID`, t11.`ORMORGID`, t21.`ZZDZS` AS `ORMORGNAME`, t11.`ORMORGSECTORID`, t31.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PC`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`QQ`, t1.`QT`, t1.`QTDXJ`, t1.`REMARKREASON`, t1.`SDT`, t1.`SJ`, t1.`SJCQTS`, t1.`SZ`, t1.`TCXX`, t1.`TQ`, t1.`TX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WQDTS`, t1.`XXRJB`, t1.`YF`, t1.`YGBH`, t1.`YQ`, t1.`ZHTS`, t11.`ZJHM`, t1.`ZT`, t1.`ZTC`, t1.`ZTF`, t11.`ZW` FROM `T_ATTENSUMMARY` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORG t21 ON t11.ORMORGID = t21.ORGID  LEFT JOIN T_SRFORGSECTOR t31 ON t11.ORMORGSECTORID = t31.ORGSECTORID  
-				 WHERE 	t1.ENABLE = 1
-					 AND ( t11.`ORMORGID` =  #{srf.webcontext.nodeid} )
+		<![CDATA[ SELECT t1.`ATTENSUMMARYID`, t1.`ATTENSUMMARYNAME`, t1.`BEGINDATE`, t1.`BJ`, t1.`BQ`, t1.`BR`, t1.`BZ`, t1.`CC`, t1.`CD`, t1.`CDC`, t1.`CDF`, t1.`CJ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENABLE`, t1.`ENDDATE`, t1.`FDJRJB`, t1.`GS`, t1.`GZRJB`, t1.`JH`, t1.`JS`, t1.`KG`, t1.`ND`, t1.`NX`, t11.`ORMORGID` AS `ORGID`, t11.`ORMORGSECTORID` AS `ORGSECTORID`, t11.`ORMORGID`, t21.`ZZDZS` AS `ORMORGNAME`, t11.`ORMORGSECTORID`, t31.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PC`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`QQ`, t1.`QT`, t1.`QTDXJ`, t1.`REMARKREASON`, t1.`SDT`, t1.`SJ`, t1.`SJCQTS`, t1.`SZ`, t1.`TCXX`, t1.`TQ`, t1.`TX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WQDTS`, t1.`XXRJB`, t1.`YF`, t1.`YGBH`, t1.`YQ`, t1.`ZHTS`, t11.`ZJHM`, t1.`ZT`, t1.`ZTC`, t1.`ZTF`, t11.`ZW` FROM `T_ATTENSUMMARY` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORG t21 ON t11.ORMORGID = t21.ORGID  LEFT JOIN T_SRFORGSECTOR t31 ON t11.ORMORGSECTORID = t31.ORGSECTORID  
+					 WHERE 	t1.ENABLE = 1
+						 AND ( t11.`ORMORGID` =  #{srf.webcontext.nodeid} )
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENSUMMARYID`, t1.`ATTENSUMMARYNAME`, t1.`BEGINDATE`, t1.`BJ`, t1.`BQ`, t1.`BR`, t1.`BZ`, t1.`CC`, t1.`CD`, t1.`CDC`, t1.`CDF`, t1.`CJ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENABLE`, t1.`ENDDATE`, t1.`FDJRJB`, t1.`GS`, t1.`GZRJB`, t1.`JH`, t1.`JS`, t1.`KG`, t1.`ND`, t1.`NX`, t11.`ORMORGID` AS `ORGID`, t11.`ORMORGSECTORID` AS `ORGSECTORID`, t11.`ORMORGID`, t21.`ZZDZS` AS `ORMORGNAME`, t11.`ORMORGSECTORID`, t31.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PC`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`QQ`, t1.`QT`, t1.`QTDXJ`, t1.`REMARKREASON`, t1.`SDT`, t1.`SJ`, t1.`SJCQTS`, t1.`SZ`, t1.`TCXX`, t1.`TQ`, t1.`TX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WQDTS`, t1.`XXRJB`, t1.`YF`, t1.`YGBH`, t1.`YQ`, t1.`ZHTS`, t11.`ZJHM`, t1.`ZT`, t1.`ZTC`, t1.`ZTF`, t11.`ZW` FROM `T_ATTENSUMMARY` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORG t21 ON t11.ORMORGID = t21.ORGID  LEFT JOIN T_SRFORGSECTOR t31 ON t11.ORMORGSECTORID = t31.ORGSECTORID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENSUMMARYID`, t1.`ATTENSUMMARYNAME`, t1.`BEGINDATE`, t1.`BJ`, t1.`BQ`, t1.`BR`, t1.`BZ`, t1.`CC`, t1.`CD`, t1.`CDC`, t1.`CDF`, t1.`CJ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENABLE`, t1.`ENDDATE`, t1.`FDJRJB`, t1.`GS`, t1.`GZRJB`, t1.`JH`, t1.`JS`, t1.`KG`, t1.`ND`, t1.`NX`, t11.`ORMORGID` AS `ORGID`, t11.`ORMORGSECTORID` AS `ORGSECTORID`, t11.`ORMORGID`, t21.`ZZDZS` AS `ORMORGNAME`, t11.`ORMORGSECTORID`, t31.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PC`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`QQ`, t1.`QT`, t1.`QTDXJ`, t1.`REMARKREASON`, t1.`SDT`, t1.`SJ`, t1.`SJCQTS`, t1.`SZ`, t1.`TCXX`, t1.`TQ`, t1.`TX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WQDTS`, t1.`XXRJB`, t1.`YF`, t1.`YGBH`, t1.`YQ`, t1.`ZHTS`, t11.`ZJHM`, t1.`ZT`, t1.`ZTC`, t1.`ZTF`, t11.`ZW` FROM `T_ATTENSUMMARY` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORG t21 ON t11.ORMORGID = t21.ORGID  LEFT JOIN T_SRFORGSECTOR t31 ON t11.ORMORGSECTORID = t31.ORGSECTORID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENSUMMARYID`, t1.`ATTENSUMMARYNAME`, t1.`BEGINDATE`, t1.`BJ`, t1.`BQ`, t1.`BR`, t1.`BZ`, t1.`CC`, t1.`CD`, t1.`CDC`, t1.`CDF`, t1.`CJ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENABLE`, t1.`ENDDATE`, t1.`FDJRJB`, t1.`GS`, t1.`GZRJB`, t1.`JH`, t1.`JS`, t1.`KG`, t1.`ND`, t1.`NX`, t11.`ORMORGID` AS `ORGID`, t11.`ORMORGSECTORID` AS `ORGSECTORID`, t11.`ORMORGID`, t21.`ZZDZS` AS `ORMORGNAME`, t11.`ORMORGSECTORID`, t31.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PC`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`QQ`, t1.`QT`, t1.`QTDXJ`, t1.`REMARKREASON`, t1.`SDT`, t1.`SJ`, t1.`SJCQTS`, t1.`SZ`, t1.`TCXX`, t1.`TQ`, t1.`TX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WQDTS`, t1.`XXRJB`, t1.`YF`, t1.`YGBH`, t1.`YQ`, t1.`ZHTS`, t11.`ZJHM`, t1.`ZT`, t1.`ZTC`, t1.`ZTF`, t11.`ZW` FROM `T_ATTENSUMMARY` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORG t21 ON t11.ORMORGID = t21.ORGID  LEFT JOIN T_SRFORGSECTOR t31 ON t11.ORMORGSECTORID = t31.ORGSECTORID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENSUMMARYID`, t1.`ATTENSUMMARYNAME`, t1.`BEGINDATE`, t1.`BJ`, t1.`BQ`, t1.`BR`, t1.`BZ`, t1.`CC`, t1.`CD`, t1.`CDC`, t1.`CDF`, t1.`CJ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENABLE`, t1.`ENDDATE`, t1.`FDJRJB`, t1.`GS`, t1.`GZRJB`, t1.`JH`, t1.`JS`, t1.`KG`, t1.`ND`, t1.`NX`, t11.`ORMORGID` AS `ORGID`, t11.`ORMORGSECTORID` AS `ORGSECTORID`, t11.`ORMORGID`, t21.`ZZDZS` AS `ORMORGNAME`, t11.`ORMORGSECTORID`, t31.`SHORTNAME` AS `ORMORGSECTORNAME`, t1.`PC`, t1.`PIMPERSONID`, t1.`PIMPERSONNAME`, t1.`QQ`, t1.`QT`, t1.`QTDXJ`, t1.`REMARKREASON`, t1.`SDT`, t1.`SJ`, t1.`SJCQTS`, t1.`SZ`, t1.`TCXX`, t1.`TQ`, t1.`TX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WQDTS`, t1.`XXRJB`, t1.`YF`, t1.`YGBH`, t1.`YQ`, t1.`ZHTS`, t11.`ZJHM`, t1.`ZT`, t1.`ZTC`, t1.`ZTF`, t11.`ZW` FROM `T_ATTENSUMMARY` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORG t21 ON t11.ORMORGID = t21.ORGID  LEFT JOIN T_SRFORGSECTOR t31 ON t11.ORMORGSECTORID = t31.ORGSECTORID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/att/attensummarymx/AttEnsummarymxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/att/attensummarymx/AttEnsummarymxMapper.xml
@@ -28,14 +28,14 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENSUMMARYMXID`, t1.`ATTENSUMMARYMXNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`KQLX`, t1.`SJTS`, t1.`TS`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENSUMMARYMX` t1  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENSUMMARYMXID`, t1.`ATTENSUMMARYMXNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`KQLX`, t1.`SJTS`, t1.`TS`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENSUMMARYMX` t1  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENSUMMARYMXID`, t1.`ATTENSUMMARYMXNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`KQLX`, t1.`SJTS`, t1.`TS`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENSUMMARYMX` t1  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`ATTENSUMMARYMXID`, t1.`ATTENSUMMARYMXNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`KQLX`, t1.`SJTS`, t1.`TS`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ATTENSUMMARYMX` t1  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/common/codeitem/CodeItemMapper.xml
+++ b/ehr-core/src/main/resources/mapper/common/codeitem/CodeItemMapper.xml
--- a/ehr-core/src/main/resources/mapper/common/codelist1/CodeList1Mapper.xml
+++ b/ehr-core/src/main/resources/mapper/common/codelist1/CodeList1Mapper.xml
@@ -36,38 +36,38 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="db2">
-       <![CDATA[	SELECT t1.CLPATH, t1.CLVERSION, t1.CODELISTID, t1.CODELISTNAME, t1.CREATEDATE, t1.CREATEMAN, t1.DEID, t11.DENAME, t1.EMPTYTEXT, t1.FILLER, t1.ISSYSTEM, t1.ISUSERSCOPE, t1.MEMO, t1.NOVALUEEMPTY, t1.ORMODE, t1.RESERVER, t1.RESERVER2, t1.RESERVER3, t1.RESERVER4, t1.RESERVER5, t1.SEPERATOR, t1.SRFSYSPUB, t1.SRFUSERPUB, t1.UPDATEDATE, t1.UPDATEMAN, t1.VALUESEPERATOR FROM T_SRFCODELIST t1  LEFT JOIN t_srfdataentity t11 ON t1.DEID = t11.DEID
+		<![CDATA[ SELECT t1.CLPATH, t1.CLVERSION, t1.CODELISTID, t1.CODELISTNAME, t1.CREATEDATE, t1.CREATEMAN, t1.DEID, t11.DENAME, t1.EMPTYTEXT, t1.FILLER, t1.ISSYSTEM, t1.ISUSERSCOPE, t1.MEMO, t1.NOVALUEEMPTY, t1.ORMODE, t1.RESERVER, t1.RESERVER2, t1.RESERVER3, t1.RESERVER4, t1.RESERVER5, t1.SEPERATOR, t1.SRFSYSPUB, t1.SRFUSERPUB, t1.UPDATEDATE, t1.UPDATEMAN, t1.VALUESEPERATOR FROM T_SRFCODELIST t1  LEFT JOIN t_srfdataentity t11 ON t1.DEID = t11.DEID
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CLPATH`, t1.`CLVERSION`, t1.`CODELISTID`, t1.`CODELISTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPTYTEXT`, t1.`FILLER`, t1.`ISSYSTEM`, t1.`ISUSERSCOPE`, t1.`MEMO`, t1.`NOVALUEEMPTY`, t1.`ORMODE`, t1.`RESERVER`, t1.`RESERVER2`, t1.`RESERVER3`, t1.`RESERVER4`, t1.`RESERVER5`, t1.`SEPERATOR`, t1.`SRFSYSPUB`, t1.`SRFUSERPUB`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALUESEPERATOR` FROM `T_SRFCODELIST` t1  
+		<![CDATA[ SELECT t1.`CLPATH`, t1.`CLVERSION`, t1.`CODELISTID`, t1.`CODELISTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPTYTEXT`, t1.`FILLER`, t1.`ISSYSTEM`, t1.`ISUSERSCOPE`, t1.`MEMO`, t1.`NOVALUEEMPTY`, t1.`ORMODE`, t1.`RESERVER`, t1.`RESERVER2`, t1.`RESERVER3`, t1.`RESERVER4`, t1.`RESERVER5`, t1.`SEPERATOR`, t1.`SRFSYSPUB`, t1.`SRFUSERPUB`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALUESEPERATOR` FROM `T_SRFCODELIST` t1  
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="postgresql">
-       <![CDATA[	SELECT t1.CLPATH, t1.CLVERSION, t1.CODELISTID, t1.CODELISTNAME, t1.CREATEDATE, t1.CREATEMAN, t1.DEID, t11.DENAME, t1.EMPTYTEXT, t1.FILLER, t1.ISSYSTEM, t1.ISUSERSCOPE, t1.MEMO, t1.NOVALUEEMPTY, t1.ORMODE, t1.RESERVER, t1.RESERVER2, t1.RESERVER3, t1.RESERVER4, t1.RESERVER5, t1.SEPERATOR, t1.SRFSYSPUB, t1.SRFUSERPUB, t1.UPDATEDATE, t1.UPDATEMAN, t1.VALUESEPERATOR FROM T_SRFCODELIST t1  LEFT JOIN t_srfdataentity t11 ON t1.DEID = t11.DEID
+		<![CDATA[ SELECT t1.CLPATH, t1.CLVERSION, t1.CODELISTID, t1.CODELISTNAME, t1.CREATEDATE, t1.CREATEMAN, t1.DEID, t11.DENAME, t1.EMPTYTEXT, t1.FILLER, t1.ISSYSTEM, t1.ISUSERSCOPE, t1.MEMO, t1.NOVALUEEMPTY, t1.ORMODE, t1.RESERVER, t1.RESERVER2, t1.RESERVER3, t1.RESERVER4, t1.RESERVER5, t1.SEPERATOR, t1.SRFSYSPUB, t1.SRFUSERPUB, t1.UPDATEDATE, t1.UPDATEMAN, t1.VALUESEPERATOR FROM T_SRFCODELIST t1  LEFT JOIN t_srfdataentity t11 ON t1.DEID = t11.DEID
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="ppas">
-       <![CDATA[	SELECT t1.CLPATH, t1.CLVERSION, t1.CODELISTID, t1.CODELISTNAME, t1.CREATEDATE, t1.CREATEMAN, t1.DEID, t11.DENAME, t1.EMPTYTEXT, t1.FILLER, t1.ISSYSTEM, t1.ISUSERSCOPE, t1.MEMO, t1.NOVALUEEMPTY, t1.ORMODE, t1.RESERVER, t1.RESERVER2, t1.RESERVER3, t1.RESERVER4, t1.RESERVER5, t1.SEPERATOR, t1.SRFSYSPUB, t1.SRFUSERPUB, t1.UPDATEDATE, t1.UPDATEMAN, t1.VALUESEPERATOR FROM T_SRFCODELIST t1  LEFT JOIN t_srfdataentity t11 ON t1.DEID = t11.DEID
+		<![CDATA[ SELECT t1.CLPATH, t1.CLVERSION, t1.CODELISTID, t1.CODELISTNAME, t1.CREATEDATE, t1.CREATEMAN, t1.DEID, t11.DENAME, t1.EMPTYTEXT, t1.FILLER, t1.ISSYSTEM, t1.ISUSERSCOPE, t1.MEMO, t1.NOVALUEEMPTY, t1.ORMODE, t1.RESERVER, t1.RESERVER2, t1.RESERVER3, t1.RESERVER4, t1.RESERVER5, t1.SEPERATOR, t1.SRFSYSPUB, t1.SRFUSERPUB, t1.UPDATEDATE, t1.UPDATEMAN, t1.VALUESEPERATOR FROM T_SRFCODELIST t1  LEFT JOIN t_srfdataentity t11 ON t1.DEID = t11.DEID
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="sqlserver">
-       <![CDATA[	SELECT t1.[CLPATH], t1.[CLVERSION], t1.[CODELISTID], t1.[CODELISTNAME], t1.[CREATEDATE], t1.[CREATEMAN], t1.[DEID], t11.[DENAME], t1.[EMPTYTEXT], t1.[FILLER], t1.[ISSYSTEM], t1.[ISUSERSCOPE], t1.[MEMO], t1.[NOVALUEEMPTY], t1.[ORMODE], t1.[RESERVER], t1.[RESERVER2], t1.[RESERVER3], t1.[RESERVER4], t1.[RESERVER5], t1.[SEPERATOR], t1.[SRFSYSPUB], t1.[SRFUSERPUB], t1.[UPDATEDATE], t1.[UPDATEMAN], t1.[VALUESEPERATOR] FROM [T_SRFCODELIST] t1  LEFT JOIN t_srfdataentity t11 ON t1.DEID = t11.DEID
+		<![CDATA[ SELECT t1.[CLPATH], t1.[CLVERSION], t1.[CODELISTID], t1.[CODELISTNAME], t1.[CREATEDATE], t1.[CREATEMAN], t1.[DEID], t11.[DENAME], t1.[EMPTYTEXT], t1.[FILLER], t1.[ISSYSTEM], t1.[ISUSERSCOPE], t1.[MEMO], t1.[NOVALUEEMPTY], t1.[ORMODE], t1.[RESERVER], t1.[RESERVER2], t1.[RESERVER3], t1.[RESERVER4], t1.[RESERVER5], t1.[SEPERATOR], t1.[SRFSYSPUB], t1.[SRFUSERPUB], t1.[UPDATEDATE], t1.[UPDATEMAN], t1.[VALUESEPERATOR] FROM [T_SRFCODELIST] t1  LEFT JOIN t_srfdataentity t11 ON t1.DEID = t11.DEID
 			]]>
    </sql>
    <!--数据查询[PersonUse]-->
    <sql id="PersonUse" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CLPATH`, t1.`CLVERSION`, t1.`CODELISTID`, t1.`CODELISTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPTYTEXT`, t1.`FILLER`, t1.`ISSYSTEM`, t1.`ISUSERSCOPE`, t1.`MEMO`, t1.`NOVALUEEMPTY`, t1.`ORMODE`, t1.`RESERVER`, t1.`RESERVER2`, t1.`RESERVER3`, t1.`RESERVER4`, t1.`RESERVER5`, t1.`SEPERATOR`, t1.`SRFSYSPUB`, t1.`SRFUSERPUB`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALUESEPERATOR` FROM `T_SRFCODELIST` t1  
-				 WHERE 	( t1.`RESERVER3` = '1' )
+		<![CDATA[ SELECT t1.`CLPATH`, t1.`CLVERSION`, t1.`CODELISTID`, t1.`CODELISTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPTYTEXT`, t1.`FILLER`, t1.`ISSYSTEM`, t1.`ISUSERSCOPE`, t1.`MEMO`, t1.`NOVALUEEMPTY`, t1.`ORMODE`, t1.`RESERVER`, t1.`RESERVER2`, t1.`RESERVER3`, t1.`RESERVER4`, t1.`RESERVER5`, t1.`SEPERATOR`, t1.`SRFSYSPUB`, t1.`SRFUSERPUB`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALUESEPERATOR` FROM `T_SRFCODELIST` t1  
+					 WHERE 	( t1.`RESERVER3` = '1' )
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CLMODEL`, t1.`CLPARAM`, t1.`CLPATH`, t1.`CLVERSION`, t1.`CODELISTID`, t1.`CODELISTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPTYTEXT`, t1.`FILLER`, t1.`ISSYSTEM`, t1.`ISUSERSCOPE`, t1.`MEMO`, t1.`NOVALUEEMPTY`, t1.`ORMODE`, t1.`RESERVER`, t1.`RESERVER2`, t1.`RESERVER3`, t1.`RESERVER4`, t1.`RESERVER5`, t1.`SEPERATOR`, t1.`SRFSYSPUB`, t1.`SRFUSERPUB`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALUESEPERATOR` FROM `T_SRFCODELIST` t1  
+		<![CDATA[ SELECT t1.`CLMODEL`, t1.`CLPARAM`, t1.`CLPATH`, t1.`CLVERSION`, t1.`CODELISTID`, t1.`CODELISTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPTYTEXT`, t1.`FILLER`, t1.`ISSYSTEM`, t1.`ISUSERSCOPE`, t1.`MEMO`, t1.`NOVALUEEMPTY`, t1.`ORMODE`, t1.`RESERVER`, t1.`RESERVER2`, t1.`RESERVER3`, t1.`RESERVER4`, t1.`RESERVER5`, t1.`SEPERATOR`, t1.`SRFSYSPUB`, t1.`SRFUSERPUB`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALUESEPERATOR` FROM `T_SRFCODELIST` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormbmgwbz/OrmBmgwbzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormbmgwbz/OrmBmgwbzMapper.xml
@@ -47,12 +47,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GWZZSM`, t1.`NUMCOMPILATION`, t1.`ORMBMGWBZID`, t1.`ORMBMGWBZNAME`, t1.`ORMGWBZID`, t21.`ORGSECTORNAME` AS `ORMGWBZMC`, t1.`ORMPOSTID`, t11.`ORMPOSTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMBMGWBZ` t1  LEFT JOIN T_ORMPOST t11 ON t1.ORMPOSTID = t11.ORMPOSTID  LEFT JOIN T_SRFORGSECTOR t21 ON t1.ORMGWBZID = t21.ORGSECTORID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GWZZSM`, t1.`NUMCOMPILATION`, t1.`ORMBMGWBZID`, t1.`ORMBMGWBZNAME`, t1.`ORMGWBZID`, t21.`ORGSECTORNAME` AS `ORMGWBZMC`, t1.`ORMPOSTID`, t11.`ORMPOSTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMBMGWBZ` t1  LEFT JOIN T_ORMPOST t11 ON t1.ORMPOSTID = t11.ORMPOSTID  LEFT JOIN T_SRFORGSECTOR t21 ON t1.ORMGWBZID = t21.ORGSECTORID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GWZZSM`, t1.`NUMCOMPILATION`, t1.`ORMBMGWBZID`, t1.`ORMBMGWBZNAME`, t1.`ORMGWBZID`, t21.`ORGSECTORNAME` AS `ORMGWBZMC`, t1.`ORMPOSTID`, t11.`ORMPOSTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMBMGWBZ` t1  LEFT JOIN T_ORMPOST t11 ON t1.ORMPOSTID = t11.ORMPOSTID  LEFT JOIN T_SRFORGSECTOR t21 ON t1.ORMGWBZID = t21.ORGSECTORID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GWZZSM`, t1.`NUMCOMPILATION`, t1.`ORMBMGWBZID`, t1.`ORMBMGWBZNAME`, t1.`ORMGWBZID`, t21.`ORGSECTORNAME` AS `ORMGWBZMC`, t1.`ORMPOSTID`, t11.`ORMPOSTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMBMGWBZ` t1  LEFT JOIN T_ORMPOST t11 ON t1.ORMPOSTID = t11.ORMPOSTID  LEFT JOIN T_SRFORGSECTOR t21 ON t1.ORMGWBZID = t21.ORGSECTORID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormbmkqdz/OrmBmkqdzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormbmkqdz/OrmBmkqdzMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCERANGE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LAT`, t1.`LNG`, t1.`ORMBMKQDZID`, t1.`ORMBMKQDZNAME`, t1.`ORMORGDZID`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`SFMRKQDZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMBMKQDZ` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  
+		<![CDATA[ SELECT t1.`ATTENDANCERANGE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LAT`, t1.`LNG`, t1.`ORMBMKQDZID`, t1.`ORMBMKQDZNAME`, t1.`ORMORGDZID`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`SFMRKQDZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMBMKQDZ` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ATTENDANCERANGE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LAT`, t1.`LNG`, t1.`ORMBMKQDZID`, t1.`ORMBMKQDZNAME`, t1.`ORMORGDZID`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`SFMRKQDZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMBMKQDZ` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  
+		<![CDATA[ SELECT t1.`ATTENDANCERANGE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LAT`, t1.`LNG`, t1.`ORMBMKQDZID`, t1.`ORMBMKQDZNAME`, t1.`ORMORGDZID`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`SFMRKQDZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMBMKQDZ` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormdepestman/OrmDepEstManMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormdepestman/OrmDepEstManMapper.xml
@@ -47,12 +47,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`NUMCOMPILATION`, t1.`ORMDEPESTMANID`, t1.`ORMDEPESTMANNAME`, t1.`ORMDUTYID`, t11.`ORMDUTYNAME`, t1.`ORMZWBZID`, t21.`ORGSECTORNAME` AS `ORMZWBZMC`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWZZSM` FROM `T_ORMDEPESTMAN` t1  LEFT JOIN T_ORMDUTY t11 ON t1.ORMDUTYID = t11.ORMDUTYID  LEFT JOIN T_SRFORGSECTOR t21 ON t1.ORMZWBZID = t21.ORGSECTORID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`NUMCOMPILATION`, t1.`ORMDEPESTMANID`, t1.`ORMDEPESTMANNAME`, t1.`ORMDUTYID`, t11.`ORMDUTYNAME`, t1.`ORMZWBZID`, t21.`ORGSECTORNAME` AS `ORMZWBZMC`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWZZSM` FROM `T_ORMDEPESTMAN` t1  LEFT JOIN T_ORMDUTY t11 ON t1.ORMDUTYID = t11.ORMDUTYID  LEFT JOIN T_SRFORGSECTOR t21 ON t1.ORMZWBZID = t21.ORGSECTORID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`NUMCOMPILATION`, t1.`ORMDEPESTMANID`, t1.`ORMDEPESTMANNAME`, t1.`ORMDUTYID`, t11.`ORMDUTYNAME`, t1.`ORMZWBZID`, t21.`ORGSECTORNAME` AS `ORMZWBZMC`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWZZSM` FROM `T_ORMDEPESTMAN` t1  LEFT JOIN T_ORMDUTY t11 ON t1.ORMDUTYID = t11.ORMDUTYID  LEFT JOIN T_SRFORGSECTOR t21 ON t1.ORMZWBZID = t21.ORGSECTORID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`NUMCOMPILATION`, t1.`ORMDEPESTMANID`, t1.`ORMDEPESTMANNAME`, t1.`ORMDUTYID`, t11.`ORMDUTYNAME`, t1.`ORMZWBZID`, t21.`ORGSECTORNAME` AS `ORMZWBZMC`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWZZSM` FROM `T_ORMDEPESTMAN` t1  LEFT JOIN T_ORMDUTY t11 ON t1.ORMDUTYID = t11.ORMDUTYID  LEFT JOIN T_SRFORGSECTOR t21 ON t1.ORMZWBZID = t21.ORGSECTORID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormduty/OrmDutyMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormduty/OrmDutyMapper.xml
@@ -72,41 +72,41 @@

    <!--数据查询[BasDuty]-->
    <sql id="BasDuty" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
-				 WHERE 	( ( (  instr(t1.zwlb, (select  t.referjoblevel  from  v_ormorgsector  t  where  t.orgsectorid = #{srf.datacontext.srfparentkey}) ) >0 )  OR  (  instr(t1.zwlb, (select  t.referjoblevel  from  v_ormorgsector  t  where  t.orgsectorid = #{srf.datacontext.ormzwbzid}) ) >0 ) ) )
+		<![CDATA[ SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
+					 WHERE 	( ( (  instr(t1.zwlb, (select  t.referjoblevel  from  v_ormorgsector  t  where  t.orgsectorid = #{srf.datacontext.srfparentkey}) ) >0 )  OR  (  instr(t1.zwlb, (select  t.referjoblevel  from  v_ormorgsector  t  where  t.orgsectorid = #{srf.datacontext.ormzwbzid}) ) >0 ) ) )
 			]]>
    </sql>
    <!--数据查询[CurOrg]-->
    <sql id="CurOrg" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
-				 WHERE 	( ( ( ( t1.`ZWLB` LIKE '%10%'  OR  t1.`ZWLB` = '40' )  AND  ( #{srf.sessioncontext.srforgid}  in  (select t.orgid from t_srforg t where t.porgid is null) ) )  OR  ( ( t1.`ZWLB` LIKE '%20%'  OR  t1.`ZWLB` = '30'  OR  t1.`ZWLB` = '40' )  AND  ( #{srf.sessioncontext.srforgid}  not in  (select t.orgid from t_srforg t where t.porgid is null) ) ) ) )
+		<![CDATA[ SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
+					 WHERE 	( ( ( ( t1.`ZWLB` LIKE '%10%'  OR  t1.`ZWLB` = '40' )  AND  ( #{srf.sessioncontext.srforgid}  in  (select t.orgid from t_srforg t where t.porgid is null) ) )  OR  ( ( t1.`ZWLB` LIKE '%20%'  OR  t1.`ZWLB` = '30'  OR  t1.`ZWLB` = '40' )  AND  ( #{srf.sessioncontext.srforgid}  not in  (select t.orgid from t_srforg t where t.porgid is null) ) ) ) )
 			]]>
    </sql>
    <!--数据查询[CurOrgsector]-->
    <sql id="CurOrgsector" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
-				 WHERE 	( instr(t1.ZWLB, ( select REFERJOBLEVEL from T_SRFORGSECTOR where ORGSECTORID =  #{srf.datacontext.orgsectorid} ))>0 )
+		<![CDATA[ SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
+					 WHERE 	( instr(t1.ZWLB, ( select REFERJOBLEVEL from T_SRFORGSECTOR where ORGSECTORID =  #{srf.datacontext.orgsectorid} ))>0 )
 			]]>
    </sql>
    <!--数据查询[CurOrmorgsector]-->
    <sql id="CurOrmorgsector" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
+		<![CDATA[ SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
+		<![CDATA[ SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
 			]]>
    </sql>
    <!--数据查询[SrfOrgData]-->
    <sql id="SrfOrgData" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
-				 WHERE 	( ( ( ( t1.`ZWLB` LIKE '%10%'  OR  t1.`ZWLB` = '40' )  AND  ( #{srf.sessioncontext.srforgid}  in  (select t.orgid from t_srforg t where t.porgid is null) ) )  OR  ( ( t1.`ZWLB` LIKE '%20%'  OR  t1.`ZWLB` = '30'  OR  t1.`ZWLB` = '40' )  AND  ( #{srf.sessioncontext.srforgid}  not in  (select t.orgid from t_srforg t where t.porgid is null) ) ) ) )
+		<![CDATA[ SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
+					 WHERE 	( ( ( ( t1.`ZWLB` LIKE '%10%'  OR  t1.`ZWLB` = '40' )  AND  ( #{srf.sessioncontext.srforgid}  in  (select t.orgid from t_srforg t where t.porgid is null) ) )  OR  ( ( t1.`ZWLB` LIKE '%20%'  OR  t1.`ZWLB` = '30'  OR  t1.`ZWLB` = '40' )  AND  ( #{srf.sessioncontext.srforgid}  not in  (select t.orgid from t_srforg t where t.porgid is null) ) ) ) )
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
+		<![CDATA[ SELECT t1.`BXJLNX`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DYZJ`, t1.`FGLX`, t1.`NX`, t1.`ORMDUTYID`, t1.`ORMDUTYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZWJB`, t1.`ZWLB` FROM `T_ORMDUTY` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormedition/OrmEditionMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormedition/OrmEditionMapper.xml
@@ -27,12 +27,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMEDITIONID`, t1.`ORMEDITIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMEDITION` t1  
+		<![CDATA[ SELECT t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMEDITIONID`, t1.`ORMEDITIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMEDITION` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMEDITIONID`, t1.`ORMEDITIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMEDITION` t1  
+		<![CDATA[ SELECT t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMEDITIONID`, t1.`ORMEDITIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMEDITION` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormerporg/OrmErporgMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormerporg/OrmErporgMapper.xml
@@ -63,48 +63,48 @@

    <!--数据查询[CurFQXJBM]-->
    <sql id="CurFQXJBM" databaseId="mysql">
-       <![CDATA[	
+		<![CDATA[ 
 			]]>
    </sql>
    <!--数据查询[CurFQXJZBM]-->
    <sql id="CurFQXJZBM" databaseId="mysql">
-       <![CDATA[	
+		<![CDATA[ 
 			]]>
    </sql>
    <!--数据查询[CurFQXJZZ]-->
    <sql id="CurFQXJZZ" databaseId="mysql">
-       <![CDATA[	
+		<![CDATA[ 
 			]]>
    </sql>
    <!--数据查询[CX]-->
    <sql id="CX" databaseId="mysql">
-       <![CDATA[	
+		<![CDATA[ 
 			]]>
    </sql>
    <!--数据查询[CXBM]-->
    <sql id="CXBM" databaseId="mysql">
-       <![CDATA[	
+		<![CDATA[ 
 			]]>
    </sql>
    <!--数据查询[CXZBM]-->
    <sql id="CXZBM" databaseId="mysql">
-       <![CDATA[	
+		<![CDATA[ 
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT (substr(t1.`ORGCODE`,1,3)) AS `ADMCODING`, (select ormerporgname from t_ormerporg t where t.ormerporgid=t1.`OUID`) AS `BELONGOU`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DATEFROM`, t1.`DATETO`, t1.`ISENABLE`, t1.`LASTUPDATEDATE`, t1.`NUMCOMP`, t1.`ORDERNUM`, t1.`ORGADDRESSLINE1`, t1.`ORGADDRESSLINE2`, t1.`ORGADDRESSLINE3`, t1.`ORGCODE`, t1.`ORGCREATEDATE`, t1.`ORGSHORTNAME`, t1.`ORGTYPE`, t1.`ORGTYPENAME`, t1.`ORGZIPCODE`, t1.`ORMERPORGID`, t1.`ORMERPORGNAME`, t1.`OUCODE`, t1.`OUID`, t1.`PARENTORGID`, t1.`TOWNCITY`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YYFLAG` FROM `T_ORMERPORG` t1  
+		<![CDATA[ SELECT (substr(t1.`ORGCODE`,1,3)) AS `ADMCODING`, (select ormerporgname from t_ormerporg t where t.ormerporgid=t1.`OUID`) AS `BELONGOU`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DATEFROM`, t1.`DATETO`, t1.`ISENABLE`, t1.`LASTUPDATEDATE`, t1.`NUMCOMP`, t1.`ORDERNUM`, t1.`ORGADDRESSLINE1`, t1.`ORGADDRESSLINE2`, t1.`ORGADDRESSLINE3`, t1.`ORGCODE`, t1.`ORGCREATEDATE`, t1.`ORGSHORTNAME`, t1.`ORGTYPE`, t1.`ORGTYPENAME`, t1.`ORGZIPCODE`, t1.`ORMERPORGID`, t1.`ORMERPORGNAME`, t1.`OUCODE`, t1.`OUID`, t1.`PARENTORGID`, t1.`TOWNCITY`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YYFLAG` FROM `T_ORMERPORG` t1  
 			]]>
    </sql>
    <!--数据查询[LegalChoice]-->
    <sql id="LegalChoice" databaseId="mysql">
-       <![CDATA[	SELECT (substr(t1.`ORGCODE`,1,3)) AS `ADMCODING`, (select ormerporgname from t_ormerporg t where t.ormerporgid=t1.`OUID`) AS `BELONGOU`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DATEFROM`, t1.`DATETO`, t1.`ISENABLE`, t1.`LASTUPDATEDATE`, t1.`NUMCOMP`, t1.`ORDERNUM`, t1.`ORGADDRESSLINE1`, t1.`ORGADDRESSLINE2`, t1.`ORGADDRESSLINE3`, t1.`ORGCODE`, t1.`ORGCREATEDATE`, t1.`ORGSHORTNAME`, t1.`ORGTYPE`, t1.`ORGTYPENAME`, t1.`ORGZIPCODE`, t1.`ORMERPORGID`, t1.`ORMERPORGNAME`, t1.`OUCODE`, t1.`OUID`, t1.`PARENTORGID`, t1.`TOWNCITY`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YYFLAG` FROM `T_ORMERPORG` t1  
-				 WHERE 	( ( t1.orgtype  in  ('CCEED1','CCEED2','CCEED3','CCEED4','CCEED5','CCEED6','CCEED9') )  AND  ( ( length(  #{srf.datacontext.orgcode} ) = 3   and   length( t1.orgcode ) =3 )  OR  ( length(  #{srf.datacontext.orgcode} )  > 3   and  ( substr(t1.ORGCODE,1,3) )  in  (select  t.orgcode from t_ormrelation  t  where t.magunitid = #{srf.datacontext.porgid} ) ) ) )
+		<![CDATA[ SELECT (substr(t1.`ORGCODE`,1,3)) AS `ADMCODING`, (select ormerporgname from t_ormerporg t where t.ormerporgid=t1.`OUID`) AS `BELONGOU`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DATEFROM`, t1.`DATETO`, t1.`ISENABLE`, t1.`LASTUPDATEDATE`, t1.`NUMCOMP`, t1.`ORDERNUM`, t1.`ORGADDRESSLINE1`, t1.`ORGADDRESSLINE2`, t1.`ORGADDRESSLINE3`, t1.`ORGCODE`, t1.`ORGCREATEDATE`, t1.`ORGSHORTNAME`, t1.`ORGTYPE`, t1.`ORGTYPENAME`, t1.`ORGZIPCODE`, t1.`ORMERPORGID`, t1.`ORMERPORGNAME`, t1.`OUCODE`, t1.`OUID`, t1.`PARENTORGID`, t1.`TOWNCITY`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YYFLAG` FROM `T_ORMERPORG` t1  
+					 WHERE 	( ( t1.orgtype  in  ('CCEED1','CCEED2','CCEED3','CCEED4','CCEED5','CCEED6','CCEED9') )  AND  ( ( length(  #{srf.datacontext.orgcode} ) = 3   and   length( t1.orgcode ) =3 )  OR  ( length(  #{srf.datacontext.orgcode} )  > 3   and  ( substr(t1.ORGCODE,1,3) )  in  (select  t.orgcode from t_ormrelation  t  where t.magunitid = #{srf.datacontext.porgid} ) ) ) )
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT (substr(t1.`ORGCODE`,1,3)) AS `ADMCODING`, (select ormerporgname from t_ormerporg t where t.ormerporgid=t1.`OUID`) AS `BELONGOU`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DATEFROM`, t1.`DATETO`, t1.`ISENABLE`, t1.`LASTUPDATEDATE`, t1.`NUMCOMP`, t1.`ORDERNUM`, t1.`ORGADDRESSLINE1`, t1.`ORGADDRESSLINE2`, t1.`ORGADDRESSLINE3`, t1.`ORGCODE`, t1.`ORGCREATEDATE`, t1.`ORGSHORTNAME`, t1.`ORGTYPE`, t1.`ORGTYPENAME`, t1.`ORGZIPCODE`, t1.`ORMERPORGID`, t1.`ORMERPORGNAME`, t1.`OUCODE`, t1.`OUID`, t1.`PARENTORGID`, t1.`TOWNCITY`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YYFLAG` FROM `T_ORMERPORG` t1  
+		<![CDATA[ SELECT (substr(t1.`ORGCODE`,1,3)) AS `ADMCODING`, (select ormerporgname from t_ormerporg t where t.ormerporgid=t1.`OUID`) AS `BELONGOU`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DATEFROM`, t1.`DATETO`, t1.`ISENABLE`, t1.`LASTUPDATEDATE`, t1.`NUMCOMP`, t1.`ORDERNUM`, t1.`ORGADDRESSLINE1`, t1.`ORGADDRESSLINE2`, t1.`ORGADDRESSLINE3`, t1.`ORGCODE`, t1.`ORGCREATEDATE`, t1.`ORGSHORTNAME`, t1.`ORGTYPE`, t1.`ORGTYPENAME`, t1.`ORGZIPCODE`, t1.`ORMERPORGID`, t1.`ORMERPORGNAME`, t1.`OUCODE`, t1.`OUID`, t1.`PARENTORGID`, t1.`TOWNCITY`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YYFLAG` FROM `T_ORMERPORG` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormorg/OrmOrgMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormorg/OrmOrgMapper.xml
--- a/ehr-core/src/main/resources/mapper/orm/ormorgdz/OrmOrgdzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormorgdz/OrmOrgdzMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFORGADDRESS`, t1.`ORMORGDZID`, t1.`ORMORGDZNAME`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMORGDZ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFORGADDRESS`, t1.`ORMORGDZID`, t1.`ORMORGDZNAME`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMORGDZ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFORGADDRESS`, t1.`ORMORGDZID`, t1.`ORMORGDZNAME`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMORGDZ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFORGADDRESS`, t1.`ORMORGDZID`, t1.`ORMORGDZNAME`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMORGDZ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormorginfo/OrmOrgInfoMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormorginfo/OrmOrgInfoMapper.xml
--- a/ehr-core/src/main/resources/mapper/orm/ormorgsector/OrmOrgsectorMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormorgsector/OrmOrgsectorMapper.xml
--- a/ehr-core/src/main/resources/mapper/orm/ormpost/OrmPostMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormpost/OrmPostMapper.xml
--- a/ehr-core/src/main/resources/mapper/orm/ormpostdetails/OrmPostDetailsMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormpostdetails/OrmPostDetailsMapper.xml
@@ -47,12 +47,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`GWFLAG`, t11.`GWTYPE`, t11.`ISCONFIDENTIAL`, t11.`MUSTEXCYEAR`, t1.`ORMPOSTDETAILSID`, t1.`ORMPOSTDETAILSNAME`, t1.`ORMPOSTID`, t1.`ORMPOSTLIBID`, t11.`ORMPOSTLIBNAME`, t21.`ORMPOSTNAME`, t11.`POSTNATURE`, t11.`SUGEXCYEAR`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMPOSTDETAILS` t1  LEFT JOIN T_ORMPOSTLIB t11 ON t1.ORMPOSTLIBID = t11.ORMPOSTLIBID  LEFT JOIN T_ORMPOST t21 ON t1.ORMPOSTID = t21.ORMPOSTID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`GWFLAG`, t11.`GWTYPE`, t11.`ISCONFIDENTIAL`, t11.`MUSTEXCYEAR`, t1.`ORMPOSTDETAILSID`, t1.`ORMPOSTDETAILSNAME`, t1.`ORMPOSTID`, t1.`ORMPOSTLIBID`, t11.`ORMPOSTLIBNAME`, t21.`ORMPOSTNAME`, t11.`POSTNATURE`, t11.`SUGEXCYEAR`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMPOSTDETAILS` t1  LEFT JOIN T_ORMPOSTLIB t11 ON t1.ORMPOSTLIBID = t11.ORMPOSTLIBID  LEFT JOIN T_ORMPOST t21 ON t1.ORMPOSTID = t21.ORMPOSTID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`GWFLAG`, t11.`GWTYPE`, t11.`ISCONFIDENTIAL`, t11.`MUSTEXCYEAR`, t1.`ORMPOSTDETAILSID`, t1.`ORMPOSTDETAILSNAME`, t1.`ORMPOSTID`, t1.`ORMPOSTLIBID`, t11.`ORMPOSTLIBNAME`, t21.`ORMPOSTNAME`, t11.`POSTNATURE`, t11.`SUGEXCYEAR`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMPOSTDETAILS` t1  LEFT JOIN T_ORMPOSTLIB t11 ON t1.ORMPOSTLIBID = t11.ORMPOSTLIBID  LEFT JOIN T_ORMPOST t21 ON t1.ORMPOSTID = t21.ORMPOSTID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`GWFLAG`, t11.`GWTYPE`, t11.`ISCONFIDENTIAL`, t11.`MUSTEXCYEAR`, t1.`ORMPOSTDETAILSID`, t1.`ORMPOSTDETAILSNAME`, t1.`ORMPOSTID`, t1.`ORMPOSTLIBID`, t11.`ORMPOSTLIBNAME`, t21.`ORMPOSTNAME`, t11.`POSTNATURE`, t11.`SUGEXCYEAR`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMPOSTDETAILS` t1  LEFT JOIN T_ORMPOSTLIB t11 ON t1.ORMPOSTLIBID = t11.ORMPOSTLIBID  LEFT JOIN T_ORMPOST t21 ON t1.ORMPOSTID = t21.ORMPOSTID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormpostlib/OrmPostLibMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormpostlib/OrmPostLibMapper.xml
@@ -27,12 +27,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GWFLAG`, t1.`GWTYPE`, t1.`ISCONFIDENTIAL`, t1.`JOBDESC`, t1.`MUSTEXCYEAR`, t1.`ORMPOSTLIBID`, t1.`ORMPOSTLIBNAME`, t1.`POSTNATURE`, t1.`SUGEXCYEAR`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMPOSTLIB` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GWFLAG`, t1.`GWTYPE`, t1.`ISCONFIDENTIAL`, t1.`JOBDESC`, t1.`MUSTEXCYEAR`, t1.`ORMPOSTLIBID`, t1.`ORMPOSTLIBNAME`, t1.`POSTNATURE`, t1.`SUGEXCYEAR`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMPOSTLIB` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GWFLAG`, t1.`GWTYPE`, t1.`ISCONFIDENTIAL`, t1.`JOBDESC`, t1.`MUSTEXCYEAR`, t1.`ORMPOSTLIBID`, t1.`ORMPOSTLIBNAME`, t1.`POSTNATURE`, t1.`SUGEXCYEAR`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMPOSTLIB` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GWFLAG`, t1.`GWTYPE`, t1.`ISCONFIDENTIAL`, t1.`JOBDESC`, t1.`MUSTEXCYEAR`, t1.`ORMPOSTLIBID`, t1.`ORMPOSTLIBNAME`, t1.`POSTNATURE`, t1.`SUGEXCYEAR`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMPOSTLIB` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormqybzwh/OrmQybzwhMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormqybzwh/OrmQybzwhMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MS`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`ORMQYBZWHID`, t1.`ORMQYBZWHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMQYBZWH` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MS`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`ORMQYBZWHID`, t1.`ORMQYBZWHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMQYBZWH` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MS`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`ORMQYBZWHID`, t1.`ORMQYBZWHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMQYBZWH` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MS`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`ORMQYBZWHID`, t1.`ORMQYBZWHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMQYBZWH` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormqygl/OrmQyglMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormqygl/OrmQyglMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BZSM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`ORMQYGLID`, t1.`ORMQYGLNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMQYGL` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`BZSM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`ORMQYGLID`, t1.`ORMQYGLNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMQYGL` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BZSM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`ORMQYGLID`, t1.`ORMQYGLNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMQYGL` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`BZSM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`ORMQYGLID`, t1.`ORMQYGLNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMQYGL` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormrank/OrmRankMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormrank/OrmRankMapper.xml
@@ -72,42 +72,42 @@

    <!--数据查询[CurRank]-->
    <sql id="CurRank" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
-				 WHERE 	( (((select orgcode from t_srforg a where a.orgid = #{srf.sessioncontext.srforgid}) in ('BG','100','10101')) or ((select orgcode from t_srforg a where a.orgid = #{srf.sessioncontext.srforgid}) not in ('BG','100','10101')  and   t1.xh>=(select xh from t_ormrank where ormrankid='D1')) or ('ibzadmin' = (select t.loginaccountname from t_srfloginaccount t where t.loginaccountid = #{srf.sessioncontext.srfpersonid}))) )
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
+					 WHERE 	( (((select orgcode from t_srforg a where a.orgid = #{srf.sessioncontext.srforgid}) in ('BG','100','10101')) or ((select orgcode from t_srforg a where a.orgid = #{srf.sessioncontext.srforgid}) not in ('BG','100','10101')  and   t1.xh>=(select xh from t_ormrank where ormrankid='D1')) or ('ibzadmin' = (select t.loginaccountname from t_srfloginaccount t where t.loginaccountid = #{srf.sessioncontext.srfpersonid}))) )
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
 			]]>
    </sql>
    <!--数据查询[DJYX]-->
    <sql id="DJYX" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
-				 WHERE 	( t1.xh>=(select xh from t_ormrank where ormrankid='D1') )
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
+					 WHERE 	( t1.xh>=(select xh from t_ormrank where ormrankid='D1') )
 			]]>
    </sql>
    <!--数据查询[JSNRANK]-->
    <sql id="JSNRANK" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
-				 WHERE 	( ( t1.xh<(select xh from t_ormrank a where a.ormrankid=(select b.rank from v_Pimperson b where b.PIMPERSONID=#{srf.datacontext.pimpersonid}))  OR  exists ( select * from v_Pimperson b where b.rank is NULL and b.pimpersonid=#{srf.datacontext.pimpersonid} and b.enable=1 and b.jlss='10') )  AND  t1.xh>=(select xh from t_ormrank where ormrankid='D1') )
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
+					 WHERE 	( ( t1.xh<(select xh from t_ormrank a where a.ormrankid=(select b.rank from v_Pimperson b where b.PIMPERSONID=#{srf.datacontext.pimpersonid}))  OR  exists ( select * from v_Pimperson b where b.rank is NULL and b.pimpersonid=#{srf.datacontext.pimpersonid} and b.enable=1 and b.jlss='10') )  AND  t1.xh>=(select xh from t_ormrank where ormrankid='D1') )
 			]]>
    </sql>
    <!--数据查询[JSRANK]-->
    <sql id="JSRANK" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
-				 WHERE 	( ( t1.xh<(select xh from t_ormrank a where a.ormrankid=(select b.rank from v_Pimperson b where b.PIMPERSONID=#{srf.datacontext.pimpersonid}))  OR  exists ( select * from v_Pimperson b where b.rank is NULL and b.pimpersonid=#{srf.datacontext.pimpersonid} and b.enable=1 and b.jlss='10') ) )
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
+					 WHERE 	( ( t1.xh<(select xh from t_ormrank a where a.ormrankid=(select b.rank from v_Pimperson b where b.PIMPERSONID=#{srf.datacontext.pimpersonid}))  OR  exists ( select * from v_Pimperson b where b.rank is NULL and b.pimpersonid=#{srf.datacontext.pimpersonid} and b.enable=1 and b.jlss='10') ) )
 			]]>
    </sql>
    <!--数据查询[JZRANK]-->
    <sql id="JZRANK" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
-				 WHERE 	( ( t1.xh>(select xh from t_ormrank a where a.ormrankname=(select b.rank from v_pimperson b where b.PIMPERSONID=#{srf.datacontext.pimpersonid}))  OR  t1.xh>(select xh from t_ormrank a where a.ormrankname=(select b.rank from v_pimperson b where b.PIMPERSONID=#{srf.webcontext.pimpersonid})) ) )
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
+					 WHERE 	( ( t1.xh>(select xh from t_ormrank a where a.ormrankname=(select b.rank from v_pimperson b where b.PIMPERSONID=#{srf.datacontext.pimpersonid}))  OR  t1.xh>(select xh from t_ormrank a where a.ormrankname=(select b.rank from v_pimperson b where b.PIMPERSONID=#{srf.webcontext.pimpersonid})) ) )
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JYJLNX`, t1.`ORMRANKID`, t1.`ORMRANKNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZJSM` FROM `T_ORMRANK` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormrelation/OrmRelationMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormrelation/OrmRelationMapper.xml
@@ -28,12 +28,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MAGUNITID`, t1.`MANAGEMENTUNITS`, t1.`ORGCODE`, t1.`ORMRELATIONID`, t1.`ORMRELATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMRELATION` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MAGUNITID`, t1.`MANAGEMENTUNITS`, t1.`ORGCODE`, t1.`ORMRELATIONID`, t1.`ORMRELATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMRELATION` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MAGUNITID`, t1.`MANAGEMENTUNITS`, t1.`ORGCODE`, t1.`ORMRELATIONID`, t1.`ORMRELATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMRELATION` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MAGUNITID`, t1.`MANAGEMENTUNITS`, t1.`ORGCODE`, t1.`ORMRELATIONID`, t1.`ORMRELATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMRELATION` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormsignorg/OrmSignOrgMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormsignorg/OrmSignOrgMapper.xml
@@ -45,24 +45,24 @@

    <!--数据查询[CKBDWDFRZT]-->
    <sql id="CKBDWDFRZT" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGCODE`, t1.`ORMSIGNORGID`, t1.`ORMSIGNORGNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZZJC` FROM `T_ORMSIGNORG` t1  
-				 WHERE 	( ( exists( select * from T_CONTRACTSIGNORG t2 where t2.enable = 1 and t2.ormsignorgid=t1.ormsignorgid  and  t2.ormorgid  in ( select t.companyflag from t_srforg t where t.orgid in ( select ormorgid from t_pimperson where jlss='10' and pimpersonid = #{srf.datacontext.pimpersonid} ) ) )  OR  'ibzadmin' = ( select t.loginaccountname from t_srfloginaccount t where t.loginaccountid  =  #{srf.sessioncontext.srfpersonid} ) ) )
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGCODE`, t1.`ORMSIGNORGID`, t1.`ORMSIGNORGNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZZJC` FROM `T_ORMSIGNORG` t1  
+					 WHERE 	( ( exists( select * from T_CONTRACTSIGNORG t2 where t2.enable = 1 and t2.ormsignorgid=t1.ormsignorgid  and  t2.ormorgid  in ( select t.companyflag from t_srforg t where t.orgid in ( select ormorgid from t_pimperson where jlss='10' and pimpersonid = #{srf.datacontext.pimpersonid} ) ) )  OR  'ibzadmin' = ( select t.loginaccountname from t_srfloginaccount t where t.loginaccountid  =  #{srf.sessioncontext.srfpersonid} ) ) )
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGCODE`, t1.`ORMSIGNORGID`, t1.`ORMSIGNORGNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZZJC` FROM `T_ORMSIGNORG` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGCODE`, t1.`ORMSIGNORGID`, t1.`ORMSIGNORGNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZZJC` FROM `T_ORMSIGNORG` t1  
 			]]>
    </sql>
    <!--数据查询[HTQDDW]-->
    <sql id="HTQDDW" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGCODE`, t1.`ORMSIGNORGID`, t1.`ORMSIGNORGNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZZJC` FROM `T_ORMSIGNORG` t1  
-				 WHERE 	( ( exists( select * from T_CONTRACTSIGNORG t2 where  t2.enable=1 and t2.ormsignorgid=t1.ormsignorgid  and  t2.ormorgid in (select companyflag from v_ormorg a where a.orgid = #{srf.datacontext.ormorgid}) ) ) )
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGCODE`, t1.`ORMSIGNORGID`, t1.`ORMSIGNORGNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZZJC` FROM `T_ORMSIGNORG` t1  
+					 WHERE 	( ( exists( select * from T_CONTRACTSIGNORG t2 where  t2.enable=1 and t2.ormsignorgid=t1.ormsignorgid  and  t2.ormorgid in (select companyflag from v_ormorg a where a.orgid = #{srf.datacontext.ormorgid}) ) ) )
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGCODE`, t1.`ORMSIGNORGID`, t1.`ORMSIGNORGNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZZJC` FROM `T_ORMSIGNORG` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGCODE`, t1.`ORMSIGNORGID`, t1.`ORMSIGNORGNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZZJC` FROM `T_ORMSIGNORG` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormtitle/OrmTitleMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormtitle/OrmTitleMapper.xml
@@ -27,12 +27,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMTITLEID`, t1.`ORMTITLENAME`, t1.`TITLETYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMTITLE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMTITLEID`, t1.`ORMTITLENAME`, t1.`TITLETYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMTITLE` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMTITLEID`, t1.`ORMTITLENAME`, t1.`TITLETYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMTITLE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMTITLEID`, t1.`ORMTITLENAME`, t1.`TITLETYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_ORMTITLE` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormunitedperson/OrmUnitedPersonMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormunitedperson/OrmUnitedPersonMapper.xml
@@ -45,28 +45,28 @@

    <!--数据查询[CurFQXJYH]-->
    <sql id="CurFQXJYH" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHREMPID`, t1.`EMPID`, t1.`EMPLOYEENAME`, t1.`EMPLOYEENUMBER`, t1.`ENABLE`, t1.`FULLNAME`, t1.`IDNUMBER`, t1.`ISEMPLOYEE`, t1.`REFERMARK`, t1.`SEX`, t1.`UNITEDPERSONID`, t1.`UNITEDPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERNAME` FROM `T_UNITEDPERSON` t1  
-				 WHERE 	t1.ENABLE = 1
-					 AND ( t1.`REFERMARK` = '0' )
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHREMPID`, t1.`EMPID`, t1.`EMPLOYEENAME`, t1.`EMPLOYEENUMBER`, t1.`ENABLE`, t1.`FULLNAME`, t1.`IDNUMBER`, t1.`ISEMPLOYEE`, t1.`REFERMARK`, t1.`SEX`, t1.`UNITEDPERSONID`, t1.`UNITEDPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERNAME` FROM `T_UNITEDPERSON` t1  
+					 WHERE 	t1.ENABLE = 1
+						 AND ( t1.`REFERMARK` = '0' )
 			]]>
    </sql>
    <!--数据查询[CXYH]-->
    <sql id="CXYH" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHREMPID`, t1.`EMPID`, t1.`EMPLOYEENAME`, t1.`EMPLOYEENUMBER`, t1.`ENABLE`, t1.`FULLNAME`, t1.`IDNUMBER`, t1.`ISEMPLOYEE`, t1.`REFERMARK`, t1.`SEX`, t1.`UNITEDPERSONID`, t1.`UNITEDPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERNAME` FROM `T_UNITEDPERSON` t1  
-				 WHERE 	t1.ENABLE = 1
-					 AND ( ( t1.employeenumber in (select ygbh from t_pimperson a where a.jlss='10' and   a.ormorgid in (select t.orgid from t_srforg t where instr(t.levelcode, ( select b.levelcode from t_srforg b where b.orgid = #{srf.sessioncontext.srforgid} ))=1 ))  OR  'ibzadmin' = ( select t.loginaccountname from t_srfloginaccount t where t.loginaccountid  =  #{srf.sessioncontext.srfpersonid} ) ) )
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHREMPID`, t1.`EMPID`, t1.`EMPLOYEENAME`, t1.`EMPLOYEENUMBER`, t1.`ENABLE`, t1.`FULLNAME`, t1.`IDNUMBER`, t1.`ISEMPLOYEE`, t1.`REFERMARK`, t1.`SEX`, t1.`UNITEDPERSONID`, t1.`UNITEDPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERNAME` FROM `T_UNITEDPERSON` t1  
+					 WHERE 	t1.ENABLE = 1
+						 AND ( ( t1.employeenumber in (select ygbh from t_pimperson a where a.jlss='10' and   a.ormorgid in (select t.orgid from t_srforg t where instr(t.levelcode, ( select b.levelcode from t_srforg b where b.orgid = #{srf.sessioncontext.srforgid} ))=1 ))  OR  'ibzadmin' = ( select t.loginaccountname from t_srfloginaccount t where t.loginaccountid  =  #{srf.sessioncontext.srfpersonid} ) ) )
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHREMPID`, t1.`EMPID`, t1.`EMPLOYEENAME`, t1.`EMPLOYEENUMBER`, t1.`ENABLE`, t1.`FULLNAME`, t1.`IDNUMBER`, t1.`ISEMPLOYEE`, t1.`REFERMARK`, t1.`SEX`, t1.`UNITEDPERSONID`, t1.`UNITEDPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERNAME` FROM `T_UNITEDPERSON` t1  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHREMPID`, t1.`EMPID`, t1.`EMPLOYEENAME`, t1.`EMPLOYEENUMBER`, t1.`ENABLE`, t1.`FULLNAME`, t1.`IDNUMBER`, t1.`ISEMPLOYEE`, t1.`REFERMARK`, t1.`SEX`, t1.`UNITEDPERSONID`, t1.`UNITEDPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERNAME` FROM `T_UNITEDPERSON` t1  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHREMPID`, t1.`EMPID`, t1.`EMPLOYEENAME`, t1.`EMPLOYEENUMBER`, t1.`ENABLE`, t1.`FULLNAME`, t1.`IDNUMBER`, t1.`ISEMPLOYEE`, t1.`REFERMARK`, t1.`SEX`, t1.`UNITEDPERSONID`, t1.`UNITEDPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERNAME` FROM `T_UNITEDPERSON` t1  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHREMPID`, t1.`EMPID`, t1.`EMPLOYEENAME`, t1.`EMPLOYEENUMBER`, t1.`ENABLE`, t1.`FULLNAME`, t1.`IDNUMBER`, t1.`ISEMPLOYEE`, t1.`REFERMARK`, t1.`SEX`, t1.`UNITEDPERSONID`, t1.`UNITEDPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERNAME` FROM `T_UNITEDPERSON` t1  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormuser/OrmUserMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormuser/OrmUserMapper.xml
@@ -56,19 +56,19 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPID`, t1.`MEMO`, t1.`ORGID`, t1.`ORGNAME`, t1.`ORGSECTORID`, t1.`ORGSECTORNAME`, t1.`ORGUSERID`, t1.`ORGUSERNAME`, t1.`UNUSERID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERCODE`, t1.`VALIDFLAG` FROM `T_SRFORGUSER` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPID`, t1.`MEMO`, t1.`ORGID`, t1.`ORGNAME`, t1.`ORGSECTORID`, t1.`ORGSECTORNAME`, t1.`ORGUSERID`, t1.`ORGUSERNAME`, t1.`UNUSERID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERCODE`, t1.`VALIDFLAG` FROM `T_SRFORGUSER` t1  
 			]]>
    </sql>
    <!--数据查询[DQZZJXJZZ]-->
    <sql id="DQZZJXJZZ" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPID`, t1.`MEMO`, t1.`ORGID`, t1.`ORGNAME`, t1.`ORGSECTORID`, t1.`ORGSECTORNAME`, t1.`ORGUSERID`, t1.`ORGUSERNAME`, t1.`UNUSERID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERCODE`, t1.`VALIDFLAG` FROM `T_SRFORGUSER` t1  LEFT JOIN T_SRFORG t11 ON t1.ORGID = t11.ORGID  
-				 WHERE 	( ( t11.`ORGID` =  #{srf.sessioncontext.srforgid}  OR  '64BCDCC1-24AA-42E4-AC7A-FB6F242F3FF1' = #{srf.sessioncontext.srforgid}  OR  'ibzadmin' = (select t.loginaccountname from t_srfloginaccount t where t.loginaccountid = #{srf.sessioncontext.srfpersonid})  OR  instr(t11.levelcode, ( select a.levelcode from t_srforg a where a.orgid = #{srf.sessioncontext.srforgid} ) )=1 ) )
-					 AND ( t1.`VALIDFLAG` = 1 )
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPID`, t1.`MEMO`, t1.`ORGID`, t1.`ORGNAME`, t1.`ORGSECTORID`, t1.`ORGSECTORNAME`, t1.`ORGUSERID`, t1.`ORGUSERNAME`, t1.`UNUSERID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERCODE`, t1.`VALIDFLAG` FROM `T_SRFORGUSER` t1  LEFT JOIN T_SRFORG t11 ON t1.ORGID = t11.ORGID  
+					 WHERE 	( ( t11.`ORGID` =  #{srf.sessioncontext.srforgid}  OR  '64BCDCC1-24AA-42E4-AC7A-FB6F242F3FF1' = #{srf.sessioncontext.srforgid}  OR  'ibzadmin' = (select t.loginaccountname from t_srfloginaccount t where t.loginaccountid = #{srf.sessioncontext.srfpersonid})  OR  instr(t11.levelcode, ( select a.levelcode from t_srforg a where a.orgid = #{srf.sessioncontext.srforgid} ) )=1 ) )
+						 AND ( t1.`VALIDFLAG` = 1 )
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPID`, t1.`MEMO`, t1.`ORGID`, t1.`ORGNAME`, t1.`ORGSECTORID`, t1.`ORGSECTORNAME`, t1.`ORGUSERID`, t1.`ORGUSERNAME`, t1.`UNUSERID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERCODE`, t1.`VALIDFLAG` FROM `T_SRFORGUSER` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPID`, t1.`MEMO`, t1.`ORGID`, t1.`ORGNAME`, t1.`ORGSECTORID`, t1.`ORGSECTORNAME`, t1.`ORGUSERID`, t1.`ORGUSERNAME`, t1.`UNUSERID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERCODE`, t1.`VALIDFLAG` FROM `T_SRFORGUSER` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormxmbmx/OrmXmbmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormxmbmx/OrmXmbmxMapper.xml
@@ -47,12 +47,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`ORMXMBMXID`, t1.`ORMXMBMXNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`XMRYLX`, t1.`ZSBH`, t1.`ZSMC` FROM `T_ORMXMBMX` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`ORMXMBMXID`, t1.`ORMXMBMXNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`XMRYLX`, t1.`ZSBH`, t1.`ZSMC` FROM `T_ORMXMBMX` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`ORMXMBMXID`, t1.`ORMXMBMXNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`XMRYLX`, t1.`ZSBH`, t1.`ZSMC` FROM `T_ORMXMBMX` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`ORMXMBMXID`, t1.`ORMXMBMXNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`XMRYLX`, t1.`ZSBH`, t1.`ZSMC` FROM `T_ORMXMBMX` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormxmbq/OrmXmbqMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormxmbq/OrmXmbqMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`ORMXMBQID`, t1.`ORMXMBQNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMXMBQ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`ORMXMBQID`, t1.`ORMXMBQNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMXMBQ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`ORMXMBQID`, t1.`ORMXMBQNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMXMBQ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORMORGID` AS `ORGID`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`ORMXMBQID`, t1.`ORMXMBQNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_ORMXMBQ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormxmgl/OrmXmglMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormxmgl/OrmXmglMapper.xml
@@ -47,18 +47,18 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHR_ORG_ID`, t1.`ENGINEERINGBUSTYPE`, t1.`ENGINEERINGPURPOSE`, t1.`ENGINEERINGSCALE`, t1.`ISDIRECTLYMANAGE`, t1.`ORG_ID`, t1.`ORMXMGLID`, t1.`ORMXMGLNAME`, t1.`PROCAPITALATT`, t1.`PROJECT_FULL_NAME`, t1.`PROJECT_NAME`, t1.`PROJECT_NUMBER`, t1.`PROJECT_SIZE`, t1.`PROJECT_STATUS_CODE`, t1.`PROJECT_STATUS_NAME`, t1.`PROJECT_TYPE`, t1.`TARGET_FINISH_DATE`, t1.`TARGET_START_DATE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XMBH` FROM `T_ORMXMGL` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHR_ORG_ID`, t1.`ENGINEERINGBUSTYPE`, t1.`ENGINEERINGPURPOSE`, t1.`ENGINEERINGSCALE`, t1.`ISDIRECTLYMANAGE`, t1.`ORG_ID`, t1.`ORMXMGLID`, t1.`ORMXMGLNAME`, t1.`PROCAPITALATT`, t1.`PROJECT_FULL_NAME`, t1.`PROJECT_NAME`, t1.`PROJECT_NUMBER`, t1.`PROJECT_SIZE`, t1.`PROJECT_STATUS_CODE`, t1.`PROJECT_STATUS_NAME`, t1.`PROJECT_TYPE`, t1.`TARGET_FINISH_DATE`, t1.`TARGET_START_DATE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XMBH` FROM `T_ORMXMGL` t1  
 			]]>
    </sql>
    <!--数据查询[ValidPro]-->
    <sql id="ValidPro" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHR_ORG_ID`, t1.`ENGINEERINGBUSTYPE`, t1.`ENGINEERINGPURPOSE`, t1.`ENGINEERINGSCALE`, t1.`ISDIRECTLYMANAGE`, t1.`ORG_ID`, t1.`ORMXMGLID`, t1.`ORMXMGLNAME`, t1.`PROCAPITALATT`, t1.`PROJECT_FULL_NAME`, t1.`PROJECT_NAME`, t1.`PROJECT_NUMBER`, t1.`PROJECT_SIZE`, t1.`PROJECT_STATUS_CODE`, t1.`PROJECT_STATUS_NAME`, t1.`PROJECT_TYPE`, t1.`TARGET_FINISH_DATE`, t1.`TARGET_START_DATE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XMBH` FROM `T_ORMXMGL` t1  
-				 WHERE 	( t1.`PROJECT_TYPE` <> '营销开拓'  AND  ( instr(t1.project_number,'T')  <>1 ) )
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHR_ORG_ID`, t1.`ENGINEERINGBUSTYPE`, t1.`ENGINEERINGPURPOSE`, t1.`ENGINEERINGSCALE`, t1.`ISDIRECTLYMANAGE`, t1.`ORG_ID`, t1.`ORMXMGLID`, t1.`ORMXMGLNAME`, t1.`PROCAPITALATT`, t1.`PROJECT_FULL_NAME`, t1.`PROJECT_NAME`, t1.`PROJECT_NUMBER`, t1.`PROJECT_SIZE`, t1.`PROJECT_STATUS_CODE`, t1.`PROJECT_STATUS_NAME`, t1.`PROJECT_TYPE`, t1.`TARGET_FINISH_DATE`, t1.`TARGET_START_DATE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XMBH` FROM `T_ORMXMGL` t1  
+					 WHERE 	( t1.`PROJECT_TYPE` <> '营销开拓'  AND  ( instr(t1.project_number,'T')  <>1 ) )
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHR_ORG_ID`, t1.`ENGINEERINGBUSTYPE`, t1.`ENGINEERINGPURPOSE`, t1.`ENGINEERINGSCALE`, t1.`ISDIRECTLYMANAGE`, t1.`ORG_ID`, t1.`ORMXMGLID`, t1.`ORMXMGLNAME`, t1.`PROCAPITALATT`, t1.`PROJECT_FULL_NAME`, t1.`PROJECT_NAME`, t1.`PROJECT_NUMBER`, t1.`PROJECT_SIZE`, t1.`PROJECT_STATUS_CODE`, t1.`PROJECT_STATUS_NAME`, t1.`PROJECT_TYPE`, t1.`TARGET_FINISH_DATE`, t1.`TARGET_START_DATE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XMBH` FROM `T_ORMXMGL` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EHR_ORG_ID`, t1.`ENGINEERINGBUSTYPE`, t1.`ENGINEERINGPURPOSE`, t1.`ENGINEERINGSCALE`, t1.`ISDIRECTLYMANAGE`, t1.`ORG_ID`, t1.`ORMXMGLID`, t1.`ORMXMGLNAME`, t1.`PROCAPITALATT`, t1.`PROJECT_FULL_NAME`, t1.`PROJECT_NAME`, t1.`PROJECT_NUMBER`, t1.`PROJECT_SIZE`, t1.`PROJECT_STATUS_CODE`, t1.`PROJECT_STATUS_NAME`, t1.`PROJECT_TYPE`, t1.`TARGET_FINISH_DATE`, t1.`TARGET_START_DATE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XMBH` FROM `T_ORMXMGL` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormxmrlcb/OrmXmrlcbMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormxmrlcb/OrmXmrlcbMapper.xml
@@ -38,17 +38,17 @@

    <!--数据查询[CBCX]-->
    <sql id="CBCX" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGID`, t1.`ORMXMRLCBID`, t1.`ORMXMRLCBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XCED`, t1.`XCRY`, ( case when  t1.`XMSJRY`>t1.`XMJHRY`  then  '20'  else  '30'  end ) AS `XCRY_COLOR`, t1.`XM`, t1.`XMB`, t1.`XMJHRY`, t1.`XMJHZCCB`, t1.`XMSJRY`, ( case when  t1.`XMSJRY`>t1.`XMJHRY`  then  '20'  else  '30'  end ) AS `XMSJRY_COLOR`, t1.`XMSJZCCB`, t1.`ZZMC` FROM `T_ORMXMRLCB` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGID`, t1.`ORMXMRLCBID`, t1.`ORMXMRLCBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XCED`, t1.`XCRY`, ( case when  t1.`XMSJRY`>t1.`XMJHRY`  then  '20'  else  '30'  end ) AS `XCRY_COLOR`, t1.`XM`, t1.`XMB`, t1.`XMJHRY`, t1.`XMJHZCCB`, t1.`XMSJRY`, ( case when  t1.`XMSJRY`>t1.`XMJHRY`  then  '20'  else  '30'  end ) AS `XMSJRY_COLOR`, t1.`XMSJZCCB`, t1.`ZZMC` FROM `T_ORMXMRLCB` t1  
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGID`, t1.`ORMXMRLCBID`, t1.`ORMXMRLCBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XCED`, t1.`XCRY`, ( case when  t1.`XMSJRY`>t1.`XMJHRY`  then  '20'  else  '30'  end ) AS `XCRY_COLOR`, t1.`XM`, t1.`XMB`, t1.`XMJHRY`, t1.`XMJHZCCB`, t1.`XMSJRY`, ( case when  t1.`XMSJRY`>t1.`XMJHRY`  then  '20'  else  '30'  end ) AS `XMSJRY_COLOR`, t1.`XMSJZCCB`, t1.`ZZMC` FROM `T_ORMXMRLCB` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGID`, t1.`ORMXMRLCBID`, t1.`ORMXMRLCBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XCED`, t1.`XCRY`, ( case when  t1.`XMSJRY`>t1.`XMJHRY`  then  '20'  else  '30'  end ) AS `XCRY_COLOR`, t1.`XM`, t1.`XMB`, t1.`XMJHRY`, t1.`XMJHZCCB`, t1.`XMSJRY`, ( case when  t1.`XMSJRY`>t1.`XMJHRY`  then  '20'  else  '30'  end ) AS `XMSJRY_COLOR`, t1.`XMSJZCCB`, t1.`ZZMC` FROM `T_ORMXMRLCB` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGID`, t1.`ORMXMRLCBID`, t1.`ORMXMRLCBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XCED`, t1.`XCRY`, ( case when  t1.`XMSJRY`>t1.`XMJHRY`  then  '20'  else  '30'  end ) AS `XCRY_COLOR`, t1.`XM`, t1.`XMB`, t1.`XMJHRY`, t1.`XMJHZCCB`, t1.`XMSJRY`, ( case when  t1.`XMSJRY`>t1.`XMJHRY`  then  '20'  else  '30'  end ) AS `XMSJRY_COLOR`, t1.`XMSJZCCB`, t1.`ZZMC` FROM `T_ORMXMRLCB` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ORGID`, t1.`ORMXMRLCBID`, t1.`ORMXMRLCBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XCED`, t1.`XCRY`, ( case when  t1.`XMSJRY`>t1.`XMJHRY`  then  '20'  else  '30'  end ) AS `XCRY_COLOR`, t1.`XM`, t1.`XMB`, t1.`XMJHRY`, t1.`XMJHZCCB`, t1.`XMSJRY`, ( case when  t1.`XMSJRY`>t1.`XMJHRY`  then  '20'  else  '30'  end ) AS `XMSJRY_COLOR`, t1.`XMSJZCCB`, t1.`ZZMC` FROM `T_ORMXMRLCB` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormxmrypzxq/OrmXmrypzxqMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormxmrypzxq/OrmXmrypzxqMapper.xml
--- a/ehr-core/src/main/resources/mapper/orm/ormxmsfhz/OrmXmsfhzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormxmsfhz/OrmXmsfhzMapper.xml
@@ -48,18 +48,18 @@

    <!--数据查询[AccOrg]-->
    <sql id="AccOrg" databaseId="mysql">
-       <![CDATA[	SELECT t1.`APY`, ( case when  t1.`APY`<0  then  '20'  else  '30'  end ) AS `APY_COLOR`, t1.`AUGY`, ( case when  t1.`AUGY`<0  then  '20'  else  '30'  end ) AS `AUGY_COLOR`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EY`, ( case when  t1.`EY`<0  then  '20'  else  '30'  end ) AS `EY_COLOR`, t1.`GW`, t1.`JY`, ( case when  t1.`JY`<0  then  '20'  else  '30'  end ) AS `JY_COLOR`, t1.`LY`, ( case when  t1.`LY`<0  then  '20'  else  '30'  end ) AS `LY_COLOR`, t1.`MONTH`, t1.`ND`, t1.`OCTY`, ( case when  t1.`OCTY`<0  then  '20'  else  '30'  end ) AS `OCTY_COLOR`, t1.`ORGID`, t1.`ORMXMSFHZID`, t1.`ORMXMSFHZNAME`, t1.`QY`, ( case when  t1.`QY`<0  then  '20'  else  '30'  end ) AS `QY_COLOR`, t1.`RS`, t1.`SY`, t1.`SYY`, ( case when  t1.`SYY`<0  then  '20'  else  '30'  end ) AS `SYY_COLOR`, ( case when  t1.`SY`<0  then  '20'  else  '30'  end ) AS `SY_COLOR`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WY`, ( case when  t1.`WY`<0  then  '20'  else  '30'  end ) AS `WY_COLOR`, t1.`XH`, t1.`XM`, t1.`YF`, ( case when  t1.`YF`<0  then  '20'  else  '30'  end ) AS `YF_COLOR`, t1.`YY`, ( case when  t1.`YY`<0  then  '20'  else  '30'  end ) AS `YY_COLOR`, t1.`ZZ` FROM `T_ORMXMSFHZ` t1  
-				 WHERE 	( t1.`MONTH` IS NULL )
+		<![CDATA[ SELECT t1.`APY`, ( case when  t1.`APY`<0  then  '20'  else  '30'  end ) AS `APY_COLOR`, t1.`AUGY`, ( case when  t1.`AUGY`<0  then  '20'  else  '30'  end ) AS `AUGY_COLOR`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EY`, ( case when  t1.`EY`<0  then  '20'  else  '30'  end ) AS `EY_COLOR`, t1.`GW`, t1.`JY`, ( case when  t1.`JY`<0  then  '20'  else  '30'  end ) AS `JY_COLOR`, t1.`LY`, ( case when  t1.`LY`<0  then  '20'  else  '30'  end ) AS `LY_COLOR`, t1.`MONTH`, t1.`ND`, t1.`OCTY`, ( case when  t1.`OCTY`<0  then  '20'  else  '30'  end ) AS `OCTY_COLOR`, t1.`ORGID`, t1.`ORMXMSFHZID`, t1.`ORMXMSFHZNAME`, t1.`QY`, ( case when  t1.`QY`<0  then  '20'  else  '30'  end ) AS `QY_COLOR`, t1.`RS`, t1.`SY`, t1.`SYY`, ( case when  t1.`SYY`<0  then  '20'  else  '30'  end ) AS `SYY_COLOR`, ( case when  t1.`SY`<0  then  '20'  else  '30'  end ) AS `SY_COLOR`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WY`, ( case when  t1.`WY`<0  then  '20'  else  '30'  end ) AS `WY_COLOR`, t1.`XH`, t1.`XM`, t1.`YF`, ( case when  t1.`YF`<0  then  '20'  else  '30'  end ) AS `YF_COLOR`, t1.`YY`, ( case when  t1.`YY`<0  then  '20'  else  '30'  end ) AS `YY_COLOR`, t1.`ZZ` FROM `T_ORMXMSFHZ` t1  
+					 WHERE 	( t1.`MONTH` IS NULL )
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`APY`, ( case when  t1.`APY`<0  then  '20'  else  '30'  end ) AS `APY_COLOR`, t1.`AUGY`, ( case when  t1.`AUGY`<0  then  '20'  else  '30'  end ) AS `AUGY_COLOR`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EY`, ( case when  t1.`EY`<0  then  '20'  else  '30'  end ) AS `EY_COLOR`, t1.`GW`, t1.`JY`, ( case when  t1.`JY`<0  then  '20'  else  '30'  end ) AS `JY_COLOR`, t1.`LY`, ( case when  t1.`LY`<0  then  '20'  else  '30'  end ) AS `LY_COLOR`, t1.`MONTH`, t1.`ND`, t1.`OCTY`, ( case when  t1.`OCTY`<0  then  '20'  else  '30'  end ) AS `OCTY_COLOR`, t1.`ORGID`, t1.`ORMXMSFHZID`, t1.`ORMXMSFHZNAME`, t1.`QY`, ( case when  t1.`QY`<0  then  '20'  else  '30'  end ) AS `QY_COLOR`, t1.`RS`, t1.`SY`, t1.`SYY`, ( case when  t1.`SYY`<0  then  '20'  else  '30'  end ) AS `SYY_COLOR`, ( case when  t1.`SY`<0  then  '20'  else  '30'  end ) AS `SY_COLOR`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WY`, ( case when  t1.`WY`<0  then  '20'  else  '30'  end ) AS `WY_COLOR`, t1.`XH`, t1.`XM`, t1.`YF`, ( case when  t1.`YF`<0  then  '20'  else  '30'  end ) AS `YF_COLOR`, t1.`YY`, ( case when  t1.`YY`<0  then  '20'  else  '30'  end ) AS `YY_COLOR`, t1.`ZZ` FROM `T_ORMXMSFHZ` t1  
+		<![CDATA[ SELECT t1.`APY`, ( case when  t1.`APY`<0  then  '20'  else  '30'  end ) AS `APY_COLOR`, t1.`AUGY`, ( case when  t1.`AUGY`<0  then  '20'  else  '30'  end ) AS `AUGY_COLOR`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EY`, ( case when  t1.`EY`<0  then  '20'  else  '30'  end ) AS `EY_COLOR`, t1.`GW`, t1.`JY`, ( case when  t1.`JY`<0  then  '20'  else  '30'  end ) AS `JY_COLOR`, t1.`LY`, ( case when  t1.`LY`<0  then  '20'  else  '30'  end ) AS `LY_COLOR`, t1.`MONTH`, t1.`ND`, t1.`OCTY`, ( case when  t1.`OCTY`<0  then  '20'  else  '30'  end ) AS `OCTY_COLOR`, t1.`ORGID`, t1.`ORMXMSFHZID`, t1.`ORMXMSFHZNAME`, t1.`QY`, ( case when  t1.`QY`<0  then  '20'  else  '30'  end ) AS `QY_COLOR`, t1.`RS`, t1.`SY`, t1.`SYY`, ( case when  t1.`SYY`<0  then  '20'  else  '30'  end ) AS `SYY_COLOR`, ( case when  t1.`SY`<0  then  '20'  else  '30'  end ) AS `SY_COLOR`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WY`, ( case when  t1.`WY`<0  then  '20'  else  '30'  end ) AS `WY_COLOR`, t1.`XH`, t1.`XM`, t1.`YF`, ( case when  t1.`YF`<0  then  '20'  else  '30'  end ) AS `YF_COLOR`, t1.`YY`, ( case when  t1.`YY`<0  then  '20'  else  '30'  end ) AS `YY_COLOR`, t1.`ZZ` FROM `T_ORMXMSFHZ` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`APY`, ( case when  t1.`APY`<0  then  '20'  else  '30'  end ) AS `APY_COLOR`, t1.`AUGY`, ( case when  t1.`AUGY`<0  then  '20'  else  '30'  end ) AS `AUGY_COLOR`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EY`, ( case when  t1.`EY`<0  then  '20'  else  '30'  end ) AS `EY_COLOR`, t1.`GW`, t1.`JY`, ( case when  t1.`JY`<0  then  '20'  else  '30'  end ) AS `JY_COLOR`, t1.`LY`, ( case when  t1.`LY`<0  then  '20'  else  '30'  end ) AS `LY_COLOR`, t1.`MONTH`, t1.`ND`, t1.`OCTY`, ( case when  t1.`OCTY`<0  then  '20'  else  '30'  end ) AS `OCTY_COLOR`, t1.`ORGID`, t1.`ORMXMSFHZID`, t1.`ORMXMSFHZNAME`, t1.`QY`, ( case when  t1.`QY`<0  then  '20'  else  '30'  end ) AS `QY_COLOR`, t1.`RS`, t1.`SY`, t1.`SYY`, ( case when  t1.`SYY`<0  then  '20'  else  '30'  end ) AS `SYY_COLOR`, ( case when  t1.`SY`<0  then  '20'  else  '30'  end ) AS `SY_COLOR`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WY`, ( case when  t1.`WY`<0  then  '20'  else  '30'  end ) AS `WY_COLOR`, t1.`XH`, t1.`XM`, t1.`YF`, ( case when  t1.`YF`<0  then  '20'  else  '30'  end ) AS `YF_COLOR`, t1.`YY`, ( case when  t1.`YY`<0  then  '20'  else  '30'  end ) AS `YY_COLOR`, t1.`ZZ` FROM `T_ORMXMSFHZ` t1  
+		<![CDATA[ SELECT t1.`APY`, ( case when  t1.`APY`<0  then  '20'  else  '30'  end ) AS `APY_COLOR`, t1.`AUGY`, ( case when  t1.`AUGY`<0  then  '20'  else  '30'  end ) AS `AUGY_COLOR`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EY`, ( case when  t1.`EY`<0  then  '20'  else  '30'  end ) AS `EY_COLOR`, t1.`GW`, t1.`JY`, ( case when  t1.`JY`<0  then  '20'  else  '30'  end ) AS `JY_COLOR`, t1.`LY`, ( case when  t1.`LY`<0  then  '20'  else  '30'  end ) AS `LY_COLOR`, t1.`MONTH`, t1.`ND`, t1.`OCTY`, ( case when  t1.`OCTY`<0  then  '20'  else  '30'  end ) AS `OCTY_COLOR`, t1.`ORGID`, t1.`ORMXMSFHZID`, t1.`ORMXMSFHZNAME`, t1.`QY`, ( case when  t1.`QY`<0  then  '20'  else  '30'  end ) AS `QY_COLOR`, t1.`RS`, t1.`SY`, t1.`SYY`, ( case when  t1.`SYY`<0  then  '20'  else  '30'  end ) AS `SYY_COLOR`, ( case when  t1.`SY`<0  then  '20'  else  '30'  end ) AS `SY_COLOR`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WY`, ( case when  t1.`WY`<0  then  '20'  else  '30'  end ) AS `WY_COLOR`, t1.`XH`, t1.`XM`, t1.`YF`, ( case when  t1.`YF`<0  then  '20'  else  '30'  end ) AS `YF_COLOR`, t1.`YY`, ( case when  t1.`YY`<0  then  '20'  else  '30'  end ) AS `YY_COLOR`, t1.`ZZ` FROM `T_ORMXMSFHZ` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormxmxqhz/OrmXmxqhzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormxmxqhz/OrmXmxqhzMapper.xml
@@ -36,18 +36,18 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GW`, t1.`ND`, t1.`ORGID`, t1.`ORMXMXQHZID`, t1.`ORMXMXQHZNAME`, t1.`RS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`XM`, t1.`XMID`, t1.`YF`, t1.`ZZ` FROM `T_ORMXMXQHZ` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GW`, t1.`ND`, t1.`ORGID`, t1.`ORMXMXQHZID`, t1.`ORMXMXQHZNAME`, t1.`RS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`XM`, t1.`XMID`, t1.`YF`, t1.`ZZ` FROM `T_ORMXMXQHZ` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GW`, t1.`ND`, t1.`ORGID`, t1.`ORMXMXQHZID`, t1.`ORMXMXQHZNAME`, t1.`RS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`XM`, t1.`XMID`, t1.`YF`, t1.`ZZ` FROM `T_ORMXMXQHZ` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GW`, t1.`ND`, t1.`ORGID`, t1.`ORMXMXQHZID`, t1.`ORMXMXQHZNAME`, t1.`RS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`XM`, t1.`XMID`, t1.`YF`, t1.`ZZ` FROM `T_ORMXMXQHZ` t1  
 			]]>
    </sql>
    <!--数据查询[XMRYQKMX]-->
    <sql id="XMRYQKMX" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GW`, t1.`ND`, t1.`ORGID`, t1.`ORMXMXQHZID`, t1.`ORMXMXQHZNAME`, t1.`RS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`XM`, t1.`XMID`, t1.`YF`, t1.`ZZ` FROM `T_ORMXMXQHZ` t1  
-				 WHERE 	( t1.`XM` <> '0'  AND  t1.`GW` =  #{srf.webcontext.gw}  AND  t1.`ND` =  #{srf.webcontext.nd}  AND  ( t1.`ORGID` =  #{srf.webcontext.orgid}  OR  instr((select b.levelcode from t_srforg b where b.orgid = t1.orgid), ( select a.levelcode from t_srforg a where a.orgid = #{srf.webcontext.orgid} ) )=1 ) )
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GW`, t1.`ND`, t1.`ORGID`, t1.`ORMXMXQHZID`, t1.`ORMXMXQHZNAME`, t1.`RS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`XM`, t1.`XMID`, t1.`YF`, t1.`ZZ` FROM `T_ORMXMXQHZ` t1  
+					 WHERE 	( t1.`XM` <> '0'  AND  t1.`GW` =  #{srf.webcontext.gw}  AND  t1.`ND` =  #{srf.webcontext.nd}  AND  ( t1.`ORGID` =  #{srf.webcontext.orgid}  OR  instr((select b.levelcode from t_srforg b where b.orgid = t1.orgid), ( select a.levelcode from t_srforg a where a.orgid = #{srf.webcontext.orgid} ) )=1 ) )
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormxmxqjh/OrmXmxqjhMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormxmxqjh/OrmXmxqjhMapper.xml
@@ -74,30 +74,30 @@

    <!--数据查询[BaseInfo]-->
    <sql id="BaseInfo" databaseId="mysql">
-       <![CDATA[	SELECT t1.`APPROVALSTATUS`, t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DXMJLYQ`, t1.`DXMZGYQ`, t1.`EDITION`, t1.`EDITIONSTATE`, t1.`GCMCJBM`, t1.`GCZJ`, t1.`JHCB`, t1.`JZMJ`, t1.`OLDID`, t1.`ORDERVALUE`, t1.`ORGCODE`, t1.`ORGINFOID` AS `ORGID`, t1.`ORGINFOID`, t1.`ORGINFONAME`, t1.`ORGSECINFOID`, t1.`ORGSHORTNAME`, t1.`ORMXMGLID`, t11.`PROJECT_NAME` AS `ORMXMGLNAME`, t1.`ORMXMXQJHID`, t1.`ORMXMXQJHNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`REASON`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`PROJECT_NUMBER` AS `XMBH`, t1.`XMBJC`, t1.`XMBLX`, t1.`XMBMC`, t1.`XMGMMS`, t1.`XMJBQK`, t1.`XMLX`, t1.`XMLXQT` FROM `T_ORMXMXQJH` t1  LEFT JOIN T_ORMXMGL t11 ON t1.ORMXMGLID = t11.ORMXMGLID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
-				 WHERE 	( ( t1.`PIMPERSONID` =  #{srf.sessioncontext.srfpersonid}  OR  ( t1.`EDITIONSTATE` = '10'  AND  ( 'ibzadmin' = (select t.loginaccountname from t_srfloginaccount t where t.loginaccountid = #{srf.sessioncontext.srfpersonid})  OR  (t1.orginfoid = #{srf.sessioncontext.srforgid}   OR   INSTR( (select b.levelcode from t_srforg b  where b.orgid = t1.orginfoid ), (select a.levelcode from t_srforg a where a.orgid = #{srf.sessioncontext.srforgid} )) = 1) ) ) ) )
+		<![CDATA[ SELECT t1.`APPROVALSTATUS`, t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DXMJLYQ`, t1.`DXMZGYQ`, t1.`EDITION`, t1.`EDITIONSTATE`, t1.`GCMCJBM`, t1.`GCZJ`, t1.`JHCB`, t1.`JZMJ`, t1.`OLDID`, t1.`ORDERVALUE`, t1.`ORGCODE`, t1.`ORGINFOID` AS `ORGID`, t1.`ORGINFOID`, t1.`ORGINFONAME`, t1.`ORGSECINFOID`, t1.`ORGSHORTNAME`, t1.`ORMXMGLID`, t11.`PROJECT_NAME` AS `ORMXMGLNAME`, t1.`ORMXMXQJHID`, t1.`ORMXMXQJHNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`REASON`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`PROJECT_NUMBER` AS `XMBH`, t1.`XMBJC`, t1.`XMBLX`, t1.`XMBMC`, t1.`XMGMMS`, t1.`XMJBQK`, t1.`XMLX`, t1.`XMLXQT` FROM `T_ORMXMXQJH` t1  LEFT JOIN T_ORMXMGL t11 ON t1.ORMXMGLID = t11.ORMXMGLID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
+					 WHERE 	( ( t1.`PIMPERSONID` =  #{srf.sessioncontext.srfpersonid}  OR  ( t1.`EDITIONSTATE` = '10'  AND  ( 'ibzadmin' = (select t.loginaccountname from t_srfloginaccount t where t.loginaccountid = #{srf.sessioncontext.srfpersonid})  OR  (t1.orginfoid = #{srf.sessioncontext.srforgid}   OR   INSTR( (select b.levelcode from t_srforg b  where b.orgid = t1.orginfoid ), (select a.levelcode from t_srforg a where a.orgid = #{srf.sessioncontext.srforgid} )) = 1) ) ) ) )
 			]]>
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`APPROVALSTATUS`, t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DXMJLYQ`, t1.`DXMZGYQ`, t1.`EDITION`, t1.`EDITIONSTATE`, t1.`GCMCJBM`, t1.`GCZJ`, t1.`JHCB`, t1.`JZMJ`, t1.`OLDID`, t1.`ORDERVALUE`, t1.`ORGCODE`, t1.`ORGINFOID` AS `ORGID`, t1.`ORGINFOID`, t1.`ORGINFONAME`, t1.`ORGSECINFOID`, t1.`ORGSHORTNAME`, t1.`ORMXMGLID`, t11.`PROJECT_NAME` AS `ORMXMGLNAME`, t1.`ORMXMXQJHID`, t1.`ORMXMXQJHNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`REASON`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`PROJECT_NUMBER` AS `XMBH`, t1.`XMBJC`, t1.`XMBLX`, t1.`XMBMC`, t1.`XMGMMS`, t1.`XMJBQK`, t1.`XMLX`, t1.`XMLXQT` FROM `T_ORMXMXQJH` t1  LEFT JOIN T_ORMXMGL t11 ON t1.ORMXMGLID = t11.ORMXMGLID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
+		<![CDATA[ SELECT t1.`APPROVALSTATUS`, t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DXMJLYQ`, t1.`DXMZGYQ`, t1.`EDITION`, t1.`EDITIONSTATE`, t1.`GCMCJBM`, t1.`GCZJ`, t1.`JHCB`, t1.`JZMJ`, t1.`OLDID`, t1.`ORDERVALUE`, t1.`ORGCODE`, t1.`ORGINFOID` AS `ORGID`, t1.`ORGINFOID`, t1.`ORGINFONAME`, t1.`ORGSECINFOID`, t1.`ORGSHORTNAME`, t1.`ORMXMGLID`, t11.`PROJECT_NAME` AS `ORMXMGLNAME`, t1.`ORMXMXQJHID`, t1.`ORMXMXQJHNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`REASON`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`PROJECT_NUMBER` AS `XMBH`, t1.`XMBJC`, t1.`XMBLX`, t1.`XMBMC`, t1.`XMGMMS`, t1.`XMJBQK`, t1.`XMLX`, t1.`XMLXQT` FROM `T_ORMXMXQJH` t1  LEFT JOIN T_ORMXMGL t11 ON t1.ORMXMGLID = t11.ORMXMGLID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
 			]]>
    </sql>
    <!--数据查询[RsshInfo]-->
    <sql id="RsshInfo" databaseId="mysql">
-       <![CDATA[	SELECT t1.`APPROVALSTATUS`, t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DXMJLYQ`, t1.`DXMZGYQ`, t1.`EDITION`, t1.`EDITIONSTATE`, t1.`GCMCJBM`, t1.`GCZJ`, t1.`JHCB`, t1.`JZMJ`, t1.`OLDID`, t1.`ORDERVALUE`, t1.`ORGCODE`, t1.`ORGINFOID` AS `ORGID`, t1.`ORGINFOID`, t1.`ORGINFONAME`, t1.`ORGSECINFOID`, t1.`ORGSHORTNAME`, t1.`ORMXMGLID`, t11.`PROJECT_NAME` AS `ORMXMGLNAME`, t1.`ORMXMXQJHID`, t1.`ORMXMXQJHNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`REASON`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`PROJECT_NUMBER` AS `XMBH`, t1.`XMBJC`, t1.`XMBLX`, t1.`XMBMC`, t1.`XMGMMS`, t1.`XMJBQK`, t1.`XMLX`, t1.`XMLXQT` FROM `T_ORMXMXQJH` t1  LEFT JOIN T_ORMXMGL t11 ON t1.ORMXMGLID = t11.ORMXMGLID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
-				 WHERE 	( t1.`EDITIONSTATE` = '10'  AND  t1.`APPROVALSTATUS` = '20' )
+		<![CDATA[ SELECT t1.`APPROVALSTATUS`, t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DXMJLYQ`, t1.`DXMZGYQ`, t1.`EDITION`, t1.`EDITIONSTATE`, t1.`GCMCJBM`, t1.`GCZJ`, t1.`JHCB`, t1.`JZMJ`, t1.`OLDID`, t1.`ORDERVALUE`, t1.`ORGCODE`, t1.`ORGINFOID` AS `ORGID`, t1.`ORGINFOID`, t1.`ORGINFONAME`, t1.`ORGSECINFOID`, t1.`ORGSHORTNAME`, t1.`ORMXMGLID`, t11.`PROJECT_NAME` AS `ORMXMGLNAME`, t1.`ORMXMXQJHID`, t1.`ORMXMXQJHNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`REASON`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`PROJECT_NUMBER` AS `XMBH`, t1.`XMBJC`, t1.`XMBLX`, t1.`XMBMC`, t1.`XMGMMS`, t1.`XMJBQK`, t1.`XMLX`, t1.`XMLXQT` FROM `T_ORMXMXQJH` t1  LEFT JOIN T_ORMXMGL t11 ON t1.ORMXMGLID = t11.ORMXMGLID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
+					 WHERE 	( t1.`EDITIONSTATE` = '10'  AND  t1.`APPROVALSTATUS` = '20' )
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`APPROVALSTATUS`, t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DXMJLYQ`, t1.`DXMZGYQ`, t1.`EDITION`, t1.`EDITIONSTATE`, t1.`GCJS`, t1.`GCMCJBM`, t1.`GCSW`, t1.`GCZJ`, t1.`GQAP`, t1.`JHCB`, t1.`JZMJ`, t1.`OLDID`, t1.`ORDERVALUE`, t1.`ORGCODE`, t1.`ORGINFOID` AS `ORGID`, t1.`ORGINFOID`, t1.`ORGINFONAME`, t1.`ORGSECINFOID`, t1.`ORGSHORTNAME`, t1.`ORMXMGLID`, t11.`PROJECT_NAME` AS `ORMXMGLNAME`, t1.`ORMXMXQJHID`, t1.`ORMXMXQJHNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`QTJD`, t1.`REASON`, t1.`SGJD`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`PROJECT_NUMBER` AS `XMBH`, t1.`XMBJC`, t1.`XMBLX`, t1.`XMBMC`, t1.`XMGMMS`, t1.`XMJBQK`, t1.`XMLX`, t1.`XMLXQT`, t1.`ZSZX`, t1.`ZTSG` FROM `T_ORMXMXQJH` t1  LEFT JOIN T_ORMXMGL t11 ON t1.ORMXMGLID = t11.ORMXMGLID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
+		<![CDATA[ SELECT t1.`APPROVALSTATUS`, t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DXMJLYQ`, t1.`DXMZGYQ`, t1.`EDITION`, t1.`EDITIONSTATE`, t1.`GCJS`, t1.`GCMCJBM`, t1.`GCSW`, t1.`GCZJ`, t1.`GQAP`, t1.`JHCB`, t1.`JZMJ`, t1.`OLDID`, t1.`ORDERVALUE`, t1.`ORGCODE`, t1.`ORGINFOID` AS `ORGID`, t1.`ORGINFOID`, t1.`ORGINFONAME`, t1.`ORGSECINFOID`, t1.`ORGSHORTNAME`, t1.`ORMXMGLID`, t11.`PROJECT_NAME` AS `ORMXMGLNAME`, t1.`ORMXMXQJHID`, t1.`ORMXMXQJHNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`QTJD`, t1.`REASON`, t1.`SGJD`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`PROJECT_NUMBER` AS `XMBH`, t1.`XMBJC`, t1.`XMBLX`, t1.`XMBMC`, t1.`XMGMMS`, t1.`XMJBQK`, t1.`XMLX`, t1.`XMLXQT`, t1.`ZSZX`, t1.`ZTSG` FROM `T_ORMXMXQJH` t1  LEFT JOIN T_ORMXMGL t11 ON t1.ORMXMGLID = t11.ORMXMGLID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
 			]]>
    </sql>
    <!--数据查询[XMTJQX]-->
    <sql id="XMTJQX" databaseId="mysql">
-       <![CDATA[	SELECT t1.`APPROVALSTATUS`, t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DXMJLYQ`, t1.`DXMZGYQ`, t1.`EDITION`, t1.`EDITIONSTATE`, t1.`GCMCJBM`, t1.`GCZJ`, t1.`JHCB`, t1.`JZMJ`, t1.`OLDID`, t1.`ORDERVALUE`, t1.`ORGCODE`, t1.`ORGINFOID` AS `ORGID`, t1.`ORGINFOID`, t1.`ORGINFONAME`, t1.`ORGSECINFOID`, t1.`ORGSHORTNAME`, t1.`ORMXMGLID`, t11.`PROJECT_NAME` AS `ORMXMGLNAME`, t1.`ORMXMXQJHID`, t1.`ORMXMXQJHNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`REASON`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`PROJECT_NUMBER` AS `XMBH`, t1.`XMBJC`, t1.`XMBLX`, t1.`XMBMC`, t1.`XMGMMS`, t1.`XMJBQK`, t1.`XMLX`, t1.`XMLXQT` FROM `T_ORMXMXQJH` t1  LEFT JOIN T_ORMXMGL t11 ON t1.ORMXMGLID = t11.ORMXMGLID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
-				 WHERE 	( t1.`APPROVALSTATUS` <> '20' )
+		<![CDATA[ SELECT t1.`APPROVALSTATUS`, t1.`BBH`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DXMJLYQ`, t1.`DXMZGYQ`, t1.`EDITION`, t1.`EDITIONSTATE`, t1.`GCMCJBM`, t1.`GCZJ`, t1.`JHCB`, t1.`JZMJ`, t1.`OLDID`, t1.`ORDERVALUE`, t1.`ORGCODE`, t1.`ORGINFOID` AS `ORGID`, t1.`ORGINFOID`, t1.`ORGINFONAME`, t1.`ORGSECINFOID`, t1.`ORGSHORTNAME`, t1.`ORMXMGLID`, t11.`PROJECT_NAME` AS `ORMXMGLNAME`, t1.`ORMXMXQJHID`, t1.`ORMXMXQJHNAME`, t1.`PIMPERSONID`, t21.`PIMPERSONNAME`, t1.`REASON`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`PROJECT_NUMBER` AS `XMBH`, t1.`XMBJC`, t1.`XMBLX`, t1.`XMBMC`, t1.`XMGMMS`, t1.`XMJBQK`, t1.`XMLX`, t1.`XMLXQT` FROM `T_ORMXMXQJH` t1  LEFT JOIN T_ORMXMGL t11 ON t1.ORMXMGLID = t11.ORMXMGLID  LEFT JOIN T_PIMPERSON t21 ON t1.PIMPERSONID = t21.PIMPERSONID  
+					 WHERE 	( t1.`APPROVALSTATUS` <> '20' )
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/orm/ormzwdqgz/OrmZwdqgzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/orm/ormzwdqgz/OrmZwdqgzMapper.xml
@@ -66,17 +66,17 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`NL`, t1.`ORMORGID` AS `ORGID`, t1.`ORMDUTYID`, t31.`ORMDUTYNAME`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMRANKID`, t11.`ORMRANKNAME`, t1.`ORMZWDQGZID`, t1.`ORMZWDQGZNAME`, t1.`SFMRDQNL`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XB`, t1.`ZWBM`, t1.`ZWLX`, t21.`ZZDZS` FROM `T_ORMZWDQGZ` t1  LEFT JOIN T_ORMRANK t11 ON t1.ORMRANKID = t11.ORMRANKID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  LEFT JOIN T_ORMDUTY t31 ON t1.ORMDUTYID = t31.ORMDUTYID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`NL`, t1.`ORMORGID` AS `ORGID`, t1.`ORMDUTYID`, t31.`ORMDUTYNAME`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMRANKID`, t11.`ORMRANKNAME`, t1.`ORMZWDQGZID`, t1.`ORMZWDQGZNAME`, t1.`SFMRDQNL`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XB`, t1.`ZWBM`, t1.`ZWLX`, t21.`ZZDZS` FROM `T_ORMZWDQGZ` t1  LEFT JOIN T_ORMRANK t11 ON t1.ORMRANKID = t11.ORMRANKID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  LEFT JOIN T_ORMDUTY t31 ON t1.ORMDUTYID = t31.ORMDUTYID  
 			]]>
    </sql>
    <!--数据查询[DQYHZZ]-->
    <sql id="DQYHZZ" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`NL`, t1.`ORMORGID` AS `ORGID`, t1.`ORMDUTYID`, t31.`ORMDUTYNAME`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMRANKID`, t11.`ORMRANKNAME`, t1.`ORMZWDQGZID`, t1.`ORMZWDQGZNAME`, t1.`SFMRDQNL`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XB`, t1.`ZWBM`, t1.`ZWLX`, t21.`ZZDZS` FROM `T_ORMZWDQGZ` t1  LEFT JOIN T_ORMRANK t11 ON t1.ORMRANKID = t11.ORMRANKID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  LEFT JOIN T_ORMDUTY t31 ON t1.ORMDUTYID = t31.ORMDUTYID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`NL`, t1.`ORMORGID` AS `ORGID`, t1.`ORMDUTYID`, t31.`ORMDUTYNAME`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMRANKID`, t11.`ORMRANKNAME`, t1.`ORMZWDQGZID`, t1.`ORMZWDQGZNAME`, t1.`SFMRDQNL`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XB`, t1.`ZWBM`, t1.`ZWLX`, t21.`ZZDZS` FROM `T_ORMZWDQGZ` t1  LEFT JOIN T_ORMRANK t11 ON t1.ORMRANKID = t11.ORMRANKID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  LEFT JOIN T_ORMDUTY t31 ON t1.ORMDUTYID = t31.ORMDUTYID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`NL`, t1.`ORMORGID` AS `ORGID`, t1.`ORMDUTYID`, t31.`ORMDUTYNAME`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMRANKID`, t11.`ORMRANKNAME`, t1.`ORMZWDQGZID`, t1.`ORMZWDQGZNAME`, t1.`SFMRDQNL`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XB`, t1.`ZWBM`, t1.`ZWLX`, t21.`ZZDZS` FROM `T_ORMZWDQGZ` t1  LEFT JOIN T_ORMRANK t11 ON t1.ORMRANKID = t11.ORMRANKID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  LEFT JOIN T_ORMDUTY t31 ON t1.ORMDUTYID = t31.ORMDUTYID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`NL`, t1.`ORMORGID` AS `ORGID`, t1.`ORMDUTYID`, t31.`ORMDUTYNAME`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMRANKID`, t11.`ORMRANKNAME`, t1.`ORMZWDQGZID`, t1.`ORMZWDQGZNAME`, t1.`SFMRDQNL`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XB`, t1.`ZWBM`, t1.`ZWLX`, t21.`ZZDZS` FROM `T_ORMZWDQGZ` t1  LEFT JOIN T_ORMRANK t11 ON t1.ORMRANKID = t11.ORMRANKID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  LEFT JOIN T_ORMDUTY t31 ON t1.ORMDUTYID = t31.ORMDUTYID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parassesstemplate/ParAssessTemplateMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parassesstemplate/ParAssessTemplateMapper.xml
@@ -27,12 +27,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`ND`, t1.`PARASSESSTEMPLATEID`, t1.`PARASSESSTEMPLATENAME`, t1.`SFYX`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARASSESSTEMPLATE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`ND`, t1.`PARASSESSTEMPLATEID`, t1.`PARASSESSTEMPLATENAME`, t1.`SFYX`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARASSESSTEMPLATE` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`ND`, t1.`PARASSESSTEMPLATEID`, t1.`PARASSESSTEMPLATENAME`, t1.`SFYX`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARASSESSTEMPLATE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`ND`, t1.`PARASSESSTEMPLATEID`, t1.`PARASSESSTEMPLATENAME`, t1.`SFYX`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARASSESSTEMPLATE` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parbmfzjyx/ParBmfzjyxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parbmfzjyx/ParBmfzjyxMapper.xml
@@ -47,12 +47,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BZSM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`PARBMFZJYXID`, t1.`PARBMFZJYXNAME`, t1.`PARTZGGID`, t31.`PARTZGGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t21.`SHORTNAME` AS `SSBM`, t11.`ORMORGNAME` AS `SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGPX` FROM `T_PARBMFZJYX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_PARTZGG t31 ON t1.PARTZGGID = t31.PARTZGGID  
+		<![CDATA[ SELECT t1.`BZSM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`PARBMFZJYXID`, t1.`PARBMFZJYXNAME`, t1.`PARTZGGID`, t31.`PARTZGGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t21.`SHORTNAME` AS `SSBM`, t11.`ORMORGNAME` AS `SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGPX` FROM `T_PARBMFZJYX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_PARTZGG t31 ON t1.PARTZGGID = t31.PARTZGGID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BZSM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`PARBMFZJYXID`, t1.`PARBMFZJYXNAME`, t1.`PARTZGGID`, t31.`PARTZGGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t21.`SHORTNAME` AS `SSBM`, t11.`ORMORGNAME` AS `SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGPX` FROM `T_PARBMFZJYX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_PARTZGG t31 ON t1.PARTZGGID = t31.PARTZGGID  
+		<![CDATA[ SELECT t1.`BZSM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`PARBMFZJYXID`, t1.`PARBMFZJYXNAME`, t1.`PARTZGGID`, t31.`PARTZGGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t21.`SHORTNAME` AS `SSBM`, t11.`ORMORGNAME` AS `SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGPX` FROM `T_PARBMFZJYX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_PARTZGG t31 ON t1.PARTZGGID = t31.PARTZGGID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/pardjbz/ParDjbzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/pardjbz/ParDjbzMapper.xml
@@ -27,12 +27,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FBBL`, t1.`KHPGDJ`, t1.`PARDJBZID`, t1.`PARDJBZNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARDJBZ` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FBBL`, t1.`KHPGDJ`, t1.`PARDJBZID`, t1.`PARDJBZNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARDJBZ` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FBBL`, t1.`KHPGDJ`, t1.`PARDJBZID`, t1.`PARDJBZNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARDJBZ` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FBBL`, t1.`KHPGDJ`, t1.`PARDJBZID`, t1.`PARDJBZNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARDJBZ` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/pardxkhnrmx/ParDxkhnrmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/pardxkhnrmx/ParDxkhnrmxMapper.xml
@@ -47,12 +47,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDF`, t41.`KHLX` AS `KHDX`, t1.`ND`, t1.`PARDXKHNRMXID`, t1.`PARDXKHNRMXNAME`, t1.`PARKHZCMXID`, t31.`PARKHZCMXNAME`, t1.`PFZT`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`ZJHM`, t1.`ZQ`, t11.`ORMORGNAME` AS `ZZ` FROM `T_PARDXKHNRMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_PARKHZCMX t31 ON t1.PARKHZCMXID = t31.PARKHZCMXID  LEFT JOIN T_PARJXKHJCSZ t41 ON t31.PARJXKHJCSZID = t41.PARJXKHJCSZID  
+		<![CDATA[ SELECT t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDF`, t41.`KHLX` AS `KHDX`, t1.`ND`, t1.`PARDXKHNRMXID`, t1.`PARDXKHNRMXNAME`, t1.`PARKHZCMXID`, t31.`PARKHZCMXNAME`, t1.`PFZT`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`ZJHM`, t1.`ZQ`, t11.`ORMORGNAME` AS `ZZ` FROM `T_PARDXKHNRMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_PARKHZCMX t31 ON t1.PARKHZCMXID = t31.PARKHZCMXID  LEFT JOIN T_PARJXKHJCSZ t41 ON t31.PARJXKHJCSZID = t41.PARJXKHJCSZID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDF`, t41.`KHLX` AS `KHDX`, t1.`ND`, t1.`PARDXKHNRMXID`, t1.`PARDXKHNRMXNAME`, t1.`PARKHZCMXID`, t31.`PARKHZCMXNAME`, t1.`PFZT`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`ZJHM`, t1.`ZQ`, t11.`ORMORGNAME` AS `ZZ` FROM `T_PARDXKHNRMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_PARKHZCMX t31 ON t1.PARKHZCMXID = t31.PARKHZCMXID  LEFT JOIN T_PARJXKHJCSZ t41 ON t31.PARJXKHJCSZID = t41.PARJXKHJCSZID  
+		<![CDATA[ SELECT t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDF`, t41.`KHLX` AS `KHDX`, t1.`ND`, t1.`PARDXKHNRMXID`, t1.`PARDXKHNRMXNAME`, t1.`PARKHZCMXID`, t31.`PARKHZCMXNAME`, t1.`PFZT`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`ZJHM`, t1.`ZQ`, t11.`ORMORGNAME` AS `ZZ` FROM `T_PARDXKHNRMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  LEFT JOIN T_PARKHZCMX t31 ON t1.PARKHZCMXID = t31.PARKHZCMXID  LEFT JOIN T_PARJXKHJCSZ t41 ON t31.PARJXKHJCSZID = t41.PARJXKHJCSZID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parexamcontent/ParExamContentMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parexamcontent/ParExamContentMapper.xml
@@ -27,12 +27,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CONTENTCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`PAREXAMCONTENTID`, t1.`PAREXAMCONTENTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PAREXAMCONTENT` t1  
+		<![CDATA[ SELECT t1.`CONTENTCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`PAREXAMCONTENTID`, t1.`PAREXAMCONTENTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PAREXAMCONTENT` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CONTENTCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`PAREXAMCONTENTID`, t1.`PAREXAMCONTENTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PAREXAMCONTENT` t1  
+		<![CDATA[ SELECT t1.`CONTENTCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`PAREXAMCONTENTID`, t1.`PAREXAMCONTENTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PAREXAMCONTENT` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parexamcycle/ParExamCycleMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parexamcycle/ParExamCycleMapper.xml
@@ -27,12 +27,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CYCLEID`, t1.`PAREXAMCYCLEID`, t1.`PAREXAMCYCLENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PAREXAMCYCLE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CYCLEID`, t1.`PAREXAMCYCLEID`, t1.`PAREXAMCYCLENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PAREXAMCYCLE` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CYCLEID`, t1.`PAREXAMCYCLEID`, t1.`PAREXAMCYCLENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PAREXAMCYCLE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CYCLEID`, t1.`PAREXAMCYCLEID`, t1.`PAREXAMCYCLENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PAREXAMCYCLE` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parfzsmx/ParFzsmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parfzsmx/ParFzsmxMapper.xml
@@ -47,12 +47,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BZSM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LDPX`, t1.`PARFZSMXID`, t1.`PARFZSMXNAME`, t1.`PARTZGGID`, t21.`PARTZGGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`SHORTNAME` AS `SSBM`, t11.`ORMORGNAME` AS `SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARFZSMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_PARTZGG t21 ON t1.PARTZGGID = t21.PARTZGGID  LEFT JOIN T_SRFORGSECTOR t31 ON t11.ORMORGSECTORID = t31.ORGSECTORID  
+		<![CDATA[ SELECT t1.`BZSM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LDPX`, t1.`PARFZSMXID`, t1.`PARFZSMXNAME`, t1.`PARTZGGID`, t21.`PARTZGGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`SHORTNAME` AS `SSBM`, t11.`ORMORGNAME` AS `SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARFZSMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_PARTZGG t21 ON t1.PARTZGGID = t21.PARTZGGID  LEFT JOIN T_SRFORGSECTOR t31 ON t11.ORMORGSECTORID = t31.ORGSECTORID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BZSM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LDPX`, t1.`PARFZSMXID`, t1.`PARFZSMXNAME`, t1.`PARTZGGID`, t21.`PARTZGGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`SHORTNAME` AS `SSBM`, t11.`ORMORGNAME` AS `SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARFZSMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_PARTZGG t21 ON t1.PARTZGGID = t21.PARTZGGID  LEFT JOIN T_SRFORGSECTOR t31 ON t11.ORMORGSECTORID = t31.ORGSECTORID  
+		<![CDATA[ SELECT t1.`BZSM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LDPX`, t1.`PARFZSMXID`, t1.`PARFZSMXNAME`, t1.`PARTZGGID`, t21.`PARTZGGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t31.`SHORTNAME` AS `SSBM`, t11.`ORMORGNAME` AS `SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARFZSMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_PARTZGG t21 ON t1.PARTZGGID = t21.PARTZGGID  LEFT JOIN T_SRFORGSECTOR t31 ON t11.ORMORGSECTORID = t31.ORGSECTORID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parintegralrule/ParIntegralRuleMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parintegralrule/ParIntegralRuleMapper.xml
@@ -27,12 +27,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DJ`, t1.`INTEGRALS`, t1.`ND`, t1.`PARINTEGRALRULEID`, t1.`PARINTEGRALRULENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARINTEGRALRULE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DJ`, t1.`INTEGRALS`, t1.`ND`, t1.`PARINTEGRALRULEID`, t1.`PARINTEGRALRULENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARINTEGRALRULE` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DJ`, t1.`INTEGRALS`, t1.`ND`, t1.`PARINTEGRALRULEID`, t1.`PARINTEGRALRULENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARINTEGRALRULE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DJ`, t1.`INTEGRALS`, t1.`ND`, t1.`PARINTEGRALRULEID`, t1.`PARINTEGRALRULENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARINTEGRALRULE` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjgbmpjbz/ParJgbmpjbzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjgbmpjbz/ParJgbmpjbzMapper.xml
@@ -57,12 +57,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BMPJ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DJ`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`PARJGBMPJBZID`, t1.`PARJGBMPJBZNAME`, t1.`PJ`, t1.`PJBL`, t1.`PJBZID`, t31.`PARJGBMPJBZNAME` AS `PJBZMC`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJGBMPJBZ` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  LEFT JOIN T_PARJGBMPJBZ t31 ON t1.PJBZID = t31.PARJGBMPJBZID  
+		<![CDATA[ SELECT t1.`BMPJ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DJ`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`PARJGBMPJBZID`, t1.`PARJGBMPJBZNAME`, t1.`PJ`, t1.`PJBL`, t1.`PJBZID`, t31.`PARJGBMPJBZNAME` AS `PJBZMC`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJGBMPJBZ` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  LEFT JOIN T_PARJGBMPJBZ t31 ON t1.PJBZID = t31.PARJGBMPJBZID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BMPJ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DJ`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`PARJGBMPJBZID`, t1.`PARJGBMPJBZNAME`, t1.`PJ`, t1.`PJBL`, t1.`PJBZID`, t31.`PARJGBMPJBZNAME` AS `PJBZMC`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJGBMPJBZ` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  LEFT JOIN T_PARJGBMPJBZ t31 ON t1.PJBZID = t31.PARJGBMPJBZID  
+		<![CDATA[ SELECT t1.`BMPJ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DJ`, t1.`ORMORGID`, t21.`ORGNAME` AS `ORMORGNAME`, t1.`ORMORGSECTORID`, t11.`ORGSECTORNAME` AS `ORMORGSECTORNAME`, t1.`PARJGBMPJBZID`, t1.`PARJGBMPJBZNAME`, t1.`PJ`, t1.`PJBL`, t1.`PJBZID`, t31.`PARJGBMPJBZNAME` AS `PJBZMC`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJGBMPJBZ` t1  LEFT JOIN T_SRFORGSECTOR t11 ON t1.ORMORGSECTORID = t11.ORGSECTORID  LEFT JOIN T_SRFORG t21 ON t1.ORMORGID = t21.ORGID  LEFT JOIN T_PARJGBMPJBZ t31 ON t1.PJBZID = t31.PARJGBMPJBZID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjxbzgl/ParJxbzglMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjxbzgl/ParJxbzglMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHLX`, t1.`ND`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXBZGLID`, t1.`PARJXBZGLNAME`, t1.`SFQY`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXBZGL` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHLX`, t1.`ND`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXBZGLID`, t1.`PARJXBZGLNAME`, t1.`SFQY`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXBZGL` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHLX`, t1.`ND`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXBZGLID`, t1.`PARJXBZGLNAME`, t1.`SFQY`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXBZGL` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHLX`, t1.`ND`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXBZGLID`, t1.`PARJXBZGLNAME`, t1.`SFQY`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXBZGL` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjxbzglmx/ParJxbzglmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjxbzglmx/ParJxbzglmxMapper.xml
@@ -47,12 +47,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`PARJXBZGLID`, t1.`PARJXBZGLMXID`, t1.`PARJXBZGLMXNAME`, t21.`PARJXBZGLNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZZ` FROM `T_PARJXBZGLMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_PARJXBZGL t21 ON t1.PARJXBZGLID = t21.PARJXBZGLID  
+		<![CDATA[ SELECT t1.`BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`PARJXBZGLID`, t1.`PARJXBZGLMXID`, t1.`PARJXBZGLMXNAME`, t21.`PARJXBZGLNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZZ` FROM `T_PARJXBZGLMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_PARJXBZGL t21 ON t1.PARJXBZGLID = t21.PARJXBZGLID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`PARJXBZGLID`, t1.`PARJXBZGLMXID`, t1.`PARJXBZGLMXNAME`, t21.`PARJXBZGLNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZZ` FROM `T_PARJXBZGLMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_PARJXBZGL t21 ON t1.PARJXBZGLID = t21.PARJXBZGLID  
+		<![CDATA[ SELECT t1.`BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`PARJXBZGLID`, t1.`PARJXBZGLMXID`, t1.`PARJXBZGLMXNAME`, t21.`PARJXBZGLNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZZ` FROM `T_PARJXBZGLMX` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_PARJXBZGL t21 ON t1.PARJXBZGLID = t21.PARJXBZGLID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjxjg/ParJxjgMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjxjg/ParJxjgMapper.xml
@@ -27,12 +27,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHLX`, t1.`KHPGDJ`, t1.`ND`, t1.`PARJXJGID`, t1.`PARJXJGNAME`, t1.`PM`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YG`, t1.`YGID`, t1.`ZF`, t1.`ZZ` FROM `T_PARJXJG` t1  
+		<![CDATA[ SELECT t1.`BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHLX`, t1.`KHPGDJ`, t1.`ND`, t1.`PARJXJGID`, t1.`PARJXJGNAME`, t1.`PM`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YG`, t1.`YGID`, t1.`ZF`, t1.`ZZ` FROM `T_PARJXJG` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHLX`, t1.`KHPGDJ`, t1.`ND`, t1.`PARJXJGID`, t1.`PARJXJGNAME`, t1.`PM`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YG`, t1.`YGID`, t1.`ZF`, t1.`ZZ` FROM `T_PARJXJG` t1  
+		<![CDATA[ SELECT t1.`BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHLX`, t1.`KHPGDJ`, t1.`ND`, t1.`PARJXJGID`, t1.`PARJXJGNAME`, t1.`PM`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YG`, t1.`YGID`, t1.`ZF`, t1.`ZZ` FROM `T_PARJXJG` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjxkhjcsz/ParJxkhjcszMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjxkhjcsz/ParJxkhjcszMapper.xml
@@ -37,14 +37,14 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`KHLX`, t1.`KHND`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXKHJCSZID`, t1.`PARJXKHJCSZNAME`, t1.`SFQY`, t1.`SZSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXKHJCSZ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`KHLX`, t1.`KHND`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXKHJCSZID`, t1.`PARJXKHJCSZNAME`, t1.`SFQY`, t1.`SZSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXKHJCSZ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`KHLX`, t1.`KHND`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXKHJCSZID`, t1.`PARJXKHJCSZNAME`, t1.`SFQY`, t1.`SZSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXKHJCSZ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
-				 WHERE 	t1.ENABLE = 1
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`KHLX`, t1.`KHND`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXKHJCSZID`, t1.`PARJXKHJCSZNAME`, t1.`SFQY`, t1.`SZSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXKHJCSZ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjxkhmb/ParJxkhmbMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjxkhmb/ParJxkhmbMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`KHX`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXKHMBID`, t1.`PARJXKHMBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXKHMB` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`KHX`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXKHMBID`, t1.`PARJXKHMBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXKHMB` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`KHX`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXKHMBID`, t1.`PARJXKHMBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXKHMB` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`KHX`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXKHMBID`, t1.`PARJXKHMBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXKHMB` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjxkhmbmx/ParJxkhmbmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjxkhmbmx/ParJxkhmbmxMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FZ`, t1.`PARJXKHMBID`, t1.`PARJXKHMBMXID`, t1.`PARJXKHMBMXNAME`, t11.`PARJXKHMBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZB`, t1.`ZDFZ`, t1.`ZXFZ` FROM `T_PARJXKHMBMX` t1  LEFT JOIN T_PARJXKHMB t11 ON t1.PARJXKHMBID = t11.PARJXKHMBID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FZ`, t1.`PARJXKHMBID`, t1.`PARJXKHMBMXID`, t1.`PARJXKHMBMXNAME`, t11.`PARJXKHMBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZB`, t1.`ZDFZ`, t1.`ZXFZ` FROM `T_PARJXKHMBMX` t1  LEFT JOIN T_PARJXKHMB t11 ON t1.PARJXKHMBID = t11.PARJXKHMBID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BZ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FZ`, t1.`PARJXKHMBID`, t1.`PARJXKHMBMXID`, t1.`PARJXKHMBMXNAME`, t11.`PARJXKHMBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZB`, t1.`ZDFZ`, t1.`ZXFZ` FROM `T_PARJXKHMBMX` t1  LEFT JOIN T_PARJXKHMB t11 ON t1.PARJXKHMBID = t11.PARJXKHMBID  
+		<![CDATA[ SELECT t1.`BZ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FZ`, t1.`PARJXKHMBID`, t1.`PARJXKHMBMXID`, t1.`PARJXKHMBMXNAME`, t11.`PARJXKHMBNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZB`, t1.`ZDFZ`, t1.`ZXFZ` FROM `T_PARJXKHMBMX` t1  LEFT JOIN T_PARJXKHMB t11 ON t1.PARJXKHMBID = t11.PARJXKHMBID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjxkhxhz/ParJxkhxhzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjxkhxhz/ParJxkhxhzMapper.xml
@@ -38,12 +38,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GZJX`, t1.`GZNLJTD`, t1.`GZNLJTD_XBN`, t1.`JSWMJC`, t1.`KHLX`, t1.`ND`, t1.`PARASSESSTEMPLATEID`, t11.`PARASSESSTEMPLATENAME`, t1.`PARJXKHXHZID`, t1.`PARJXKHXHZNAME`, t1.`SZMZPY`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`YG`, t1.`YGID`, t1.`YWNLKS`, t1.`ZZ` FROM `T_PARJXKHXHZ` t1  LEFT JOIN T_PARASSESSTEMPLATE t11 ON t1.PARASSESSTEMPLATEID = t11.PARASSESSTEMPLATEID  
+		<![CDATA[ SELECT t1.`BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GZJX`, t1.`GZNLJTD`, t1.`GZNLJTD_XBN`, t1.`JSWMJC`, t1.`KHLX`, t1.`ND`, t1.`PARASSESSTEMPLATEID`, t11.`PARASSESSTEMPLATENAME`, t1.`PARJXKHXHZID`, t1.`PARJXKHXHZNAME`, t1.`SZMZPY`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`YG`, t1.`YGID`, t1.`YWNLKS`, t1.`ZZ` FROM `T_PARJXKHXHZ` t1  LEFT JOIN T_PARASSESSTEMPLATE t11 ON t1.PARASSESSTEMPLATEID = t11.PARASSESSTEMPLATEID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GZJX`, t1.`GZNLJTD`, t1.`GZNLJTD_XBN`, t1.`JSWMJC`, t1.`KHLX`, t1.`ND`, t1.`PARASSESSTEMPLATEID`, t11.`PARASSESSTEMPLATENAME`, t1.`PARJXKHXHZID`, t1.`PARJXKHXHZNAME`, t1.`SZMZPY`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`YG`, t1.`YGID`, t1.`YWNLKS`, t1.`ZZ` FROM `T_PARJXKHXHZ` t1  LEFT JOIN T_PARASSESSTEMPLATE t11 ON t1.PARASSESSTEMPLATEID = t11.PARASSESSTEMPLATEID  
+		<![CDATA[ SELECT t1.`BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GZJX`, t1.`GZNLJTD`, t1.`GZNLJTD_XBN`, t1.`JSWMJC`, t1.`KHLX`, t1.`ND`, t1.`PARASSESSTEMPLATEID`, t11.`PARASSESSTEMPLATENAME`, t1.`PARJXKHXHZID`, t1.`PARJXKHXHZNAME`, t1.`SZMZPY`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`YG`, t1.`YGID`, t1.`YWNLKS`, t1.`ZZ` FROM `T_PARJXKHXHZ` t1  LEFT JOIN T_PARASSESSTEMPLATE t11 ON t1.PARASSESSTEMPLATEID = t11.PARASSESSTEMPLATEID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjxlhmb/ParJxlhmbMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjxlhmb/ParJxlhmbMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JSSJ`, t1.`KHLX`, t1.`KSSJ`, t1.`ND`, t1.`PARJXLHMBID`, t1.`PARJXLHMBNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`ORMORGNAME` AS `ZZ` FROM `T_PARJXLHMB` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
+		<![CDATA[ SELECT t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JSSJ`, t1.`KHLX`, t1.`KSSJ`, t1.`ND`, t1.`PARJXLHMBID`, t1.`PARJXLHMBNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`ORMORGNAME` AS `ZZ` FROM `T_PARJXLHMB` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JSSJ`, t1.`KHLX`, t1.`KSSJ`, t1.`ND`, t1.`PARJXLHMBID`, t1.`PARJXLHMBNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`ORMORGNAME` AS `ZZ` FROM `T_PARJXLHMB` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
+		<![CDATA[ SELECT t21.`SHORTNAME` AS `BM`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JSSJ`, t1.`KHLX`, t1.`KSSJ`, t1.`ND`, t1.`PARJXLHMBID`, t1.`PARJXLHMBNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`ORMORGNAME` AS `ZZ` FROM `T_PARJXLHMB` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjxmtfk/ParJxmtfkMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjxmtfk/ParJxmtfkMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FJXX`, t1.`MTNR`, t1.`PARJXMTFKID`, t1.`PARJXMTFKNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t21.`SHORTNAME` AS `SSBM`, t11.`ORMORGNAME` AS `SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGCS` FROM `T_PARJXMTFK` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FJXX`, t1.`MTNR`, t1.`PARJXMTFKID`, t1.`PARJXMTFKNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t21.`SHORTNAME` AS `SSBM`, t11.`ORMORGNAME` AS `SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGCS` FROM `T_PARJXMTFK` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FJXX`, t1.`MTNR`, t1.`PARJXMTFKID`, t1.`PARJXMTFKNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t21.`SHORTNAME` AS `SSBM`, t11.`ORMORGNAME` AS `SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGCS` FROM `T_PARJXMTFK` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FJXX`, t1.`MTNR`, t1.`PARJXMTFKID`, t1.`PARJXMTFKNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t21.`SHORTNAME` AS `SSBM`, t11.`ORMORGNAME` AS `SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGCS` FROM `T_PARJXMTFK` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  LEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjxndkhjg/ParJxndkhjgMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjxndkhjg/ParJxndkhjgMapper.xml
@@ -46,18 +46,18 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHND`, t1.`KHPGDJ`, t1.`KHZQ`, t1.`PARJXNDKHJGID`, t1.`PARJXNDKHJGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`PM`, t1.`SFTX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZF` FROM `T_PARJXNDKHJG` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHND`, t1.`KHPGDJ`, t1.`KHZQ`, t1.`PARJXNDKHJGID`, t1.`PARJXNDKHJGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`PM`, t1.`SFTX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZF` FROM `T_PARJXNDKHJG` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
 			]]>
    </sql>
    <!--数据查询[LastTwoYear]-->
    <sql id="LastTwoYear" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHND`, t1.`KHPGDJ`, t1.`KHZQ`, t1.`PARJXNDKHJGID`, t1.`PARJXNDKHJGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`PM`, t1.`SFTX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZF` FROM `T_PARJXNDKHJG` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
-				 WHERE 	( t1.`KHZQ` = '20' )
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHND`, t1.`KHPGDJ`, t1.`KHZQ`, t1.`PARJXNDKHJGID`, t1.`PARJXNDKHJGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`PM`, t1.`SFTX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZF` FROM `T_PARJXNDKHJG` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
+					 WHERE 	( t1.`KHZQ` = '20' )
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHND`, t1.`KHPGDJ`, t1.`KHZQ`, t1.`PARJXNDKHJGID`, t1.`PARJXNDKHJGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`PM`, t1.`SFTX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZF` FROM `T_PARJXNDKHJG` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHND`, t1.`KHPGDJ`, t1.`KHZQ`, t1.`PARJXNDKHJGID`, t1.`PARJXNDKHJGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`PM`, t1.`SFTX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`ZF` FROM `T_PARJXNDKHJG` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjxqdsz/ParJxqdszMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjxqdsz/ParJxqdszMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JZSJ`, t1.`KQSJ`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXQDSZID`, t1.`PARJXQDSZNAME`, t1.`QDLX`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXQDSZ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JZSJ`, t1.`KQSJ`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXQDSZID`, t1.`PARJXQDSZNAME`, t1.`QDLX`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXQDSZ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JZSJ`, t1.`KQSJ`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXQDSZID`, t1.`PARJXQDSZNAME`, t1.`QDLX`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXQDSZ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JZSJ`, t1.`KQSJ`, t1.`ORMORGID`, t11.`ORGNAME` AS `ORMORGNAME`, t1.`PARJXQDSZID`, t1.`PARJXQDSZNAME`, t1.`QDLX`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARJXQDSZ` t1  LEFT JOIN T_SRFORG t11 ON t1.ORMORGID = t11.ORGID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjxzgpc/ParJxzgpcMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjxzgpc/ParJxzgpcMapper.xml
@@ -27,12 +27,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHLX`, t1.`KHX`, t1.`ND`, t1.`PARJXZGPCID`, t1.`PARJXZGPCNAME`, t1.`PFLD`, t1.`PFLDID`, t1.`SSBM`, t1.`SSBMID`, t1.`SSZZ`, t1.`SSZZID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGID`, t1.`YGNAME`, t1.`ZDF` FROM `T_PARJXZGPC` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHLX`, t1.`KHX`, t1.`ND`, t1.`PARJXZGPCID`, t1.`PARJXZGPCNAME`, t1.`PFLD`, t1.`PFLDID`, t1.`SSBM`, t1.`SSBMID`, t1.`SSZZ`, t1.`SSZZID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGID`, t1.`YGNAME`, t1.`ZDF` FROM `T_PARJXZGPC` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHLX`, t1.`KHX`, t1.`ND`, t1.`PARJXZGPCID`, t1.`PARJXZGPCNAME`, t1.`PFLD`, t1.`PFLDID`, t1.`SSBM`, t1.`SSBMID`, t1.`SSZZ`, t1.`SSZZID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGID`, t1.`YGNAME`, t1.`ZDF` FROM `T_PARJXZGPC` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHLX`, t1.`KHX`, t1.`ND`, t1.`PARJXZGPCID`, t1.`PARJXZGPCNAME`, t1.`PFLD`, t1.`PFLDID`, t1.`SSBM`, t1.`SSBMID`, t1.`SSZZ`, t1.`SSZZID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`YGID`, t1.`YGNAME`, t1.`ZDF` FROM `T_PARJXZGPC` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjxzgpcmx/ParJxzgpcmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjxzgpcmx/ParJxzgpcmxMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BZ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FZFW`, t1.`PARJXZGPCID`, t1.`PARJXZGPCMXID`, t1.`PARJXZGPCMXNAME`, t11.`PARJXZGPCNAME`, t1.`PF`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZB`, t1.`ZDDF`, t1.`ZGDF` FROM `T_PARJXZGPCMX` t1  LEFT JOIN T_PARJXZGPC t11 ON t1.PARJXZGPCID = t11.PARJXZGPCID  
+		<![CDATA[ SELECT t1.`BZ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FZFW`, t1.`PARJXZGPCID`, t1.`PARJXZGPCMXID`, t1.`PARJXZGPCMXNAME`, t11.`PARJXZGPCNAME`, t1.`PF`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZB`, t1.`ZDDF`, t1.`ZGDF` FROM `T_PARJXZGPCMX` t1  LEFT JOIN T_PARJXZGPC t11 ON t1.PARJXZGPCID = t11.PARJXZGPCID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BZ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FZFW`, t1.`PARJXZGPCID`, t1.`PARJXZGPCMXID`, t1.`PARJXZGPCMXNAME`, t11.`PARJXZGPCNAME`, t1.`PF`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZB`, t1.`ZDDF`, t1.`ZGDF` FROM `T_PARJXZGPCMX` t1  LEFT JOIN T_PARJXZGPC t11 ON t1.PARJXZGPCID = t11.PARJXZGPCID  
+		<![CDATA[ SELECT t1.`BZ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FZFW`, t1.`PARJXZGPCID`, t1.`PARJXZGPCMXID`, t1.`PARJXZGPCMXNAME`, t11.`PARJXZGPCNAME`, t1.`PF`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH`, t1.`ZB`, t1.`ZDDF`, t1.`ZGDF` FROM `T_PARJXZGPCMX` t1  LEFT JOIN T_PARJXZGPC t11 ON t1.PARJXZGPCID = t11.PARJXZGPCID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parjzszpsjg/ParJzszpsjgMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parjzszpsjg/ParJzszpsjgMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`ND`, t1.`PARJZSZPSJGID`, t1.`PARJZSZPSJGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`SZPSFS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`ZJHM` FROM `T_PARJZSZPSJG` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`ND`, t1.`PARJZSZPSJGID`, t1.`PARJZSZPSJGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`SZPSFS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`ZJHM` FROM `T_PARJZSZPSJG` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`ND`, t1.`PARJZSZPSJGID`, t1.`PARJZSZPSJGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`SZPSFS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`ZJHM` FROM `T_PARJZSZPSJG` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`ND`, t1.`PARJZSZPSJGID`, t1.`PARJZSZPSJGNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`SZPSFS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t11.`ZJHM` FROM `T_PARJZSZPSJG` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parkhfa/ParKhfaMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parkhfa/ParKhfaMapper.xml
@@ -27,12 +27,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`AVAILABLEFLAG`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`PARKHFAID`, t1.`PARKHFANAME`, t1.`SZSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_PARKHFA` t1  
+		<![CDATA[ SELECT t1.`AVAILABLEFLAG`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`PARKHFAID`, t1.`PARKHFANAME`, t1.`SZSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_PARKHFA` t1  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`AVAILABLEFLAG`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`PARKHFAID`, t1.`PARKHFANAME`, t1.`SZSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_PARKHFA` t1  
+		<![CDATA[ SELECT t1.`AVAILABLEFLAG`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`KHDX`, t1.`PARKHFAID`, t1.`PARKHFANAME`, t1.`SZSJ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_PARKHFA` t1  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parkhzcmx/ParKhzcmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parkhzcmx/ParKhzcmxMapper.xml
@@ -47,12 +47,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t21.`KHLX` AS `KHDX`, t1.`KHNR`, t1.`PARASSESSTEMPLATEID`, t11.`PARASSESSTEMPLATENAME`, t1.`PARJXKHJCSZID`, t21.`PARJXKHJCSZNAME`, t1.`PARKHZCMXID`, t1.`PARKHZCMXNAME`, t1.`SFQY`, t1.`SZQZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_PARKHZCMX` t1  LEFT JOIN T_PARASSESSTEMPLATE t11 ON t1.PARASSESSTEMPLATEID = t11.PARASSESSTEMPLATEID  LEFT JOIN T_PARJXKHJCSZ t21 ON t1.PARJXKHJCSZID = t21.PARJXKHJCSZID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t21.`KHLX` AS `KHDX`, t1.`KHNR`, t1.`PARASSESSTEMPLATEID`, t11.`PARASSESSTEMPLATENAME`, t1.`PARJXKHJCSZID`, t21.`PARJXKHJCSZNAME`, t1.`PARKHZCMXID`, t1.`PARKHZCMXNAME`, t1.`SFQY`, t1.`SZQZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_PARKHZCMX` t1  LEFT JOIN T_PARASSESSTEMPLATE t11 ON t1.PARASSESSTEMPLATEID = t11.PARASSESSTEMPLATEID  LEFT JOIN T_PARJXKHJCSZ t21 ON t1.PARJXKHJCSZID = t21.PARJXKHJCSZID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t21.`KHLX` AS `KHDX`, t1.`KHNR`, t1.`PARASSESSTEMPLATEID`, t11.`PARASSESSTEMPLATENAME`, t1.`PARJXKHJCSZID`, t21.`PARJXKHJCSZNAME`, t1.`PARKHZCMXID`, t1.`PARKHZCMXNAME`, t1.`SFQY`, t1.`SZQZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_PARKHZCMX` t1  LEFT JOIN T_PARASSESSTEMPLATE t11 ON t1.PARASSESSTEMPLATEID = t11.PARASSESSTEMPLATEID  LEFT JOIN T_PARJXKHJCSZ t21 ON t1.PARJXKHJCSZID = t21.PARJXKHJCSZID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t21.`KHLX` AS `KHDX`, t1.`KHNR`, t1.`PARASSESSTEMPLATEID`, t11.`PARASSESSTEMPLATENAME`, t1.`PARJXKHJCSZID`, t21.`PARJXKHJCSZNAME`, t1.`PARKHZCMXID`, t1.`PARKHZCMXNAME`, t1.`SFQY`, t1.`SZQZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_PARKHZCMX` t1  LEFT JOIN T_PARASSESSTEMPLATE t11 ON t1.PARASSESSTEMPLATEID = t11.PARASSESSTEMPLATEID  LEFT JOIN T_PARJXKHJCSZ t21 ON t1.PARJXKHJCSZID = t21.PARJXKHJCSZID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parldkhqz/ParLdkhqzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parldkhqz/ParLdkhqzMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t21.`KHLX` AS `KHDX`, t1.`KHOBJECT`, t1.`PARKHZCMXID`, t11.`PARKHZCMXNAME`, t1.`PARLDKHQZID`, t1.`PARLDKHQZNAME`, t1.`PFZT`, t1.`QZZB`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARLDKHQZ` t1  LEFT JOIN T_PARKHZCMX t11 ON t1.PARKHZCMXID = t11.PARKHZCMXID  LEFT JOIN T_PARJXKHJCSZ t21 ON t11.PARJXKHJCSZID = t21.PARJXKHJCSZID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t21.`KHLX` AS `KHDX`, t1.`KHOBJECT`, t1.`PARKHZCMXID`, t11.`PARKHZCMXNAME`, t1.`PARLDKHQZID`, t1.`PARLDKHQZNAME`, t1.`PFZT`, t1.`QZZB`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARLDKHQZ` t1  LEFT JOIN T_PARKHZCMX t11 ON t1.PARKHZCMXID = t11.PARKHZCMXID  LEFT JOIN T_PARJXKHJCSZ t21 ON t11.PARJXKHJCSZID = t21.PARJXKHJCSZID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t21.`KHLX` AS `KHDX`, t1.`KHOBJECT`, t1.`PARKHZCMXID`, t11.`PARKHZCMXNAME`, t1.`PARLDKHQZID`, t1.`PARLDKHQZNAME`, t1.`PFZT`, t1.`QZZB`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARLDKHQZ` t1  LEFT JOIN T_PARKHZCMX t11 ON t1.PARKHZCMXID = t11.PARKHZCMXID  LEFT JOIN T_PARJXKHJCSZ t21 ON t11.PARJXKHJCSZID = t21.PARJXKHJCSZID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t21.`KHLX` AS `KHDX`, t1.`KHOBJECT`, t1.`PARKHZCMXID`, t11.`PARKHZCMXNAME`, t1.`PARLDKHQZID`, t1.`PARLDKHQZNAME`, t1.`PFZT`, t1.`QZZB`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_PARLDKHQZ` t1  LEFT JOIN T_PARKHZCMX t11 ON t1.PARKHZCMXID = t11.PARKHZCMXID  LEFT JOIN T_PARJXKHJCSZ t21 ON t11.PARJXKHJCSZID = t21.PARJXKHJCSZID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parldndlhmb/ParLdndlhmbMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parldndlhmb/ParLdndlhmbMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JXJD`, t1.`ND`, t1.`PARLDNDLHMBID`, t1.`PARLDNDLHMBNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`SSBM`, t1.`SSTZ`, t1.`SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_PARLDNDLHMB` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JXJD`, t1.`ND`, t1.`PARLDNDLHMBID`, t1.`PARLDNDLHMBNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`SSBM`, t1.`SSTZ`, t1.`SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_PARLDNDLHMB` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JXJD`, t1.`ND`, t1.`PARLDNDLHMBID`, t1.`PARLDNDLHMBNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`SSBM`, t1.`SSTZ`, t1.`SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_PARLDNDLHMB` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`JXJD`, t1.`ND`, t1.`PARLDNDLHMBID`, t1.`PARLDNDLHMBNAME`, t1.`PIMPERSONID`, t11.`PIMPERSONNAME`, t1.`SSBM`, t1.`SSTZ`, t1.`SSZZ`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`XH` FROM `T_PARLDNDLHMB` t1  LEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parldndlhmbmx/ParLdndlhmbmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parldndlhmbmx/ParLdndlhmbmxMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FGLDPF`, t1.`FZ`, t1.`JZSZPSFS`, t1.`KHBF`, t1.`MBLHYQ`, t1.`MBLX`, t1.`PARLDNDLHMBID`, t1.`PARLDNDLHMBMXID`, t1.`PARLDNDLHMBMXNAME`, t11.`PARLDNDLHMBNAME`, t1.`SPZT`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WCQK`, t1.`XGRZ`, t1.`ZMCL`, t1.`ZPFS`, t1.`ZT` FROM `T_PARLDNDLHMBMX` t1  LEFT JOIN T_PARLDNDLHMB t11 ON t1.PARLDNDLHMBID = t11.PARLDNDLHMBID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FGLDPF`, t1.`FZ`, t1.`JZSZPSFS`, t1.`KHBF`, t1.`MBLHYQ`, t1.`MBLX`, t1.`PARLDNDLHMBID`, t1.`PARLDNDLHMBMXID`, t1.`PARLDNDLHMBMXNAME`, t11.`PARLDNDLHMBNAME`, t1.`SPZT`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WCQK`, t1.`XGRZ`, t1.`ZMCL`, t1.`ZPFS`, t1.`ZT` FROM `T_PARLDNDLHMBMX` t1  LEFT JOIN T_PARLDNDLHMB t11 ON t1.PARLDNDLHMBID = t11.PARLDNDLHMBID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FGLDPF`, t1.`FZ`, t1.`JZSZPSFS`, t1.`KHBF`, t1.`MBLHYQ`, t1.`MBLX`, t1.`PARLDNDLHMBID`, t1.`PARLDNDLHMBMXID`, t1.`PARLDNDLHMBMXNAME`, t11.`PARLDNDLHMBNAME`, t1.`SPZT`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WCQK`, t1.`XGRZ`, t1.`ZMCL`, t1.`ZPFS`, t1.`ZT` FROM `T_PARLDNDLHMBMX` t1  LEFT JOIN T_PARLDNDLHMB t11 ON t1.PARLDNDLHMBID = t11.PARLDNDLHMBID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FGLDPF`, t1.`FZ`, t1.`JZSZPSFS`, t1.`KHBF`, t1.`MBLHYQ`, t1.`MBLX`, t1.`PARLDNDLHMBID`, t1.`PARLDNDLHMBMXID`, t1.`PARLDNDLHMBMXNAME`, t11.`PARLDNDLHMBNAME`, t1.`SPZT`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WCQK`, t1.`XGRZ`, t1.`ZMCL`, t1.`ZPFS`, t1.`ZT` FROM `T_PARLDNDLHMBMX` t1  LEFT JOIN T_PARLDNDLHMB t11 ON t1.PARLDNDLHMBID = t11.PARLDNDLHMBID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parlhmbkhmx/ParLhmbkhmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parlhmbkhmx/ParLhmbkhmxMapper.xml
@@ -37,12 +37,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BZFZ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FJ`, t1.`JZYQ`, t1.`KHBF`, t1.`LDDF`, t1.`PARLHMBKHMXID`, t1.`PARLHMBKHMXNAME`, t1.`PARNDLHMBKHID`, t11.`PARNDLHMBKHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WCBZ`, t1.`XH` FROM `T_PARLHMBKHMX` t1  LEFT JOIN T_PARNDLHMBKH t11 ON t1.PARNDLHMBKHID = t11.PARNDLHMBKHID  
+		<![CDATA[ SELECT t1.`BZFZ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FJ`, t1.`JZYQ`, t1.`KHBF`, t1.`LDDF`, t1.`PARLHMBKHMXID`, t1.`PARLHMBKHMXNAME`, t1.`PARNDLHMBKHID`, t11.`PARNDLHMBKHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WCBZ`, t1.`XH` FROM `T_PARLHMBKHMX` t1  LEFT JOIN T_PARNDLHMBKH t11 ON t1.PARNDLHMBKHID = t11.PARNDLHMBKHID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BZFZ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FJ`, t1.`JZYQ`, t1.`KHBF`, t1.`LDDF`, t1.`PARLHMBKHMXID`, t1.`PARLHMBKHMXNAME`, t1.`PARNDLHMBKHID`, t11.`PARNDLHMBKHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WCBZ`, t1.`XH` FROM `T_PARLHMBKHMX` t1  LEFT JOIN T_PARNDLHMBKH t11 ON t1.PARNDLHMBKHID = t11.PARNDLHMBKHID  
+		<![CDATA[ SELECT t1.`BZFZ`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FJ`, t1.`JZYQ`, t1.`KHBF`, t1.`LDDF`, t1.`PARLHMBKHMXID`, t1.`PARLHMBKHMXNAME`, t1.`PARNDLHMBKHID`, t11.`PARNDLHMBKHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WCBZ`, t1.`XH` FROM `T_PARLHMBKHMX` t1  LEFT JOIN T_PARNDLHMBKH t11 ON t1.PARNDLHMBKHID = t11.PARNDLHMBKHID  
 			]]>
    </sql>
 </mapper>

--- a/ehr-core/src/main/resources/mapper/par/parlhmbmx/ParLhmbmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parlhmbmx/ParLhmbmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/par/parndlhmbkh/ParNdlhmbkhMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parndlhmbkh/ParNdlhmbkhMapper.xml
--- a/ehr-core/src/main/resources/mapper/par/parptryndlhmb/ParPtryndlhmbMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parptryndlhmb/ParPtryndlhmbMapper.xml
--- a/ehr-core/src/main/resources/mapper/par/parptryndlhmbmx/ParPtryndlhmbmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parptryndlhmbmx/ParPtryndlhmbmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/par/partzgg/ParTzggMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/partzgg/ParTzggMapper.xml
--- a/ehr-core/src/main/resources/mapper/par/parxmbpjbz/ParXmbpjbzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parxmbpjbz/ParXmbpjbzMapper.xml
--- a/ehr-core/src/main/resources/mapper/par/parydgzjh/ParYdgzjhMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parydgzjh/ParYdgzjhMapper.xml
--- a/ehr-core/src/main/resources/mapper/par/parydgzjhmx/ParYdgzjhmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parydgzjhmx/ParYdgzjhmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/par/parznbmmx/ParZnbmmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parznbmmx/ParZnbmmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/par/parznbmndlhmb/ParZnbmndlhmbMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parznbmndlhmb/ParZnbmndlhmbMapper.xml
--- a/ehr-core/src/main/resources/mapper/par/parznbmndlhmbmx/ParZnbmndlhmbmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/par/parznbmndlhmbmx/ParZnbmndlhmbmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmawardswons/PcmAwardsWonsMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmawardswons/PcmAwardsWonsMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmbdsqd/PcmBdsqdMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmbdsqd/PcmBdsqdMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmbdsqdmx/PcmBdsqdmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmbdsqdmx/PcmBdsqdmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmcertofreg/PcmCertofregMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmcertofreg/PcmCertofregMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmcsrcmspj/PcmCsrcmspjMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmcsrcmspj/PcmCsrcmspjMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmddsqd/PcmDdsqdMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmddsqd/PcmDdsqdMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmddsqdmx/PcmDdsqdmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmddsqdmx/PcmDdsqdmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmeducationexperience/PcmEducationExperienceMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmeducationexperience/PcmEducationExperienceMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmgbhmc/PcmGbhmcMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmgbhmc/PcmGbhmcMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmgxml/PcmGxmlMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmgxml/PcmGxmlMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmgxxktemp/PCMGxxkTempMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmgxxktemp/PCMGxxkTempMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmjxsbdjl/PcmJxsbdjlMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmjxsbdjl/PcmJxsbdjlMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmjxsgz/PcmJxsgzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmjxsgz/PcmJxsgzMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmjxsygzzjlmx/PcmJxsygzzjlmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmjxsygzzjlmx/PcmJxsygzzjlmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmjxsygzzsq/PcmJxsygzzsqMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmjxsygzzsq/PcmJxsygzzsqMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmjxsygzzsqmx/PcmJxsygzzsqmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmjxsygzzsqmx/PcmJxsygzzsqmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmjxszzkhjgjl/PcmJxszzkhjgjlMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmjxszzkhjgjl/PcmJxszzkhjgjlMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmlog/PcmLogMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmlog/PcmLogMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmmonth/PcmMonthMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmmonth/PcmMonthMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmmspjxx/PcmMspjxxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmmspjxx/PcmMspjxxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmnorecyclinglibrary/PcmNoRecyclingLibraryMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmnorecyclinglibrary/PcmNoRecyclingLibraryMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmnotice/PcmNoticeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmnotice/PcmNoticeMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmpcmsgqmgr/PcmPcmSgqMgrMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmpcmsgqmgr/PcmPcmSgqMgrMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmpracticeexperience/PcmPracticeExperienceMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmpracticeexperience/PcmPracticeExperienceMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmprofile/PcmProfileMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmprofile/PcmProfileMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmprofileapproval/PcmProfileApprovalMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmprofileapproval/PcmProfileApprovalMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmprofilefj/PcmProfileFjMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmprofilefj/PcmProfileFjMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmprofileinitnumber/PcmProfileInitNumberMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmprofileinitnumber/PcmProfileInitNumberMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmprofilenumbeprefix/PcmProfileNumBeprefixMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmprofilenumbeprefix/PcmProfileNumBeprefixMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmprofilespyy/PcmProfileSpyyMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmprofilespyy/PcmProfileSpyyMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmprofileszyjtj/PcmProfileSzyjtjMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmprofileszyjtj/PcmProfileSzyjtjMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmprofileyjtjtemp/PcmProfileYjtjTempMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmprofileyjtjtemp/PcmProfileYjtjTempMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmrcxl/PcmRcxlMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmrcxl/PcmRcxlMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmreason/PcmReasonMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmreason/PcmReasonMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmrecruitment/PcmRecruitmentMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmrecruitment/PcmRecruitmentMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmrzgl/PcmRzglMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmrzgl/PcmRzglMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmschooloffice/PcmSchoolOfficeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmschooloffice/PcmSchoolOfficeMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmsgqmgr/PcmSgqMgrMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmsgqmgr/PcmSgqMgrMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmsyqgz/PcmSyqgzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmsyqgz/PcmSyqgzMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmtdzwxx/PcmTdzwxxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmtdzwxx/PcmTdzwxxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmtestresult/PcmTestResultMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmtestresult/PcmTestResultMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmtxbz/PcmTxbzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmtxbz/PcmTxbzMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmtxfpsq/PcmTxfpsqMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmtxfpsq/PcmTxfpsqMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmworkresume/PcmWorkResumeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmworkresume/PcmWorkResumeMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmwzd0001/PcmWzd0001Mapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmwzd0001/PcmWzd0001Mapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmxkml/PcmXkmlMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmxkml/PcmXkmlMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmxygzzjgwh/PcmXygzzjgwhMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmxygzzjgwh/PcmXygzzjgwhMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmxygzzjlmx/PcmXygzzjlmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmxygzzjlmx/PcmXygzzjlmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmxygzzkhjgjl/PcmXygzzkhjgjlMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmxygzzkhjgjl/PcmXygzzkhjgjlMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmxygzzsq/PcmXygzzsqMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmxygzzsq/PcmXygzzsqMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmxygzzsqmx/PcmXygzzsqmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmxygzzsqmx/PcmXygzzsqmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmydbxmx/PcmYdbxmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmydbxmx/PcmYdbxmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmyddgmx/PcmYddgmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmyddgmx/PcmYddgmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmydgzmx/PcmYdgzmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmydgzmx/PcmYdgzmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmydjdmx/PcmYdjdmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmydjdmx/PcmYdjdmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmydjpmx/PcmYdjpmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmydjpmx/PcmYdjpmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmydjzmx/PcmYdjzmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmydjzmx/PcmYdjzmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmydlzmx/PcmYdlzmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmydlzmx/PcmYdlzmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmydmx/PcmYdmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmydmx/PcmYdmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmydntmx/PcmYdntmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmydntmx/PcmYdntmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmydtxmx/PcmYdtxmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmydtxmx/PcmYdtxmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmypzjkxx/PcmYpzjkxxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmypzjkxx/PcmYpzjkxxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmzjdyzw/PcmZjdyzwMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmzjdyzw/PcmZjdyzwMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmzpmegl/PcmZpmeglMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmzpmegl/PcmZpmeglMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmzpmeglmx/PcmZpmeglmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmzpmeglmx/PcmZpmeglmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pcm/pcmzsgl/PcmZsglMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pcm/pcmzsgl/PcmZsglMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pcmdetail/PcmDetailMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pcmdetail/PcmDetailMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/personstatemgr/PersonStateMgrMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/personstatemgr/PersonStateMgrMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimachievements/PimAchievementsMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimachievements/PimAchievementsMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimarchivalcatalogue/PimArchivalCatalogueMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimarchivalcatalogue/PimArchivalCatalogueMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimarchives/PimArchivesMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimarchives/PimArchivesMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimarchivescenter/PimArchivesCenterMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimarchivescenter/PimArchivesCenterMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimarchiveschange/PimArchivesChangeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimarchiveschange/PimArchivesChangeMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimarchivesloanandreturn/PimArchiveSloanandreturnMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimarchivesloanandreturn/PimArchiveSloanandreturnMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimarchivesmanage/PimArchivesManageMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimarchivesmanage/PimArchivesManageMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimarchivesrecord/PimArchivesRecordMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimarchivesrecord/PimArchivesRecordMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimarmycadres/PimArmycadresMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimarmycadres/PimArmycadresMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimbudget/PimBudgetMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimbudget/PimBudgetMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimbyygzzsq/PimByygzzsqMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimbyygzzsq/PimByygzzsqMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimbyzzjlmx/PimByzzjlmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimbyzzjlmx/PimByzzjlmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimcity/PimCityMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimcity/PimCityMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimcontract/PimContractMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimcontract/PimContractMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimcontractsignorg/PimContractSignOrgMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimcontractsignorg/PimContractSignOrgMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimcontracttype/PimContractTypeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimcontracttype/PimContractTypeMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimcorrectionapply/PimCorrectionApplyMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimcorrectionapply/PimCorrectionApplyMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimdaterule/PimDateRuleMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimdaterule/PimDateRuleMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimdistirbution/PimDistirbutionMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimdistirbution/PimDistirbutionMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimeducation/PimEducationMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimeducation/PimEducationMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimenclosure/PimEnclosureMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimenclosure/PimEnclosureMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimexaminationresults/PimExaminationResultsMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimexaminationresults/PimExaminationResultsMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimexitandentry/PimExitandentryMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimexitandentry/PimExitandentryMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimexpaccount/PimExpaccountMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimexpaccount/PimExpaccountMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimfaminfo/PimFaminfoMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimfaminfo/PimFaminfoMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimfilebatvhupload/PimFilebatvhuploadMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimfilebatvhupload/PimFilebatvhuploadMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimgwtype/PimGwTypeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimgwtype/PimGwTypeMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimlabourcampany/PimLabourcampanyMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimlabourcampany/PimLabourcampanyMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimlanguageability/PimLanguageAbilityMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimlanguageability/PimLanguageAbilityMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimlwgz/PimLwgzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimlwgz/PimLwgzMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimmajorsetype/PimMajorSetypeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimmajorsetype/PimMajorSetypeMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimnationmgr/PimNationMgrMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimnationmgr/PimNationMgrMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimoutput/PimOutputMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimoutput/PimOutputMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimpaper/PimPaperMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimpaper/PimPaperMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimpatent/PimPatentMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimpatent/PimPatentMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimperson/PimPersonMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimperson/PimPersonMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimpersonability/PimPersonAbilityMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimpersonability/PimPersonAbilityMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimpersonabilitydetail/PimPersonAbilityDetailMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimpersonabilitydetail/PimPersonAbilityDetailMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimpersonchange/PimPersonChangeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimpersonchange/PimPersonChangeMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimprovince/PimProvinceMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimprovince/PimProvinceMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimqualmajor/PimQualMajorMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimqualmajor/PimQualMajorMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimqualtype/PimQualTypeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimqualtype/PimQualTypeMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimquestions/PimQuestionsMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimquestions/PimQuestionsMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimresearchfindings/PimResearchFindingsMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimresearchfindings/PimResearchFindingsMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimrewardpunishment/PimRewardPunishmentMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimrewardpunishment/PimRewardPunishmentMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimsearchfieldset/PimSearchFieldSetMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimsearchfieldset/PimSearchFieldSetMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimsearchmodal/PimSearchModalMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimsearchmodal/PimSearchModalMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimsocialsecurity/PimSocialSecurityMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimsocialsecurity/PimSocialSecurityMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimstafftype/PimStafftypeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimstafftype/PimStafftypeMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimtitle/PimTitleMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimtitle/PimTitleMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimtitlecatalogue/PimTitleCatalogueMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimtitlecatalogue/PimTitleCatalogueMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimtypecontract/PimTypeContractMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimtypecontract/PimTypeContractMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimvacation/PimVacationMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimvacation/PimVacationMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimvocational/PimVocationalMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimvocational/PimVocationalMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimvocationalcatalog/PimVocationalCatalogMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimvocationalcatalog/PimVocationalCatalogMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimworkflow/PimWorkflowMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimworkflow/PimWorkflowMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimworkflowref/PimWorkflowRefMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimworkflowref/PimWorkflowRefMapper.xml
--- a/ehr-core/src/main/resources/mapper/pim/pimworkhistory/PimWorkHistoryMapper.xml
+++ b/ehr-core/src/main/resources/mapper/pim/pimworkhistory/PimWorkHistoryMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salitem/SalItemMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salitem/SalItemMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salitemsub/SalItemSubMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salitemsub/SalItemSubMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/sallog/SalLogMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/sallog/SalLogMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salparam/SalParamMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salparam/SalParamMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salpersonstd/SalPersonStdMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salpersonstd/SalPersonStdMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salpersonstddetail/SALPERSONSTDDETAILMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salpersonstddetail/SALPERSONSTDDETAILMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salplan/SalPlanMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salplan/SalPlanMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salrule/SalRuleMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salrule/SalRuleMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salruledetail/SalRuleDetailMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salruledetail/SalRuleDetailMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salsalary/SalSalaryMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salsalary/SalSalaryMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salsalarybill/SalSalaryBillMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salsalarybill/SalSalaryBillMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salsalarydetail/SalSalaryDetailMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salsalarydetail/SalSalaryDetailMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salscheme/SalSchemeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salscheme/SalSchemeMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salschemeitem/SalSchemeItemMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salschemeitem/SalSchemeItemMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salsource/SalSourceMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salsource/SalSourceMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salstddszn/SalStddsznMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salstddszn/SalStddsznMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salstdgl/SalStdglMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salstdgl/SalStdglMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salstdgw/SalStdgwMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salstdgw/SalStdgwMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salstdgwgz/SalStdgwgzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salstdgwgz/SalStdgwgzMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salstdgwgzrate/SalStdGwGzrateMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salstdgwgzrate/SalStdGwGzrateMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salstdxmgz/SalStdXmgzMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salstdxmgz/SalStdXmgzMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salstdxmgzrate/SalStdXmgzRateMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salstdxmgzrate/SalStdXmgzRateMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salstdzc/SalStdzcMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salstdzc/SalStdzcMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salstdzj/SalStdzjMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salstdzj/SalStdzjMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salstdzx/SalStdzxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salstdzx/SalStdzxMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salstdzyzg/SalStdzyzgMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salstdzyzg/SalStdzyzgMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/salsubject/SalSubjectMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/salsubject/SalSubjectMapper.xml
--- a/ehr-core/src/main/resources/mapper/sal/saltype/SalTypeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/sal/saltype/SalTypeMapper.xml
--- a/ehr-core/src/main/resources/mapper/soc/socaccount/SocAccountMapper.xml
+++ b/ehr-core/src/main/resources/mapper/soc/socaccount/SocAccountMapper.xml
--- a/ehr-core/src/main/resources/mapper/soc/socarchives/SocArchivesMapper.xml
+++ b/ehr-core/src/main/resources/mapper/soc/socarchives/SocArchivesMapper.xml
--- a/ehr-core/src/main/resources/mapper/soc/socarchivesdetail/SocArchivesDetailMapper.xml
+++ b/ehr-core/src/main/resources/mapper/soc/socarchivesdetail/SocArchivesDetailMapper.xml
--- a/ehr-core/src/main/resources/mapper/soc/socarea/SocAreaMapper.xml
+++ b/ehr-core/src/main/resources/mapper/soc/socarea/SocAreaMapper.xml
--- a/ehr-core/src/main/resources/mapper/soc/socrecord/SocRecordMapper.xml
+++ b/ehr-core/src/main/resources/mapper/soc/socrecord/SocRecordMapper.xml
--- a/ehr-core/src/main/resources/mapper/soc/socrule/SocRuleMapper.xml
+++ b/ehr-core/src/main/resources/mapper/soc/socrule/SocRuleMapper.xml
--- a/ehr-core/src/main/resources/mapper/soc/socruledetail/SocRuleDetailMapper.xml
+++ b/ehr-core/src/main/resources/mapper/soc/socruledetail/SocRuleDetailMapper.xml
--- a/ehr-core/src/main/resources/mapper/soc/soctype/SocTypeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/soc/soctype/SocTypeMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/pcmwzd0002/PcmWzd0002Mapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/pcmwzd0002/PcmWzd0002Mapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmagencyrecord/TrmAgencyRecordMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmagencyrecord/TrmAgencyRecordMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmcouarrange/TrmCouarrangeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmcouarrange/TrmCouarrangeMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmcoursesystem/TrmCourseSystemMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmcoursesystem/TrmCourseSystemMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmdemdeftion/TrmDemdeftionMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmdemdeftion/TrmDemdeftionMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmdepart/TrmDepartMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmdepart/TrmDepartMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmdepartneeds/TrmDepartNeedsMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmdepartneeds/TrmDepartNeedsMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmdutycadres/TrmDutyCadresMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmdutycadres/TrmDutyCadresMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmemployeeretion/TrmEmployeeRetionMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmemployeeretion/TrmEmployeeRetionMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmgradecadres/TrmGradecadresMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmgradecadres/TrmGradecadresMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmhmatser/TrmHmatserMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmhmatser/TrmHmatserMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trminvoice/TrmInvoiceMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trminvoice/TrmInvoiceMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmlgbcost/TrmLgbCostMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmlgbcost/TrmLgbCostMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmlgbdetail/TrmLgbDetailMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmlgbdetail/TrmLgbDetailMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmplanformu/TrmPlanFormuMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmplanformu/TrmPlanFormuMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmstaff/TrmStaffMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmstaff/TrmStaffMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmstaffnodes/TrmStaffnodesMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmstaffnodes/TrmStaffnodesMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmstay/TrmStayMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmstay/TrmStayMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmteachercharge/TrmTeacherChargeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmteachercharge/TrmTeacherChargeMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmteachertrain/TrmTeacherTrainMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmteachertrain/TrmTeacherTrainMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtraffic/TrmTrafficMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtraffic/TrmTrafficMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtrainactapply/TrmTrainActapplyMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtrainactapply/TrmTrainActapplyMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtrainactment/TrmTrainActmentMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtrainactment/TrmTrainActmentMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtrainaddress/TrmTrainAddressMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtrainaddress/TrmTrainAddressMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtrainagency/TrmTrainAgencyMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtrainagency/TrmTrainAgencyMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtrainbuapply/TrmTrainBuapplyMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtrainbuapply/TrmTrainBuapplyMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtraincourse/TrmTrainCourseMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtraincourse/TrmTrainCourseMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtraindata/TrmTrainDataMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtraindata/TrmTrainDataMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtraindemand/TrmTrainDemandMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtraindemand/TrmTrainDemandMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtraindemandsum/TrmTrainDemandSumMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtraindemandsum/TrmTrainDemandSumMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtrainfacies/TrmTrainFaciesMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtrainfacies/TrmTrainFaciesMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtrainfillin/TrmTrainFillinMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtrainfillin/TrmTrainFillinMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtrainoutapply/TrmTrainOutApplyMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtrainoutapply/TrmTrainOutApplyMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtrainperson/TrmTrainPersonMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtrainperson/TrmTrainPersonMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtrainplan/TrmTrainPlanMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtrainplan/TrmTrainPlanMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtrainplanterm/TrmTrainPlantermMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtrainplanterm/TrmTrainPlantermMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtrainresment/TrmTrainResmentMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtrainresment/TrmTrainResmentMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmtrainteacher/TrmTrainTeacherMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmtrainteacher/TrmTrainTeacherMapper.xml
--- a/ehr-core/src/main/resources/mapper/trm/trmzzobm/TrmZzobmMapper.xml
+++ b/ehr-core/src/main/resources/mapper/trm/trmzzobm/TrmZzobmMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacdayoff/VacDayOffMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacdayoff/VacDayOffMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacholiday/VacHolidayMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacholiday/VacHolidayMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacholidayrules/VacHolidayRulesMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacholidayrules/VacHolidayRulesMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacinitnxj/VacInitnxjMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacinitnxj/VacInitnxjMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacleacetype/VacLeaceTypeMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacleacetype/VacLeaceTypeMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacleavedetail/VacLeaveDetailMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacleavedetail/VacLeaveDetailMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacleavemanage/VacLeaveManageMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacleavemanage/VacLeaveManageMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacleavesystem/VacLeaveSystemMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacleavesystem/VacLeaveSystemMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacleavesystemdtail/VacLeaveSystemDtailMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacleavesystemdtail/VacLeaveSystemDtailMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacleavetips/VacLeaveTipsMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacleavetips/VacLeaveTipsMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacoveralltion/VacOveralltionMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacoveralltion/VacOveralltionMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacsituation/VacSituationMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacsituation/VacSituationMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacsituationdetail/VacSituationDetailMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacsituationdetail/VacSituationDetailMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacsynjcx/VacSynjcxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacsynjcx/VacSynjcxMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacsystemapplication/VacSystemApplicationMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacsystemapplication/VacSystemApplicationMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacsystemhistory/VacSystemHistoryMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacsystemhistory/VacSystemHistoryMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacusenxjmx/VacUseNxjmxMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacusenxjmx/VacUseNxjmxMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacwfqj/VacWFQjMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacwfqj/VacWFQjMapper.xml
--- a/ehr-core/src/main/resources/mapper/vac/vacworkday/VacWorkDayMapper.xml
+++ b/ehr-core/src/main/resources/mapper/vac/vacworkday/VacWorkDayMapper.xml
--- a/ehr-provider/ehr-provider-webapi/src/main/docker/Dockerfile
+++ b/ehr-provider/ehr-provider-webapi/src/main/docker/Dockerfile
--- a/ehr-provider/ehr-provider-webapi/src/main/docker/ehr-provider-webapi.yaml
+++ b/ehr-provider/ehr-provider-webapi/src/main/docker/ehr-provider-webapi.yaml
--- a/ehr-util/src/main/resources/application-sys.yml
+++ b/ehr-util/src/main/resources/application-sys.yml