From 36cb8d5dc6b57a497a75065e6970f108366fa649 Mon Sep 17 00:00:00 2001 From: kradchen Date: Wed, 19 Feb 2025 09:07:57 +0800 Subject: [PATCH 1/3] feat: update cmake script to adapt to new build logic and new linked libraries. --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48d4e7a..2b71a69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,9 @@ option(Build_With_System_QT "Build With System QT" OFF) if(Build_With_System_QT) include_directories(/usr/include/qt5/ /usr/include/qt5/QtCore /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() find_package(Qt5 COMPONENTS Core Widgets Gui Sql Network Multimedia MultimediaWidgets WebEngineWidgets REQUIRED) @@ -104,7 +106,7 @@ if(UNIX ) if(Build_With_System_QT) message("Build With System QT" ) 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) else() From ba731915d28717666501f0c5b32d799ff16e6f1a Mon Sep 17 00:00:00 2001 From: kradchen Date: Wed, 19 Feb 2025 10:52:19 +0800 Subject: [PATCH 2/3] feat: update install script in Readme.md --- Readme.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Readme.md b/Readme.md index e05df46..93d7464 100644 --- a/Readme.md +++ b/Readme.md @@ -25,10 +25,9 @@ ssh krad@192.168.1.15 ## OpenSuse 15.3 ```shell 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 -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/libicudata.so.suse65.1 /usr/lib64/libicudata.so # go to the build path under the src folder From 819533eedbb1b6bd5dde62c1203b2e3f3e201890 Mon Sep 17 00:00:00 2001 From: kradchen Date: Wed, 19 Feb 2025 10:53:42 +0800 Subject: [PATCH 3/3] feat: upadte database sql script --- database/Readme.md | 119 +++++++++++++++++++++++++++------------------ 1 file changed, 71 insertions(+), 48 deletions(-) diff --git a/database/Readme.md b/database/Readme.md index 2990b41..46be112 100644 --- a/database/Readme.md +++ b/database/Readme.md @@ -25,60 +25,83 @@ create database USCT; 然后执行以下Table DDL相关的sql，创建表格并插入数据. ### Table DDL -```Sql -CREATE TABLE `Role` ( - `RoleID` varchar(200) CHARACTER SET utf8 NOT NULL, - `RoleName` varchar(200) CHARACTER SET utf8 NOT NULL, - `Permissions` varchar(500) CHARACTER SET utf8 DEFAULT NULL, - `Comment` varchar(500) CHARACTER SET utf8 DEFAULT NULL, - PRIMARY KEY (`RoleID`) -); +use USCT; +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; +-- ---------------------------- +-- Table structure for Account +-- ---------------------------- +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`( - `UserID` varchar(200) PRIMARY KEY NOT NULL, - `UserCode` varchar(200) NOT NULL, - `UserName` varchar(200) NOT NULL, - `Password` varchar(200) NOT NULL, - `RoleID` varchar(200) NOT NULL, - `Comment` varchar(500) -); +-- ---------------------------- +-- Table structure for EScan +-- ---------------------------- +DROP TABLE IF EXISTS `EScan`; +CREATE TABLE `EScan` ( + `ScanID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ScanID same as measurementID, Primary Key', + `ScanDateTime` datetime(0) NULL DEFAULT NULL, + `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, - `PatientID` varchar(255) CHARACTER SET utf8 NOT NULL, - `AccessionNumber` varchar(255) DEFAULT NULL, - `PatientName` varchar(255) CHARACTER SET utf8 NOT NULL, +-- ---------------------------- +-- Table structure for Patient +-- ---------------------------- +DROP TABLE IF EXISTS `Patient`; +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, - `Sex` varchar(255) NOT NULL, - `AddDate` datetime DEFAULT NULL, - `COMMENT` text DEFAULT NULL, - PRIMARY KEY (`PatientUID`) -); + `Sex` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `AddDate` datetime(0) NULL DEFAULT NULL, + `COMMENT` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + 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', - `ScanDateTime` datetime DEFAULT NULL, - `State` int(11) DEFAULT 0 COMMENT '0 using, -1 expired', - `UpdateTime` datetime DEFAULT NULL COMMENT 'Update Time', - PRIMARY KEY (`ScanID`) -) ; +-- ---------------------------- +-- Table structure for Role +-- ---------------------------- +DROP TABLE IF EXISTS `Role`; +CREATE TABLE `Role` ( + `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; - -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`) -); +delimiter ; Insert INTO `Role`(RoleID,RoleName,Permissions,Comment) VALUES('0001','admin','NULL','NULL'),('0002','doctor','NULL','NULL');