1.患者生日为空设值默认值 2.优化处方订单查询

fs-admin/src/main/java/com/fs/his/controller/FsPrescribeController.java

@@ -165,9 +165,6 @@ public class FsPrescribeController extends BaseController
         if (fsPatient!=null&&fsPatient.getIdCard()!=null){
             fsPrescribe.setIdCard(fsPatient.getIdCard().replaceAll("(\\d{4})\\d{10}(\\w{4})", "$1**********$2"));
         }
-        if (fsPrescribe.getStatus() == 0 || fsPrescribe.getStatus() == -2) {
-            fsPrescribe.setPrescribeImgUrl(null);
-        }
         return AjaxResult.success(fsPrescribe);
     }
 

fs-service/src/main/java/com/fs/his/service/impl/FsPrescribeServiceImpl.java

@@ -691,6 +691,9 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
         fsPrescribe.setUserId(packageOrder.getUserId());
         fsPrescribe.setPrescribeCode(IdUtil.getSnowflake(0, 0).nextIdStr());
         FsPackagePatientDTO patJson = JSON.parseObject(packageOrder.getPatientJson(),FsPackagePatientDTO.class);
+        if (patJson.getBirthday() == null) {
+            patJson.setBirthday(-285753600000L);
+        }
         long currentTimeMillis = System.currentTimeMillis();
         long ageInMillis = currentTimeMillis - patJson.getBirthday();
         long ageInSeconds = ageInMillis / 1000;