优化

src/main/java/thyyxxk/webserver/entity/inpatient/patient/Patient.java

@@ -1,9 +1,7 @@
 package thyyxxk.webserver.entity.inpatient.patient;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 import thyyxxk.webserver.utils.DateUtil;
 import thyyxxk.webserver.utils.StringUtil;
 
@@ -28,8 +26,6 @@ public class Patient {
     private String mzNo;
     private String name;
     private Integer sex;
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private String birthDate;
     private String homeTel;
     private String icdCode;

src/main/java/thyyxxk/webserver/service/inpatient/PatientService.java

@@ -308,7 +308,11 @@ public class PatientService {
         }
         Patient patient = dao.getPatientInfo(inpatientNo, "zy_actpatient", 0);
         if (null == patient) {
-            patient = dao.getPatientInfo(inpatientNo, "zy_inactpatient", 0);
+            patient = dao.getPatientInfo(inpatientNo, "zy_inactpatient", admissTimes);
+        }
+        String birthDate = DateUtil.calculateBirthDateFromIdNumber(patient.getSocialNo());
+        if (null != birthDate) {
+            patient.setBirthDate(birthDate);
         }
         Map<String, Object> map = new HashMap<>();
         map.put("idCard", idCard.get(0));

src/main/java/thyyxxk/webserver/utils/DateUtil.java

@@ -453,6 +453,13 @@ public class DateUtil {
         return list;
     }
 
+    public static String calculateBirthDateFromIdNumber(String idNumber) {
+        if (!IdCardUtil.isValidatedIdCard(idNumber)) {
+            return null;
+        }
+        return idNumber.substring(6, 10) + "-" + idNumber.substring(10, 12) +
+                "-" + idNumber.substring(12, 14);
+    }
 
 }