diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d2c3354 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/target/ +/.idea/ +/out/ +emr_medical_record.iml \ No newline at end of file diff --git a/doc/emr_record.bak b/doc/emr_record.bak new file mode 100644 index 0000000..7951626 Binary files /dev/null and b/doc/emr_record.bak differ diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 28b69be..97af30f 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -7,7 +7,7 @@ jdbc.password=docus702 oracle.driver=oracle.jdbc.driver.OracleDriver oracle.url=jdbc:oracle:thin:@192.168.10.6:1521/orc1 oracle.username=pacs -oracle.password=pacs +oracle.password=pacsfa #hibernate config hibernate.dialect=org.hibernate.dialect.SQLServerDialect hibernate.show_sql=true @@ -25,9 +25,9 @@ pictureUrl=src\\main\\webapp #powerUrl=http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag #POWER_URLHEAD=http://120.27.212.36:8888/power #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934\u5982\uFF1Ahttp://192.168.1.3:8081/power -powerUrl=http://localhost:8081/power/font/getMenusByUserIdAndSysFlag -POWER_URLHEAD=http://localhost:8081/power -POWER_JSP=http://localhost:8081/power +powerUrl=http://localhost:8080/power/font/getMenusByUserIdAndSysFlag +POWER_URLHEAD=http://localhost:8080/power +POWER_JSP=http://localhost:8080/power recallReason=医院需要这份文档 HomepageDictionary=http://200.100.104.40:8081/filing/services/HomepageDictionary?wsdl HomepageMethod=CheckData diff --git a/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp b/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp index 618ac88..1ddcf82 100644 --- a/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp @@ -20,7 +20,6 @@ } .treeBtn{ margin-left: 24px; - margin-right: 40px; } .zTreeDemo{ height: 800px; diff --git a/src/main/webapp/static/pdfjs/web/viewer.html b/src/main/webapp/static/pdfjs/web/viewer.html index 55d4610..42aa9c7 100644 --- a/src/main/webapp/static/pdfjs/web/viewer.html +++ b/src/main/webapp/static/pdfjs/web/viewer.html @@ -450,7 +450,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/ $('#myModal').modal('show'); } else { clearInterval(interval); - $('#myModal').modal('hide'); + $('#myModal').remove(); } } //屏蔽鼠标右键