From b7ead3d57df4c3fe03c38f936c4a1abe6e41426d Mon Sep 17 00:00:00 2001
From: zhangchao <allen_adc@sina.com>
Date: Sat, 6 Jul 2024 10:54:45 +0800
Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=88=86=E5=A8=A9?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java
index b03416b..143f0a2 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java
@@ -108,11 +108,12 @@ public class DtdyrmFmService implements IdtdyrmFmService {
                     } catch (NumberFormatException e) {
                         e.printStackTrace();
                     }
+                   Date fmDate= StringUtils.isNotEmpty(allFm.getBaby_DELIVERY_TIME())?fmt.parse(allFm.getBaby_DELIVERY_TIME()):new Date();
                     if (CollectionUtils.isNotEmpty(patientses) && patientses.size()>0) {
                         patient = patientses.get(0);
                         patient.setIsAutoFm(0);
                         patient.setFmHospital(HOSPITALID);
-                        patient.setFmDate(new Date());
+                        patient.setFmDate(fmDate!=null?fmDate:new Date());
                         patient.setType(3);
                         patient.setBuildType(2);
                         patient.setDueStatus(0);
@@ -137,7 +138,7 @@ public class DtdyrmFmService implements IdtdyrmFmService {
                          patient.setIsAutoFm(0);
                          patient.setHospitalId(HOSPITALID);
                          patient.setFmHospital(HOSPITALID);
-                         patient.setFmDate(new Date());
+                         patient.setFmDate(fmDate!=null?fmDate:new Date());
                          patient.setCardNo(allFm.getIdcard());
                          patient.setYn(1);
                          patient.setType(3);
@@ -154,7 +155,6 @@ public class DtdyrmFmService implements IdtdyrmFmService {
                          patient.setCreated(new Date());
                          patient.setModified(new Date());
                          patient=patientsService.addPatient(patient);
-
                      }else {
                          System.out.println("no idCardNo in database："+ allFm.toString());
                         continue;
@@ -163,16 +163,17 @@ public class DtdyrmFmService implements IdtdyrmFmService {
 
                     if (patient != null && StringUtils.isNotEmpty(patient.getId())) {
                         if (CollectionUtils.isNotEmpty(users) && users.get(0).getId() != null) {
-                            if (StringUtils.isNotEmpty(allFm.getBaby_DELIVERY_TIME())) {
+                            dueDate=fmDate!=null?fmDate:new Date();
+                       /*     if (StringUtils.isNotEmpty(allFm.getBaby_DELIVERY_TIME())) {
                                 Date dateTime = fmt.parse(allFm.getBaby_DELIVERY_TIME());
                                 if (dateTime==null) {
-                                    continue;
+                                    dueDate=new Date();
                                 } else {
                                     dueDate = dateTime;
                                 }
                             } else {
                                 continue;
-                            }
+                            }*/
 
                             Map <String, Map <String, String>> map = new HashMap <>();
                             Map <String, String> map1 = new HashMap <>();
-- 
1.8.3.1