Merge branch 'dev' of http://192.168.1.9:3000/Bug/GUI into dev
This commit is contained in:
@@ -44,7 +44,9 @@ option(Build_With_System_QT "Build With System QT" OFF)
|
|||||||
if(Build_With_System_QT)
|
if(Build_With_System_QT)
|
||||||
include_directories(/usr/include/qt5/ /usr/include/qt5/QtCore
|
include_directories(/usr/include/qt5/ /usr/include/qt5/QtCore
|
||||||
/usr/include/qt5/QtNetwork /usr/include/qt5/QtWidgets /usr/include/qt5/QtGui
|
/usr/include/qt5/QtNetwork /usr/include/qt5/QtWidgets /usr/include/qt5/QtGui
|
||||||
/usr/include/qt5/QtSql /usr/include/qt5/QtMultimedia /usr/include/qt5/QtMultimediaWidgets)
|
/usr/include/qt5/QtSql /usr/include/qt5/QtMultimedia /usr/include/qt5/QtMultimediaWidgets
|
||||||
|
/usr/include/qt5/QtWebEngine /usr/include/qt5/QtWebChannel /usr/include/qt5/QtWebEngineWidgets
|
||||||
|
/usr/include/qt5/QtWebEngineCore)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(Qt5 COMPONENTS Core Widgets Gui Sql Network Multimedia MultimediaWidgets WebEngineWidgets REQUIRED)
|
find_package(Qt5 COMPONENTS Core Widgets Gui Sql Network Multimedia MultimediaWidgets WebEngineWidgets REQUIRED)
|
||||||
@@ -104,7 +106,7 @@ if(UNIX )
|
|||||||
if(Build_With_System_QT)
|
if(Build_With_System_QT)
|
||||||
message("Build With System QT" )
|
message("Build With System QT" )
|
||||||
link_directories( "/usr/lib64")
|
link_directories( "/usr/lib64")
|
||||||
target_link_libraries(${PROJECT_NAME} Qt5Core.so Qt5Widgets.so Qt5Gui.so Qt5Sql.so Qt5Network.so Qt5Multimedia.so Qt5MultimediaWidgets.so Qt5WebEngineWidgets.so pthread)
|
target_link_libraries(${PROJECT_NAME} Qt5Core.so Qt5Widgets.so Qt5Gui.so Qt5Sql.so Qt5Network.so Qt5Multimedia.so Qt5MultimediaWidgets.so Qt5WebChannel.so Qt5WebEngineWidgets.so pthread)
|
||||||
target_link_libraries(${PROJECT_NAME} curl)
|
target_link_libraries(${PROJECT_NAME} curl)
|
||||||
|
|
||||||
else()
|
else()
|
||||||
|
|||||||
@@ -25,10 +25,9 @@ ssh krad@192.168.1.15
|
|||||||
## OpenSuse 15.3
|
## OpenSuse 15.3
|
||||||
```shell
|
```shell
|
||||||
sudo zypper in cmake git gcc-g++ dcmtk-devel libcurl-devel
|
sudo zypper in cmake git gcc-g++ dcmtk-devel libcurl-devel
|
||||||
sydo zypper in libQt5Core5 libQt5Core-devel libQt5Widgets5 libQt5Widgets-devel libQt5Gui5 libQt5Gui-devel libQt5Sql5 libQt5Sql-devel libQt5Network5 libQt5Network-devel libqt5-qtwebengine-devel
|
sudo zypper in libQt5Core5 libQt5Core-devel libQt5Widgets5 libQt5Widgets-devel libQt5Gui5 libQt5Gui-devel libQt5Sql5 libQt5Sql-devel libQt5Network5 libQt5Network-devel libqt5-qtwebengine-devel libQt5Sql5-mysql
|
||||||
sudo zypper in libQt5Multimedia5 libQt5Multimedia-devel libqt5-qtbase-private-headers-devel libqt5-linguist libqt5-linguist-devel
|
sudo zypper in libQt5Multimedia5 libQt5Multimedia-devel libqt5-qtbase-private-headers-devel libqt5-linguist libqt5-linguist-devel
|
||||||
ln -s /usr/lib64/libtiff.so.5 /usr/lib64/libtiff.so
|
|
||||||
ln -s /usr/lib64/libjpeg.so.8 /usr/lib64/libjpeg.so
|
|
||||||
ln -s /usr/lib64/libicuuc.so.suse65.1 /usr/lib64/libicuuc.so
|
ln -s /usr/lib64/libicuuc.so.suse65.1 /usr/lib64/libicuuc.so
|
||||||
ln -s /usr/lib64/libicudata.so.suse65.1 /usr/lib64/libicudata.so
|
ln -s /usr/lib64/libicudata.so.suse65.1 /usr/lib64/libicudata.so
|
||||||
# go to the build path under the src folder
|
# go to the build path under the src folder
|
||||||
|
|||||||
@@ -25,60 +25,83 @@ create database USCT;
|
|||||||
然后执行以下Table DDL相关的sql,创建表格并插入数据.
|
然后执行以下Table DDL相关的sql,创建表格并插入数据.
|
||||||
|
|
||||||
### Table DDL
|
### Table DDL
|
||||||
```Sql
|
use USCT;
|
||||||
CREATE TABLE `Role` (
|
SET NAMES utf8mb4;
|
||||||
`RoleID` varchar(200) CHARACTER SET utf8 NOT NULL,
|
SET FOREIGN_KEY_CHECKS = 0;
|
||||||
`RoleName` varchar(200) CHARACTER SET utf8 NOT NULL,
|
-- ----------------------------
|
||||||
`Permissions` varchar(500) CHARACTER SET utf8 DEFAULT NULL,
|
-- Table structure for Account
|
||||||
`Comment` varchar(500) CHARACTER SET utf8 DEFAULT NULL,
|
-- ----------------------------
|
||||||
PRIMARY KEY (`RoleID`)
|
DROP TABLE IF EXISTS `Account`;
|
||||||
);
|
CREATE TABLE `Account` (
|
||||||
|
`UserID` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
||||||
|
`UserCode` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
||||||
|
`UserName` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
||||||
|
`Password` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
||||||
|
`RoleID` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
||||||
|
`Comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||||
|
PRIMARY KEY (`UserID`) USING BTREE
|
||||||
|
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
||||||
|
|
||||||
CREATE TABLE
|
-- ----------------------------
|
||||||
`Account`(
|
-- Table structure for EScan
|
||||||
`UserID` varchar(200) PRIMARY KEY NOT NULL,
|
-- ----------------------------
|
||||||
`UserCode` varchar(200) NOT NULL,
|
DROP TABLE IF EXISTS `EScan`;
|
||||||
`UserName` varchar(200) NOT NULL,
|
CREATE TABLE `EScan` (
|
||||||
`Password` varchar(200) NOT NULL,
|
`ScanID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ScanID same as measurementID, Primary Key',
|
||||||
`RoleID` varchar(200) NOT NULL,
|
`ScanDateTime` datetime(0) NULL DEFAULT NULL,
|
||||||
`Comment` varchar(500)
|
`State` int(11) NULL DEFAULT 0 COMMENT '0 using, -1 expired',
|
||||||
);
|
`UpdateTime` datetime(0) NULL DEFAULT NULL COMMENT 'Update Time',
|
||||||
|
PRIMARY KEY (`ScanID`) USING BTREE
|
||||||
|
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
||||||
|
|
||||||
CREATE TABLE `Patient` (
|
-- ----------------------------
|
||||||
`PatientUID` varchar(255) CHARACTER SET utf8 NOT NULL,
|
-- Table structure for Patient
|
||||||
`PatientID` varchar(255) CHARACTER SET utf8 NOT NULL,
|
-- ----------------------------
|
||||||
`AccessionNumber` varchar(255) DEFAULT NULL,
|
DROP TABLE IF EXISTS `Patient`;
|
||||||
`PatientName` varchar(255) CHARACTER SET utf8 NOT NULL,
|
CREATE TABLE `Patient` (
|
||||||
|
`PatientUID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
|
||||||
|
`PatientID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
|
||||||
|
`PatientName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
|
||||||
`Birthdate` date NOT NULL,
|
`Birthdate` date NOT NULL,
|
||||||
`Sex` varchar(255) NOT NULL,
|
`Sex` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
||||||
`AddDate` datetime DEFAULT NULL,
|
`AddDate` datetime(0) NULL DEFAULT NULL,
|
||||||
`COMMENT` text DEFAULT NULL,
|
`COMMENT` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||||
PRIMARY KEY (`PatientUID`)
|
PRIMARY KEY (`PatientUID`) USING BTREE
|
||||||
);
|
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
||||||
|
|
||||||
CREATE TABLE `EScan` (
|
-- ----------------------------
|
||||||
`ScanID` varchar(255) NOT NULL COMMENT 'ScanID same as measurementID, Primary Key',
|
-- Table structure for Role
|
||||||
`ScanDateTime` datetime DEFAULT NULL,
|
-- ----------------------------
|
||||||
`State` int(11) DEFAULT 0 COMMENT '0 using, -1 expired',
|
DROP TABLE IF EXISTS `Role`;
|
||||||
`UpdateTime` datetime DEFAULT NULL COMMENT 'Update Time',
|
CREATE TABLE `Role` (
|
||||||
PRIMARY KEY (`ScanID`)
|
`RoleID` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
|
||||||
) ;
|
`RoleName` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
|
||||||
|
`Permissions` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||||
|
`Comment` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||||
|
PRIMARY KEY (`RoleID`) USING BTREE
|
||||||
|
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
||||||
|
|
||||||
|
-- ----------------------------
|
||||||
|
-- Table structure for Scan
|
||||||
|
-- ----------------------------
|
||||||
|
DROP TABLE IF EXISTS `Scan`;
|
||||||
|
CREATE TABLE `Scan` (
|
||||||
|
`ScanID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ScanID same as measurementID, Primary Key',
|
||||||
|
`ReferenceID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
||||||
|
`PatientID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
||||||
|
`AccessionNumber` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||||
|
`ScanDateTime` datetime(0) NULL DEFAULT NULL,
|
||||||
|
`PatientName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||||
|
`Laterality` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||||
|
`OperatorName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||||
|
`State` int(11) NULL DEFAULT 0,
|
||||||
|
`StudyUID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||||
|
`Modality` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||||
|
`MPPSUID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'MPPS SOP Instance UID',
|
||||||
|
PRIMARY KEY (`ScanID`) USING BTREE
|
||||||
|
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
||||||
|
|
||||||
|
delimiter ;
|
||||||
CREATE TABLE `Scan` (
|
|
||||||
`ScanID` varchar(255) NOT NULL COMMENT 'ScanID same as measurementID, Primary Key',
|
|
||||||
`ReferenceID` varchar(255) NOT NULL,
|
|
||||||
`PatientID` varchar(255) NOT NULL,
|
|
||||||
`AccessionNumber` varchar(255) DEFAULT NULL,
|
|
||||||
`ScanDateTime` datetime DEFAULT NULL,
|
|
||||||
`UpdateTime` datetime DEFAULT NULL,
|
|
||||||
`PatientName` varchar(255) DEFAULT NULL,
|
|
||||||
`Laterality` varchar(64) DEFAULT NULL,
|
|
||||||
`OperatorName` varchar(255) DEFAULT NULL,
|
|
||||||
`State` int(11) DEFAULT 0,
|
|
||||||
PRIMARY KEY (`ScanID`)
|
|
||||||
);
|
|
||||||
|
|
||||||
Insert INTO `Role`(RoleID,RoleName,Permissions,Comment) VALUES('0001','admin','NULL','NULL'),('0002','doctor','NULL','NULL');
|
Insert INTO `Role`(RoleID,RoleName,Permissions,Comment) VALUES('0001','admin','NULL','NULL'),('0002','doctor','NULL','NULL');
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user