Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/workspace.xml
| | |
| | | <component name="ProjectModuleManager"> |
| | | <modules> |
| | | <module fileurl="file://$PROJECT_DIR$/ruoyi.iml" filepath="$PROJECT_DIR$/ruoyi.iml" /> |
| | | <module fileurl="file://$PROJECT_DIR$/ruoyi-admin/ruoyi-admin.iml" filepath="$PROJECT_DIR$/ruoyi-admin/ruoyi-admin.iml" /> |
| | | <module fileurl="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common.iml" filepath="$PROJECT_DIR$/ruoyi-common/ruoyi-common.iml" /> |
| | | <module fileurl="file://$PROJECT_DIR$/ruoyi-framework/ruoyi-framework.iml" filepath="$PROJECT_DIR$/ruoyi-framework/ruoyi-framework.iml" /> |
| | | <module fileurl="file://$PROJECT_DIR$/ruoyi-generator/ruoyi-generator.iml" filepath="$PROJECT_DIR$/ruoyi-generator/ruoyi-generator.iml" /> |
| | |
| | | |
| | | <name>ruoyi</name> |
| | | <url>http://www.ruoyi.vip</url> |
| | | <description>è¥ä¾ç®¡çç³»ç»</description> |
| | | <description>æºæ
§æå¡ç®¡çç³»ç»</description> |
| | | |
| | | <properties> |
| | | <ruoyi.version>3.8.5</ruoyi.version> |
| | |
| | | public static void main(String[] args) { |
| | | // System.setProperty("spring.devtools.restart.enabled", "false"); |
| | | SpringApplication.run(RuoYiApplication.class, args); |
| | | System.out.println("(â¥â â¿â )ï¾ï¾ è¥ä¾å¯å¨æå á(´ڡ`á)ï¾ \n" + |
| | | System.out.println("(â¥â â¿â )ï¾ï¾ æºæ
§æå¡å¯å¨æå á(´ڡ`á)ï¾ \n" + |
| | | " .-------. ____ __ \n" + |
| | | " | _ _ \\ \\ \\ / / \n" + |
| | | " | ( ' ) | \\ _. / ' \n" + |
| | |
| | | // ç¨ApiInfoBuilderè¿è¡å®å¶ |
| | | return new ApiInfoBuilder() |
| | | // 设置æ é¢ |
| | | .title("æ é¢ï¼è¥ä¾ç®¡çç³»ç»_æ¥å£ææ¡£") |
| | | .title("æ é¢ï¼æºæ
§æå¡ç®¡çç³»ç»_æ¥å£ææ¡£") |
| | | // æè¿° |
| | | .description("æè¿°ï¼ç¨äºç®¡çé墿ä¸å
¬å¸ç人åä¿¡æ¯,å
·ä½å
æ¬XXX,XXX模å...") |
| | | // ä½è
ä¿¡æ¯ |
| | |
| | | druid: |
| | | # ä¸»åºæ°æ®æº |
| | | master: |
| | | # ä¹ä¹äºé¢ |
| | | # url: jdbc:mysql://127.0.0.1:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 |
| | | # username: root |
| | | # password: 123456 |
| | | # å
¬å¸ |
| | | url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 |
| | | # 丽水 |
| | | # url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 |
| | | username: smartor |
| | | password: Smartor.2023 |
| | | driverClassName: com.mysql.cj.jdbc.Driver |
| | | # æ°å |
| | | # url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 |
| | | # username: smartor |
| | | # password: Smartor.2023 |
| | | # driverClassName: com.mysql.cj.jdbc.Driver |
| | | # ä¹ä¹äºé¢ |
| | | # url: jdbc:mysql://127.0.0.1:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 |
| | | # username: root |
| | | # password: 123456 |
| | | |
| | | # å
¬å¸äº |
| | | # url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 |
| | | # username: hxsoft |
| | | # password: Hxerp2000 |
| | | # driverClassName: com.mysql.cj.jdbc.Driver |
| | | # å
¬å¸ |
| | | # url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 |
| | | # 丽水 |
| | | # url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 |
| | | # username: smartor |
| | | # password: Smartor.2023 |
| | | # driverClassName: com.mysql.cj.jdbc.Driver |
| | | |
| | | # æ°å |
| | | # url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 |
| | | # username: smartor |
| | | # password: Smartor.2023 |
| | | # driverClassName: com.mysql.cj.jdbc.Driver |
| | | |
| | | # å
¬å¸äº |
| | | url: jdbc:mysql://116.62.18.175:6002/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 |
| | | username: hxsoft |
| | | password: Hxerp2000 |
| | | driverClassName: com.mysql.cj.jdbc.Driver |
| | | |
| | | # ä»åºæ°æ®æº |
| | | slave: |
| | |
| | | <?xml version="1.0" encoding="UTF-8"?> |
| | | <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
| | | <module external.system.module.type="SINGLE_MODULE" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
| | | <component name="FacetManager"> |
| | | <facet type="web" name="Web"> |
| | | <configuration> |
| | | <webroots /> |
| | | <sourceRoots> |
| | | <root url="file://$MODULE_DIR$/src/main/java" /> |
| | | <root url="file://$MODULE_DIR$/src/main/resources" /> |
| | | </sourceRoots> |
| | | </configuration> |
| | | </facet> |
| | | <facet type="Spring" name="Spring"> |
| | |
| | | <output-test url="file://$MODULE_DIR$/target/test-classes" /> |
| | | <content url="file://$MODULE_DIR$"> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> |
| | | <excludeFolder url="file://$MODULE_DIR$/target" /> |
| | | </content> |
| | | <orderEntry type="inheritedJdk" /> |
| | |
| | | <?xml version="1.0" encoding="UTF-8"?> |
| | | <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
| | | <module external.system.module.type="SINGLE_MODULE" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
| | | <component name="FacetManager"> |
| | | <facet type="web" name="Web"> |
| | | <configuration> |
| | | <webroots /> |
| | | <sourceRoots> |
| | | <root url="file://$MODULE_DIR$/src/main/java" /> |
| | | <root url="file://$MODULE_DIR$/src/main/resources" /> |
| | | </sourceRoots> |
| | | </configuration> |
| | | </facet> |
| | | <facet type="Spring" name="Spring"> |
| | |
| | | <output-test url="file://$MODULE_DIR$/target/test-classes" /> |
| | | <content url="file://$MODULE_DIR$"> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> |
| | | <excludeFolder url="file://$MODULE_DIR$/target" /> |
| | | </content> |
| | | <orderEntry type="inheritedJdk" /> |
| | |
| | | <?xml version="1.0" encoding="UTF-8"?> |
| | | <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
| | | <module external.system.module.type="SINGLE_MODULE" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
| | | <component name="FacetManager"> |
| | | <facet type="web" name="Web"> |
| | | <configuration> |
| | | <webroots /> |
| | | <sourceRoots> |
| | | <root url="file://$MODULE_DIR$/src/main/java" /> |
| | | <root url="file://$MODULE_DIR$/src/main/resources" /> |
| | | </sourceRoots> |
| | | </configuration> |
| | | </facet> |
| | | <facet type="Spring" name="Spring"> |
| | |
| | | <content url="file://$MODULE_DIR$"> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> |
| | | <excludeFolder url="file://$MODULE_DIR$/target" /> |
| | | </content> |
| | | <orderEntry type="inheritedJdk" /> |
| | |
| | | */ |
| | | public static String replaceText(String text) |
| | | { |
| | | return RegExUtils.replaceAll(text, "(?:表|è¥ä¾)", ""); |
| | | return RegExUtils.replaceAll(text, "(?:表|婿¹)", ""); |
| | | } |
| | | |
| | | /** |
| | |
| | | <?xml version="1.0" encoding="UTF-8"?> |
| | | <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
| | | <module external.system.module.type="SINGLE_MODULE" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
| | | <component name="FacetManager"> |
| | | <facet type="web" name="Web"> |
| | | <configuration> |
| | | <webroots /> |
| | | <sourceRoots> |
| | | <root url="file://$MODULE_DIR$/src/main/java" /> |
| | | <root url="file://$MODULE_DIR$/src/main/resources" /> |
| | | </sourceRoots> |
| | | </configuration> |
| | | </facet> |
| | | <facet type="Spring" name="Spring"> |
| | |
| | | <content url="file://$MODULE_DIR$"> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> |
| | | <excludeFolder url="file://$MODULE_DIR$/target" /> |
| | | </content> |
| | | <orderEntry type="inheritedJdk" /> |
| | |
| | | <?xml version="1.0" encoding="UTF-8"?> |
| | | <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
| | | <module external.system.module.type="SINGLE_MODULE" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
| | | <component name="FacetManager"> |
| | | <facet type="web" name="Web"> |
| | | <configuration> |
| | | <webroots /> |
| | | <sourceRoots> |
| | | <root url="file://$MODULE_DIR$/src/main/java" /> |
| | | <root url="file://$MODULE_DIR$/src/main/resources" /> |
| | | </sourceRoots> |
| | | </configuration> |
| | | </facet> |
| | | <facet type="Spring" name="Spring"> |
| | |
| | | <content url="file://$MODULE_DIR$"> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> |
| | | <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> |
| | | <excludeFolder url="file://$MODULE_DIR$/target" /> |
| | | </content> |
| | | <orderEntry type="inheritedJdk" /> |
| | |
| | | # 页颿 é¢ |
| | | VUE_APP_TITLE = è¥ä¾ç®¡çç³»ç» |
| | | VUE_APP_TITLE = æºæ
§æå¡ç®¡çç³»ç» |
| | | |
| | | # å¼åç¯å¢é
ç½® |
| | | ENV = 'development' |
| | |
| | | # 页颿 é¢ |
| | | VUE_APP_TITLE = è¥ä¾ç®¡çç³»ç» |
| | | VUE_APP_TITLE = æºæ
§æå¡ç®¡çç³»ç» |
| | | |
| | | # ç产ç¯å¢é
ç½® |
| | | ENV = 'production' |
| | | |
| | | # è¥ä¾ç®¡çç³»ç»/ç产ç¯å¢ |
| | | # æºæ
§æå¡ç®¡çç³»ç»/ç产ç¯å¢ |
| | | VUE_APP_BASE_API = '/prod-api' |
| | |
| | | # 页颿 é¢ |
| | | VUE_APP_TITLE = è¥ä¾ç®¡çç³»ç» |
| | | VUE_APP_TITLE = æºæ
§æå¡ç®¡çç³»ç» |
| | | |
| | | NODE_ENV = production |
| | | |
| | | # æµè¯ç¯å¢é
ç½® |
| | | ENV = 'staging' |
| | | |
| | | # è¥ä¾ç®¡çç³»ç»/æµè¯ç¯å¢ |
| | | # æºæ
§æå¡ç®¡çç³»ç»/æµè¯ç¯å¢ |
| | | VUE_APP_BASE_API = '/stage-api' |
| | |
| | | { |
| | | "name": "ruoyi", |
| | | "version": "3.8.5", |
| | | "description": "è¥ä¾ç®¡çç³»ç»", |
| | | "author": "è¥ä¾", |
| | | "description": "æºæ
§æå¡ç³»ç»", |
| | | "author": "æå·å©æ¹", |
| | | "license": "MIT", |
| | | "scripts": { |
| | | "dev": "vue-cli-service serve", |
| | |
| | | }, |
| | | data() { |
| | | return { |
| | | title: 'è¥ä¾ç®¡çç³»ç»', |
| | | title: 'æºæ
§æå¡ç®¡çç³»ç»', |
| | | logo: logoImg |
| | | } |
| | | } |
| | |
| | | </el-row> |
| | | <el-row :gutter="20"> |
| | | <el-col :sm="24" :lg="12" style="padding-left: 20px"> |
| | | <h2>è¥ä¾åå°ç®¡çæ¡æ¶</h2> |
| | | <h2>æºæ
§æå¡ç®¡çæ¡æ¶</h2> |
| | | <p> |
| | | ä¸ç´æ³å䏿¬¾åå°ç®¡çç³»ç»ï¼çäºå¾å¤ä¼ç§ç弿ºé¡¹ç®ä½æ¯åç°æ²¡æåéèªå·±çãäºæ¯å©ç¨ç©ºé²ä¼æ¯æ¶é´å¼å§èªå·±åä¸å¥åå°ç³»ç»ã妿¤æäºè¥ä¾ç®¡çç³»ç»ï¼å¥¹å¯ä»¥ç¨äºææçWebåºç¨ç¨åºï¼å¦ç½ç«ç®¡çåå°ï¼ç½ç«ä¼åä¸å¿ï¼CMSï¼CRMï¼OAççï¼å½ç¶ï¼æ¨ä¹å¯ä»¥å¯¹å¥¹è¿è¡æ·±åº¦å®å¶ï¼ä»¥ååºæ´å¼ºç³»ç»ãææå端åå°ä»£ç å°è£
è¿åååç²¾ç®æä¸æï¼åºéæ¦çä½ãåæ¶æ¯æç§»å¨å®¢æ·ç«¯è®¿é®ãç³»ç»ä¼éç»æ´æ°ä¸äºå®ç¨åè½ã |
| | | ä¸ç´æ³å䏿¬¾åå°ç®¡çç³»ç»ï¼çäºå¾å¤ä¼ç§ç弿ºé¡¹ç®ä½æ¯åç°æ²¡æåéèªå·±çãäºæ¯å©ç¨ç©ºé²ä¼æ¯æ¶é´å¼å§èªå·±åä¸å¥åå°ç³»ç»ã妿¤æäºæºæ
§æå¡ç®¡çç³»ç»ï¼å¥¹å¯ä»¥ç¨äºææçWebåºç¨ç¨åºï¼å¦ç½ç«ç®¡çåå°ï¼ç½ç«ä¼åä¸å¿ï¼CMSï¼CRMï¼OAççï¼å½ç¶ï¼æ¨ä¹å¯ä»¥å¯¹å¥¹è¿è¡æ·±åº¦å®å¶ï¼ä»¥ååºæ´å¼ºç³»ç»ãææå端åå°ä»£ç å°è£
è¿åååç²¾ç®æä¸æï¼åºéæ¦çä½ãåæ¶æ¯æç§»å¨å®¢æ·ç«¯è®¿é®ãç³»ç»ä¼éç»æ´æ°ä¸äºå®ç¨åè½ã |
| | | </p> |
| | | <p> |
| | | <b>å½åçæ¬:</b> <span>v{{ version }}</span> |
| | |
| | | <p> |
| | | <i class="el-icon-user-solid"></i> QQ群ï¼<s>满937441</s> <s>满887144332</s> |
| | | <s>满180251782</s> <s>满104180207</s> <s>满186866453</s> <s>满201396349</s> |
| | | <s>满101456076</s> <s>满101539465</s> <s>满264312783</s> <s>满167385320</s> |
| | | <s>满101456076</s> <s>满101539465</s> <s>满264312783</s> <s>满167385320</s> |
| | | <s>满104748341</s> <s>满160110482</s> <s>满170801498</s> <a href="https://jq.qq.com/?_wv=1027&k=eCx8eyoJ" target="_blank"> |
| | | 108482800</a |
| | | > |
| | |
| | | <p> |
| | | <i class="el-icon-chat-dot-round"></i> 微信ï¼<a |
| | | href="javascript:;" |
| | | >/ *è¥ä¾</a |
| | | >/ *婿¹</a |
| | | > |
| | | </p> |
| | | <p> |
| | | <i class="el-icon-money"></i> æ¯ä»å®ï¼<a |
| | | href="javascript:;" |
| | | class="æ¯ä»å®ä¿¡æ¯" |
| | | >/ *è¥ä¾</a |
| | | >/ *婿¹</a |
| | | > |
| | | </p> |
| | | </div> |
| | |
| | | </el-collapse-item> |
| | | <el-collapse-item title="v1.0.0 - 2019-10-08"> |
| | | <ol> |
| | | <li>è¥ä¾åå端åç¦»ç³»ç»æ£å¼åå¸</li> |
| | | <li>æºæ
§æå¡åå端åç¦»ç³»ç»æ£å¼åå¸</li> |
| | | </ol> |
| | | </el-collapse-item> |
| | | </el-collapse> |
| | |
| | | <template> |
| | | <div class="login"> |
| | | <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form"> |
| | | <h3 class="title">è¥ä¾åå°ç®¡çç³»ç»</h3> |
| | | <h3 class="title">æºæ
§æå¡åå°ç®¡çç³»ç»</h3> |
| | | <el-form-item prop="username"> |
| | | <el-input |
| | | v-model="loginForm.username" |
| | |
| | | <template> |
| | | <div class="register"> |
| | | <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form"> |
| | | <h3 class="title">è¥ä¾åå°ç®¡çç³»ç»</h3> |
| | | <h3 class="title">æºæ
§æå¡åå°ç®¡çç³»ç»</h3> |
| | | <el-form-item prop="username"> |
| | | <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="è´¦å·"> |
| | | <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" /> |
| | |
| | | |
| | | const CompressionPlugin = require('compression-webpack-plugin') |
| | | |
| | | const name = process.env.VUE_APP_TITLE || 'è¥ä¾ç®¡çç³»ç»' // ç½é¡µæ é¢ |
| | | const name = process.env.VUE_APP_TITLE || 'æºæ
§æå¡ç®¡çç³»ç»' // ç½é¡µæ é¢ |
| | | |
| | | const port = process.env.port || process.env.npm_config_port || 8090 // ç«¯å£ |
| | | |
| | |
| | | </configuration> |
| | | </facet> |
| | | <facet type="Spring" name="Spring"> |
| | | <configuration /> |
| | | <configuration> |
| | | <fileset id="fileset" name="Spring åºç¨ç¨åºä¸ä¸æ" removed="false"> |
| | | <file>file://$MODULE_DIR$/src/main/java/com/smartor/config/RobotPhoneUtils.java</file> |
| | | </fileset> |
| | | </configuration> |
| | | </facet> |
| | | </component> |
| | | <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> |
| | |
| | | private String wechat; |
| | | |
| | | /** |
| | | * è¯æåç§° |
| | | * åºé¢è¯æç¼ç |
| | | */ |
| | | @Excel(name = " è¯æåç§°") |
| | | @ApiModelProperty(value = "è¯æåç§°") |
| | | private String diagname; |
| | | @Excel(name = " åºé¢è¯æç¼ç ") |
| | | @ApiModelProperty(value = "åºé¢è¯æç¼ç ") |
| | | private String leaveicd10code; |
| | | /** |
| | | * åºé¢è¯æåç§° |
| | | */ |
| | | @Excel(name = " åºé¢è¯æåç§°") |
| | | @ApiModelProperty(value = "åºé¢è¯æåç§°") |
| | | private String leavediagname; |
| | | |
| | | /** |
| | | * æ£è
ID |
| | |
| | | |
| | | @ApiModelProperty(value = "æ¯å¦å¾ªç¯æ§è¡æ£è
ï¼0:ä¸å¾ªç¯ 1ï¼å¾ªç¯ï¼") |
| | | private Long patCycle; |
| | | /** |
| | | * æ¯å¦æä¸ä¸ªä»»å¡ï¼ç¨äºå¤ä»»å¡å
³è |
| | | */ |
| | | @ApiModelProperty(value = "æ¯å¦æä¸ä¸ªä»»å¡ï¼0:æ 1ï¼æï¼") |
| | | @Excel(name = "æ¯å¦æä¸ä¸ªä»»å¡ï¼0:æ 1ï¼æï¼") |
| | | private String nexttaskflag; |
| | | /** |
| | | * ä¸ä¸ä¸ªä»»å¡id |
| | | */ |
| | | @ApiModelProperty(value = "ä¸ä¸ä¸ªä»»å¡id") |
| | | @Excel(name = " ä¸ä¸ä¸ªä»»å¡id") |
| | | private Long nexttaskid; |
| | | /** |
| | | * ä¸ä¸ä¸ªä»»å¡åç§° |
| | | */ |
| | | @ApiModelProperty(value = "ä¸ä¸ä¸ªä»»å¡åç§°") |
| | | @Excel(name = " ä¸ä¸ä¸ªä»»å¡åç§°") |
| | | private String nexttaskname; |
| | | } |
| | |
| | | |
| | | @ApiModelProperty(value = "æ¯å¦å¾ªç¯æ§è¡æ£è
ï¼0:ä¸å¾ªç¯ 1ï¼å¾ªç¯ï¼") |
| | | private Long patCycle = 0L; |
| | | /** |
| | | * æ¯å¦æä¸ä¸ªä»»å¡ï¼ç¨äºå¤ä»»å¡å
³è |
| | | */ |
| | | @ApiModelProperty(value = "æ¯å¦æä¸ä¸ªä»»å¡ï¼0:æ 1ï¼æï¼") |
| | | @Excel(name = "æ¯å¦æä¸ä¸ªä»»å¡ï¼0:æ 1ï¼æï¼") |
| | | private String nexttaskflag; |
| | | /** |
| | | * ä¸ä¸ä¸ªä»»å¡id |
| | | */ |
| | | @ApiModelProperty(value = "ä¸ä¸ä¸ªä»»å¡id") |
| | | @Excel(name = " ä¸ä¸ä¸ªä»»å¡id") |
| | | private Long nexttaskid; |
| | | /** |
| | | * ä¸ä¸ä¸ªä»»å¡åç§° |
| | | */ |
| | | @ApiModelProperty(value = "ä¸ä¸ä¸ªä»»å¡åç§°") |
| | | @Excel(name = " ä¸ä¸ä¸ªä»»å¡åç§°") |
| | | private String nexttaskname; |
| | | } |
| | |
| | | patTaskRelevance.setPhone(serviceSubtask1.getPhone()); |
| | | patTaskRelevance.setTelcode(serviceSubtask1.getPhone()); |
| | | patTaskRelevance.setAddr(serviceSubtask1.getAddr()); |
| | | patTaskRelevance.setDiagname(serviceSubtask1.getDiagname()); |
| | | patTaskRelevance.setDiagname(serviceSubtask1.getLeavediagname()); |
| | | patTaskRelevance.setPatid(serviceSubtask1.getPatid()); |
| | | patTaskRelevance.setSendStatus(serviceSubtask1.getSendstate()); |
| | | patTaskRelevance.setDeptCode(serviceSubtask1.getDeptcode()); |
| | |
| | | patTaskRelevance.setDeptName(serviceSubtask1.getDeptname()); |
| | | patTaskRelevance.setDeptCode(serviceSubtask1.getDeptcode()); |
| | | patTaskRelevance.setBedNo(serviceSubtask1.getBedNo()); |
| | | patTaskRelevance.setDiagname(serviceSubtask1.getDiagname()); |
| | | patTaskRelevance.setDiagname(serviceSubtask1.getLeavediagname()); |
| | | patTaskRelevance.setPatid(serviceSubtask1.getPatid()); |
| | | patTaskRelevance.setSendStatus(serviceSubtask1.getSendstate()); |
| | | patTaskRelevance.setLeavehospitaldistrictcode(serviceSubtask1.getLeavehospitaldistrictcode()); |
| | |
| | | patTaskRelevance.setSfzh(serviceSubtask1.getSfzh()); |
| | | patTaskRelevance.setPhone(serviceSubtask1.getPhone()); |
| | | patTaskRelevance.setAddr(serviceSubtask1.getAddr()); |
| | | patTaskRelevance.setDiagname(serviceSubtask1.getDiagname()); |
| | | patTaskRelevance.setDiagname(serviceSubtask1.getLeavediagname()); |
| | | patTaskRelevance.setPatid(serviceSubtask1.getPatid()); |
| | | patTaskRelevance.setSendStatus(serviceSubtask1.getSendstate()); |
| | | patTaskRelevances.add(patTaskRelevance); |
| | |
| | | patTaskRelevance.setAddr(serviceSubtask1.getAddr()); |
| | | patTaskRelevance.setDeptName(serviceSubtask1.getDeptname()); |
| | | patTaskRelevance.setBedNo(serviceSubtask1.getBedNo()); |
| | | patTaskRelevance.setDiagname(serviceSubtask1.getDiagname()); |
| | | patTaskRelevance.setDiagname(serviceSubtask1.getLeavediagname()); |
| | | patTaskRelevance.setPatid(serviceSubtask1.getPatid()); |
| | | patTaskRelevance.setSendStatus(serviceSubtask1.getSendstate()); |
| | | patTaskRelevances.add(patTaskRelevance); |
| | |
| | | <result property="hospno" column="hospno"/> |
| | | <result property="hospType" column="hosp_type"/> |
| | | <result property="wechat" column="wechat"/> |
| | | <result property="diagname" column="diagname"/> |
| | | <result property="leaveicd10code" column="leaveicd10code"/> |
| | | <result property="leavediagname" column="leavediagname"/> |
| | | <result property="deptname" column="deptname"/> |
| | | <result property="admindate" column="admindate"/> |
| | | <result property="roomno" column="roomno"/> |
| | |
| | | stop_state, |
| | | leavehospitaldistrictcode, |
| | | leavehospitaldistrictname, |
| | | diagname |
| | | leavediagname,leaveicd10code |
| | | from service_subtask |
| | | </sql> |
| | | |
| | |
| | | <if test="roomno != null and roomno != ''">roomno,</if> |
| | | <if test="admindate != null">admindate,</if> |
| | | <if test="deptname != null and deptname != ''">deptname,</if> |
| | | <if test="diagname != null and diagname != ''">diagname,</if> |
| | | <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code,</if> |
| | | <if test="leavediagname != null and leavediagname != ''">leavediagname,</if> |
| | | <if test="libtemplateid != null ">libtemplateid,</if> |
| | | <if test="libtemplatename != null ">libtemplatename,</if> |
| | | <if test="patid != null ">patid,</if> |
| | |
| | | <if test="roomno != null and roomno != ''">#{roomno},</if> |
| | | <if test="admindate != null ">#{admindate},</if> |
| | | <if test="deptname != null and deptname != ''">#{deptname},</if> |
| | | <if test="diagname != null and diagname != ''">#{diagname},</if> |
| | | <if test="leaveicd10code != null and leaveicd10code != ''">#{leaveicd10code},</if> |
| | | <if test="leavediagname != null and leavediagname != ''">#{leavediagname},</if> |
| | | <if test="libtemplateid != null ">#{libtemplateid},</if> |
| | | <if test="libtemplatename != null ">#{libtemplatename},</if> |
| | | <if test="patid != null ">#{patid},</if> |
| | |
| | | <if test="roomno != null and roomno != ''">roomno = #{roomno},</if> |
| | | <if test="admindate != null ">admindate = #{admindate},</if> |
| | | <if test="deptname != null and deptname != ''">deptname = #{deptname},</if> |
| | | <if test="diagname != null and diagname != ''">diagname = #{diagname},</if> |
| | | <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if> |
| | | <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if> |
| | | <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if> |
| | | <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if> |
| | | <if test="patid != null ">patid = #{patid},</if> |
| | |
| | | <if test="roomno != null and roomno != ''">roomno = #{roomno},</if> |
| | | <if test="admindate != null">admindate = #{admindate},</if> |
| | | <if test="deptname != null and deptname != ''">deptname = #{deptname},</if> |
| | | <if test="diagname != null and diagname != ''">diagname = #{diagname},</if> |
| | | <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if> |
| | | <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if> |
| | | <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if> |
| | | <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if> |
| | | <if test="patid != null ">patid = #{patid},</if> |
| | |
| | | <if test="roomno != null and roomno != ''">roomno = #{roomno},</if> |
| | | <if test="admindate != null">admindate = #{admindate},</if> |
| | | <if test="deptname != null and deptname != ''">deptname = #{deptname},</if> |
| | | <if test="diagname != null and diagname != ''">diagname = #{diagname},</if> |
| | | <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if> |
| | | <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if> |
| | | <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if> |
| | | <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if> |
| | | <if test="patid != null ">patid = #{patid},</if> |
| | |
| | | <if test="roomno != null and roomno != ''">roomno = #{roomno},</if> |
| | | <if test="admindate != null ">admindate = #{admindate},</if> |
| | | <if test="deptname != null and deptname != ''">deptname = #{deptname},</if> |
| | | <if test="diagname != null and diagname != ''">diagname = #{diagname},</if> |
| | | <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if> |
| | | <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if> |
| | | <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if> |
| | | <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if> |
| | | <if test="patid != null ">patid = #{patid},</if> |
| | |
| | | inhospid, |
| | | patfrom, |
| | | task_guid, |
| | | diagname |
| | | leavediagname, |
| | | leaveicd10code |
| | | FROM service_subtask, |
| | | JSON_TABLE(send_time_slot, '$[*]' COLUMNS ( |
| | | begantime DATETIME PATH '$.begantime', |
| | |
| | | <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/> |
| | | <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/> |
| | | <result property="compensateDate" column="compensate_date"/> |
| | | <result property="nexttaskflag" column="nexttaskflag"/> |
| | | <result property="nexttaskid" column="nexttaskid"/> |
| | | <result property="nexttaskname" column="nexttaskname"/> |
| | | </resultMap> |
| | | |
| | | <sql id="selectServiceTaskVo"> |
| | |
| | | jsy, |
| | | leavehospitaldistrictcode, |
| | | leavehospitaldistrictname, |
| | | orgid |
| | | orgid, |
| | | nexttaskflag, |
| | | nexttaskid, |
| | | nexttaskname |
| | | from service_task |
| | | </sql> |
| | | |
| | |
| | | <if test="sendState != null ">and send_state = #{sendState}</if> |
| | | <if test="compensateDate != null ">and compensate_date = #{compensateDate}</if> |
| | | <if test="patCycle != null ">and pat_cycle = #{patCycle}</if> |
| | | <if test="nexttaskflag != null ">and nexttaskflag = #{nexttaskflag}</if> |
| | | <if test="nexttaskid != null ">and nexttaskid = #{nexttaskid}</if> |
| | | <if test="nexttaskname != null ">and nexttaskname = #{nexttaskname}</if> |
| | | <if test="leavehospitaldistrictname != null ">and leavehospitaldistrictname = |
| | | #{leavehospitaldistrictname} |
| | | </if> |
| | |
| | | service_task.leavehospitaldistrictcode, |
| | | service_task.leavehospitaldistrictname, |
| | | service_task.pat_cycle, |
| | | service_task.nexttaskflag, |
| | | service_task.nexttaskid, |
| | | service_task.nexttaskname, |
| | | service_task.orgid from service_task |
| | | <where> |
| | | service_task.del_flag=0 |
| | |
| | | <if test="sendState != null ">and service_task.send_state = #{sendState}</if> |
| | | <if test="compensateDate != null ">and service_task.compensate_date = #{compensateDate}</if> |
| | | <if test="patCycle != null ">and service_task.pat_cycle = #{patCycle}</if> |
| | | <if test="nexttaskflag != null ">and nexttaskflag = #{nexttaskflag}</if> |
| | | <if test="nexttaskid != null ">and nexttaskid = #{nexttaskid}</if> |
| | | <if test="nexttaskname != null ">and nexttaskname = #{nexttaskname}</if> |
| | | <if test="leavehospitaldistrictname != null ">and service_task.leavehospitaldistrictname = |
| | | #{leavehospitaldistrictname} |
| | | </if> |
| | |
| | | <if test="isupload != null">#{isupload},</if> |
| | | <if test="uploadTime != null">#{uploadTime},</if> |
| | | <if test="orgid != null">#{orgid},</if> |
| | | <if test="nexttaskflag != null">#{nexttaskflag},</if> |
| | | <if test="nexttaskid != null">#{nexttaskid},</if> |
| | | <if test="nexttaskname != null">#{nexttaskname},</if> |
| | | <if test="pid != null">#{pid},</if> |
| | | <if test="guid != null">#{guid},</if> |
| | | <if test="preachform != null">#{preachform},</if> |
| | |
| | | <if test="isupload != null">isupload = #{isupload},</if> |
| | | <if test="uploadTime != null">upload_time = #{uploadTime},</if> |
| | | <if test="orgid != null">orgid = #{orgid},</if> |
| | | <if test="nexttaskflag != null">#{nexttaskflag},</if> |
| | | <if test="nexttaskid != null">#{nexttaskid},</if> |
| | | <if test="nexttaskname != null">#{nexttaskname},</if> |
| | | <if test="pid != null">pid = #{pid},</if> |
| | | <if test="guid != null">guid = #{guid},</if> |
| | | <if test="preachform != null">preachform = #{preachform},</if> |
| | |
| | | -- ---------------------------- |
| | | -- åå§å-é¨é¨è¡¨æ°æ® |
| | | -- ---------------------------- |
| | | insert into sys_dept values(100, 0, '0', 'è¥ä¾ç§æ', 0, 'è¥ä¾', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(101, 100, '0,100', 'æ·±å³æ»å
¬å¸', 1, 'è¥ä¾', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(102, 100, '0,100', 'é¿æ²åå
¬å¸', 2, 'è¥ä¾', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(103, 101, '0,100,101', 'ç åé¨é¨', 1, 'è¥ä¾', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(104, 101, '0,100,101', 'å¸åºé¨é¨', 2, 'è¥ä¾', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(105, 101, '0,100,101', 'æµè¯é¨é¨', 3, 'è¥ä¾', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(106, 101, '0,100,101', 'è´¢å¡é¨é¨', 4, 'è¥ä¾', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(107, 101, '0,100,101', 'è¿ç»´é¨é¨', 5, 'è¥ä¾', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(108, 102, '0,100,102', 'å¸åºé¨é¨', 1, 'è¥ä¾', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(109, 102, '0,100,102', 'è´¢å¡é¨é¨', 2, 'è¥ä¾', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(100, 0, '0', '婿¹', 0, '婿¹', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(101, 100, '0,100', 'æ·±å³æ»å
¬å¸', 1, '婿¹', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(102, 100, '0,100', 'é¿æ²åå
¬å¸', 2, '婿¹', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(103, 101, '0,100,101', 'ç åé¨é¨', 1, '婿¹', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(104, 101, '0,100,101', 'å¸åºé¨é¨', 2, '婿¹', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(105, 101, '0,100,101', 'æµè¯é¨é¨', 3, '婿¹', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(106, 101, '0,100,101', 'è´¢å¡é¨é¨', 4, '婿¹', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(107, 101, '0,100,101', 'è¿ç»´é¨é¨', 5, '婿¹', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(108, 102, '0,100,102', 'å¸åºé¨é¨', 1, '婿¹', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | insert into sys_dept values(109, 102, '0,100,102', 'è´¢å¡é¨é¨', 2, '婿¹', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); |
| | | |
| | | |
| | | -- ---------------------------- |
| | |
| | | -- ---------------------------- |
| | | -- åå§å-ç¨æ·ä¿¡æ¯è¡¨æ°æ® |
| | | -- ---------------------------- |
| | | insert into sys_user values(1, 103, 'admin', 'è¥ä¾', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管çå'); |
| | | insert into sys_user values(2, 105, 'ry', 'è¥ä¾', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, 'æµè¯å'); |
| | | insert into sys_user values(1, 103, 'admin', '婿¹', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管çå'); |
| | | insert into sys_user values(2, 105, 'ry', '婿¹', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, 'æµè¯å'); |
| | | |
| | | |
| | | -- ---------------------------- |
| | |
| | | insert into sys_menu values('1', 'ç³»ç»ç®¡ç', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, 'ç³»ç»ç®¡çç®å½'); |
| | | insert into sys_menu values('2', 'ç³»ç»çæ§', '0', '2', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, 'ç³»ç»çæ§ç®å½'); |
| | | insert into sys_menu values('3', 'ç³»ç»å·¥å
·', '0', '3', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, 'ç³»ç»å·¥å
·ç®å½'); |
| | | insert into sys_menu values('4', 'è¥ä¾å®ç½', '0', '4', 'http://ruoyi.vip', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, 'è¥ä¾å®ç½å°å'); |
| | | insert into sys_menu values('4', 'æºæ
§æå¡å®ç½', '0', '4', 'http://ruoyi.vip', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, 'æºæ
§æå¡å®ç½å°å'); |
| | | -- äºçº§èå |
| | | insert into sys_menu values('100', 'ç¨æ·ç®¡ç', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', sysdate(), '', null, 'ç¨æ·ç®¡çèå'); |
| | | insert into sys_menu values('101', 'è§è²ç®¡ç', '1', '2', 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', sysdate(), '', null, 'è§è²ç®¡çèå'); |
| | |
| | | -- ---------------------------- |
| | | -- åå§å-å
¬åä¿¡æ¯è¡¨æ°æ® |
| | | -- ---------------------------- |
| | | insert into sys_notice values('1', '温馨æéï¼2018-07-01 è¥ä¾æ°çæ¬åå¸å¦', '2', 'æ°çæ¬å
容', '0', 'admin', sysdate(), '', null, '管çå'); |
| | | insert into sys_notice values('2', 'ç»´æ¤éç¥ï¼2018-07-01 è¥ä¾ç³»ç»åæ¨ç»´æ¤', '1', 'ç»´æ¤å
容', '0', 'admin', sysdate(), '', null, '管çå'); |
| | | insert into sys_notice values('1', '温馨æéï¼2018-07-01 æºæ
§æå¡æ°çæ¬åå¸å¦', '2', 'æ°çæ¬å
容', '0', 'admin', sysdate(), '', null, '管çå'); |
| | | insert into sys_notice values('2', 'ç»´æ¤éç¥ï¼2018-07-01 æºæ
§æå¡ç³»ç»åæ¨ç»´æ¤', '1', 'ç»´æ¤å
容', '0', 'admin', sysdate(), '', null, '管çå'); |
| | | |
| | | |
| | | -- ---------------------------- |