|
|
@@ -1805,9 +1805,12 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
|
|
|
|
|
|
FsInquiryOrderPatientDTO dto=new FsInquiryOrderPatientDTO();
|
|
|
BeanUtils.copyProperties(patient,dto);
|
|
|
- dto.setAge(String.valueOf( DateUtil.ageOfNow(patient.getBirthday())));
|
|
|
- // 使用 SimpleDateFormat 格式化日期对象
|
|
|
- dto.setBirthday(new SimpleDateFormat("yyyy-MM-dd").format(patient.getBirthday()));
|
|
|
+ // 鸿森堂的特殊判断
|
|
|
+ if(fsPackage.getIsHealthProductType() == 0){
|
|
|
+ dto.setAge(String.valueOf( DateUtil.ageOfNow(patient.getBirthday())));
|
|
|
+ // 使用 SimpleDateFormat 格式化日期对象
|
|
|
+ dto.setBirthday(new SimpleDateFormat("yyyy-MM-dd").format(patient.getBirthday()));
|
|
|
+ }
|
|
|
FsInquiryOrder order=new FsInquiryOrder();
|
|
|
order.setOrderSn(packageOrder.getOrderSn());
|
|
|
order.setOrderType(2);
|