From 4d87cd4945fff2fbe4dfccfbcb98276744e5063d Mon Sep 17 00:00:00 2001
From: linjj <850658129@qq.com>
Date: Wed, 17 Apr 2024 09:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B0=E7=97=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ExamReportInterface.iml                                   | 8 ++++++++
 src/main/java/com/ann/demo/entity/constant/AliasName.java | 6 ++++++
 .../java/com/ann/demo/entity/constant/InterfaceName.java  | 6 ++++++
 src/main/java/com/ann/demo/service/AnalysisService.java   | 3 ++-
 src/main/java/com/ann/demo/utils/XMLUtils.java            | 3 +++
 src/main/resources/application.yml                        | 2 +-
 6 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ExamReportInterface.iml b/ExamReportInterface.iml
index 519d5fb..5c16b3d 100644
--- a/ExamReportInterface.iml
+++ b/ExamReportInterface.iml
@@ -15,6 +15,14 @@
         </sourceRoots>
       </configuration>
     </facet>
+    <facet type="jpa" name="JPA">
+      <configuration>
+        <setting name="validation-enabled" value="true" />
+        <setting name="provider-name" value="Hibernate" />
+        <datasource-mapping />
+        <naming-strategy-map />
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
diff --git a/src/main/java/com/ann/demo/entity/constant/AliasName.java b/src/main/java/com/ann/demo/entity/constant/AliasName.java
index 40a461a..6900649 100644
--- a/src/main/java/com/ann/demo/entity/constant/AliasName.java
+++ b/src/main/java/com/ann/demo/entity/constant/AliasName.java
@@ -16,6 +16,12 @@ public class AliasName {
     // 病理检查报告单
     public static final String PATHOLOGY_REPORT = "52";
 
+
+    // 新病理检查报告单
+    public static final String NEW_PATHOLOGY_REPORT = "53";
+
+    //心
+
     // 放射诊断报告单 54
     public static final String RADIATION_REPORT = "54";
 
diff --git a/src/main/java/com/ann/demo/entity/constant/InterfaceName.java b/src/main/java/com/ann/demo/entity/constant/InterfaceName.java
index 7c89e56..8df3dba 100644
--- a/src/main/java/com/ann/demo/entity/constant/InterfaceName.java
+++ b/src/main/java/com/ann/demo/entity/constant/InterfaceName.java
@@ -33,6 +33,12 @@ public class InterfaceName {
      * 病理
      */
     public static final String PATHOLOGY_REPORT = "病理系统";
+
+
+    /**
+     * 新病理
+     */
+    public static final String NEW_PATHOLOGY_REPORT = "新病理系统";
     /**
      * 放射
      */
diff --git a/src/main/java/com/ann/demo/service/AnalysisService.java b/src/main/java/com/ann/demo/service/AnalysisService.java
index 002a78e..bef5700 100644
--- a/src/main/java/com/ann/demo/service/AnalysisService.java
+++ b/src/main/java/com/ann/demo/service/AnalysisService.java
@@ -131,7 +131,8 @@ public class AnalysisService {
                         || Objects.equals(type, AliasName.RADIATION_REPORT)
                         || Objects.equals(type, AliasName.ULTRASONIC_REPORT)
                         || Objects.equals(type, AliasName.PETCT_REPORT )
-                        || Objects.equals(type, AliasName.OTHER_REPORT)) {
+                        || Objects.equals(type, AliasName.OTHER_REPORT)
+                        || Objects.equals(type, AliasName.NEW_PATHOLOGY_REPORT)) {
                     messageSubordinateService.save(new MessageSubordinate(messageLog.getId(), patientMainStr, JSON.toJSONString(messageLog)));
                 }
             }
diff --git a/src/main/java/com/ann/demo/utils/XMLUtils.java b/src/main/java/com/ann/demo/utils/XMLUtils.java
index 2a8a037..195529b 100644
--- a/src/main/java/com/ann/demo/utils/XMLUtils.java
+++ b/src/main/java/com/ann/demo/utils/XMLUtils.java
@@ -215,6 +215,9 @@ public class XMLUtils {
         // 根据source判断是哪个实体类
         switch (source) {
             case "病理诊断与研究中心":
+                messageDto = new MessageDto(UltrasonicReport.class.getName(), new UltrasonicReport(), AliasName.NEW_PATHOLOGY_REPORT, reportPath, InterfaceName.NEW_PATHOLOGY_REPORT);
+                break;
+            case "病理科":
                 messageDto = new MessageDto(UltrasonicReport.class.getName(), new UltrasonicReport(), AliasName.PATHOLOGY_REPORT, reportPath, InterfaceName.PATHOLOGY_REPORT);
                 break;
             case "超声科":
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1533a08..30229e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,7 +14,7 @@ spring:
     #    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
     url: jdbc:sqlserver://localhost:1433;DatabaseName=zj_record_new
     username: sa
-    password: docus702
+    password: admin123
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     jpa:
       database: sql_server