版本更新

openhis-server-new/openhis-common/pom.xml

@@ -16,6 +16,10 @@
     </description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
 
         <!-- CORE-->
         <dependency>

openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java

@@ -109,6 +109,8 @@ public class DictAspect {
                         e.printStackTrace();
                     }
                 }
+            } else {
+                processDict(fieldValue); // 递归处理 Dto 中的每个元素
             }
         }
     }

openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java

@@ -335,6 +335,10 @@ public class CommonConstants {
          */
         String applyTime = "apply_time";
 
+        /**
+         * 校对人Id
+         */
+        String PerformerCheckId = "performer_check_id";
     }
 
     /**

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java

@@ -307,7 +307,11 @@ public enum AssignSeqEnum {
      * b
      * 病历文书
      */
-    PURCHASE_DOCUMENT("63", "病历文书", "DOC");
+    PURCHASE_DOCUMENT("63", "病历文书", "DOC"),
+    /**
+     * 调价单
+     */
+    CHANGE_PRICE_BUZ("64", "调整零售价", "CPB");
     private final String code;
     private final String info;
     private final String prefix;

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/medCategoryCode.java

@@ -1,49 +0,0 @@
-package com.openhis.common.enums;
-
-/**
- * medCategoryCode
- *
- * @author Wuser
- * @date 2025/4/21
- */
-
-import com.github.pagehelper.util.StringUtil;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 药品分类枚举
- *
- * @author YourName
- * @date 2025-04-21
- */
-@Getter
-@AllArgsConstructor
-public enum MedCategoryCode {
-
-    TRADITIONAL_CHINESE_MEDICINE("1", "中成药"),
-
-    WESTERN_MEDICINE("2", "西药"),
-
-    EXTERNAL_PURCHASE_MEDICINE("3", "外购药品"),
-
-    CHINESE_HERBAL_MEDICINE("4", "中草药"),
-
-    OTHER("9", "其他");
-
-    private String value;
-    private String description;
-
-    public static MedCategoryCode getByValue(String value) {
-        if (StringUtil.isEmpty(value)) {
-            return null;
-        }
-        for (MedCategoryCode code : values()) {
-            if (code.getValue().equals(value)) {
-                return code;
-            }
-        }
-        return null;
-    }
-}

openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/CommonUtil.java

@@ -1,5 +1,23 @@
 package com.openhis.common.utils;
 
+import java.io.IOException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.List;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.core.common.core.domain.R;
+import com.core.common.utils.poi.ExcelUtil;
+
 /**
  * 共通工具类
  *
@@ -7,4 +25,69 @@ package com.openhis.common.utils;
  */
 public class CommonUtil {
 
+    /**
+     * 尝试转化为int
+     *
+     * @param intStr int字符串
+     * @return int值
+     */
+    public static Integer tryParseInt(String intStr) {
+        try {
+            return Integer.parseInt(intStr);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * 读取导入的Excel文件
+     * 
+     * @param file 文件
+     * @param clazz 转换的Class
+     * @return 转换后的实体列表
+     */
+    public static <T> R<List<T>> readImportedExcelFile(MultipartFile file, Class<T> clazz) {
+        ExcelUtil<T> util = new ExcelUtil<>(clazz);
+        List<T> importDtoList;
+        try {
+            importDtoList = util.importExcel(file.getInputStream());
+        } catch (IOException e) {
+            return R.fail("导入失败！文件读取异常");
+        }
+        if (importDtoList.isEmpty()) {
+            return R.fail("导入失败！文件不能为空");
+        }
+        return R.ok(importDtoList);
+    }
+
+    /**
+     * 创建无视SSL验证的SSLSocketFactory
+     */
+    public static SSLConnectionSocketFactory createIgnoreSslSocketFactory() {
+        try {
+            // 创建信任所有证书的TrustManager
+            X509TrustManager trustAllCert = new X509TrustManager() {
+                @Override
+                public void checkClientTrusted(X509Certificate[] chain, String authType) {}
+
+                @Override
+                public void checkServerTrusted(X509Certificate[] chain, String authType) {}
+
+                @Override
+                public X509Certificate[] getAcceptedIssuers() {
+                    return new X509Certificate[0];
+                }
+            };
+
+            // 初始化SSLContext
+            SSLContext sslContext = SSLContext.getInstance("SSL");
+            sslContext.init(null, new TrustManager[] {trustAllCert}, new SecureRandom());
+
+            // 创建不验证主机名的SocketFactory
+            return new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE // 关键：禁用主机名验证
+            );
+        } catch (NoSuchAlgorithmException | KeyManagementException e) {
+            throw new RuntimeException("SSL配置失败", e);
+        }
+    }
 }