commit

ZSKK_DicomServer/pom.xml

@@ -45,13 +45,12 @@
 			<version>4.0.1</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.jfinal</groupId>
 			<artifactId>jetty-server</artifactId>
 			<version>2019.3</version>
 			<scope>provided</scope>
-		</dependency>
-
+		</dependency> -->
 		<dependency>
 			<groupId>org.dcm4che</groupId>
 			<artifactId>dcm4che-core</artifactId>
@@ -93,15 +92,9 @@
 	</build>
 	<repositories>
 		<repository>
-			<id>Dcm4Che</id>
+			<id>org.dcm4chee</id>
 			<name>Dcm4Che</name>
-			<url>http://www.dcm4che.org/maven2/</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
+			<url>https://www.dcm4che.org/maven2/</url>
 		</repository>
 	</repositories>
 </project>

ZSKK_DicomServer/src/main/java/com/zskk/common/ZskkConfig.java

@@ -89,9 +89,9 @@ public class ZskkConfig extends JFinalConfig {
 	/*
 	 * / 本地调试运行此处，线上发布注释main方法，并在maven配置文件注释jetty依赖
 	 */
-	public static void main(String[] args) {
-		JFinal.start("src/main/webapp", 10001, "/", 5);
-	}
+//	public static void main(String[] args) {
+//		JFinal.start("src/main/webapp", 10001, "/", 5);
+//	}
 
 	@Override
 	public void configEngine(Engine engine) {

ZSKK_DicomServer/src/main/java/com/zskk/service/DicomCMoveService.java

@@ -62,7 +62,7 @@ public class DicomCMoveService extends Device{
         Tag.SeriesInstanceUID
     };
 
-    private final ApplicationEntity ae = new ApplicationEntity("cspacsFIR");
+    private final ApplicationEntity ae = new ApplicationEntity("PACSONLINE");
     private final Connection conn = new Connection();
     private final Connection remote = new Connection();
     private final AAssociateRQ rq = new AAssociateRQ();
@@ -119,7 +119,7 @@ public class DicomCMoveService extends Device{
             addRetrieveLevelOption(opts);
             addDestinationOption(opts);
             CLIUtils.addConnectOption(opts);
-            CLIUtils.addBindOption(opts, "cspacsFIR");
+            CLIUtils.addBindOption(opts, "PACSONLINE");
             CLIUtils.addAEOptions(opts);
             CLIUtils.addRetrieveTimeoutOption(opts);
             CLIUtils.addPriorityOption(opts);
@@ -180,7 +180,7 @@ public class DicomCMoveService extends Device{
             addApplicationEntity(ae);
             ae.addConnection(conn);
             
-        	String[]str = new String[]{"-c", "GEPACS@10.1.8.119:4100","-m","StudyInstanceUID=" + studyuid,"--dest","PACSONLINE"};
+        	String[]str = new String[]{"-c", "GEPACS@10.1.8.119:4100","-m","AccessionNumber=" + studyuid,"--dest","PACSONLINE"};
             CommandLine cl = parseComandLine(str);
             
             CLIUtils.configureConnect(this.remote, this.rq, cl);