修改生成报告单年龄计算

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/RmsServiceImpl.java

@@ -4,10 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.*;
 import cn.hutool.http.HtmlUtil;
 import com.ccsens.client.persist.dao.AmsDao;
 import com.ccsens.client.persist.dao.ClientEvaDao;
@@ -107,9 +104,13 @@ public class RmsServiceImpl implements IRmsService {
 
 
     public int getAge(PmsPatient pmsPatient) {
-        if (pmsPatient.getBirthYear() != null) {
+//        if (pmsPatient.getBirthYear() != null) {
+//            Calendar instance = Calendar.getInstance();
+//            return instance.get(Calendar.YEAR) - pmsPatient.getBirthYear();
+//        } else
+        if (pmsPatient.getBirthday() != null) {
             Calendar instance = Calendar.getInstance();
-            return instance.get(Calendar.YEAR) - pmsPatient.getBirthYear();
+            return instance.get(Calendar.YEAR) - DateUtil.parse(pmsPatient.getBirthday(), "yyyy-MM-dd").getYear();
         }
         return 0;
     }