From 6201f3c7a560dd27cbb2f2dfcc964396dc574acc Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Thu, 13 Feb 2025 10:31:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=A7=84=E5=88=99=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=87=BA=E9=99=A2=E6=97=A5=E6=9C=9F=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jiashi/service/UpdateService.java     |  9 ++++-
 src/test/java/com/jiashi/FileUploader.java    | 40 +++++++++++++++++--
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/jiashi/service/UpdateService.java b/src/main/java/com/jiashi/service/UpdateService.java
index b807786..5922d88 100644
--- a/src/main/java/com/jiashi/service/UpdateService.java
+++ b/src/main/java/com/jiashi/service/UpdateService.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -348,17 +349,21 @@ public class UpdateService {
     private String findLianZhongDir(CardInfo cardInfo) {
         String gestno = cardInfo.getGestno();
         String patno = cardInfo.getPatno();
+        Date outdate = cardInfo.getOutdate();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String outDateFormat = sdf.format(outdate);
         for (String lianZhongPatPicDir : lianZhongPatPicDirs) {
             String dirName = new File(lianZhongPatPicDir).getName();
+            String disDatePart = dirName.substring(12);
             String comparePart = dirName.substring(2).substring(0, 10);
             comparePart = removeLeadingZeros(comparePart);
             // gestno 或者 patno 进行 识别
             if (StringUtils.hasText(gestno)) {
-                if (comparePart.contains(removeLeadingZeros(gestno))) {
+                if (comparePart.contains(removeLeadingZeros(gestno)) && outDateFormat.equals(disDatePart)) {
                     return lianZhongPatPicDir;
                 }
             }
-            if (comparePart.contains(removeLeadingZeros(patno))) {
+            if (comparePart.contains(removeLeadingZeros(patno)) && outDateFormat.equals(disDatePart)) {
                 return lianZhongPatPicDir;
             }
         }
diff --git a/src/test/java/com/jiashi/FileUploader.java b/src/test/java/com/jiashi/FileUploader.java
index 1ecbae0..1c5590b 100644
--- a/src/test/java/com/jiashi/FileUploader.java
+++ b/src/test/java/com/jiashi/FileUploader.java
@@ -2,8 +2,12 @@ package com.jiashi;
 
 import com.google.gson.Gson;
 import com.jiashi.service.LianZhongUploadInfo;
-import okhttp3.*;
-
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 
 import java.io.File;
 import java.io.IOException;
@@ -45,14 +49,42 @@ public class FileUploader {
 
     public static void main(String[] args) throws IOException {
         List<File> files = new ArrayList<>();
-        files.add(new File("C:\\Users\\wyb\\Pictures\\head.jpg"));
+        File file1 = new File("C:\\Users\\wyb\\Pictures\\head.jpg");
+        File file2 = new File("C:\\Users\\wyb\\Pictures\\毒王90.jpg");
+        files.add(file1);
+        files.add(file2);
 
 //        files.add(new File("C:\\jiahsi-saomiao\\413425_刘燊杨_20221009_004624\\16763947060420811242.jpg"));
+        LianZhongUploadInfo.PatientInfo patientInfo = new LianZhongUploadInfo.PatientInfo();
+        patientInfo.setInpatientNo("wyb-lianzhong001");
+        patientInfo.setAdmissTimes(1);
+        patientInfo.setDisDate("2025-01-01 00:00:00");
+        patientInfo.setName("厦门中医院联众测试");
+
+        LianZhongUploadInfo.FileInfo fileInfo1 = new LianZhongUploadInfo.FileInfo();
+        fileInfo1.setSort(1);
+        fileInfo1.setFileTitle("head");
+        fileInfo1.setUploadFileName(file1.getName());
+        fileInfo1.setAssortId("wyb-lianzhong");
+
+        LianZhongUploadInfo.FileInfo fileInfo2 = new LianZhongUploadInfo.FileInfo();
+        fileInfo2.setSort(2);
+        fileInfo2.setFileTitle("head2");
+        fileInfo2.setUploadFileName(file2.getName());
+        fileInfo2.setAssortId("wyb-lianzhong-2");
+
+        ArrayList<LianZhongUploadInfo.FileInfo> fileInfos = new ArrayList<>();
+        fileInfos.add(fileInfo1);
+        fileInfos.add(fileInfo2);
+
 
+        LianZhongUploadInfo uploadInfo = new LianZhongUploadInfo();
+        uploadInfo.setPatientInfo(patientInfo);
+        uploadInfo.setFileInfos(fileInfos);
 
         // 额外的表单字段参数
         List<FormField> params = new ArrayList<>();
-        params.add(new FormField("uploadFileParams", new Gson().toJson(new LianZhongUploadInfo())));
+        params.add(new FormField("uploadFileParams", new Gson().toJson(uploadInfo)));
 
         // 上传URL
         String uploadUrl = "http://127.0.0.1:9511/lianzhong/batchFileUploadJpg";