fix:生成订单失败

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

@@ -1753,7 +1753,15 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
         FsPatient patient=JSONUtil.toBean(packageOrder.getPatientJson(),FsPatient.class);
 
         FsInquiryOrderPatientDTO dto=new FsInquiryOrderPatientDTO();
+        if (patient.getPatientId() == null){
+            Long userId = packageOrder.getUserId();
+            FsPatientVO fsPatientVO = fsPatientMapper.selectFsPatientByUserId(userId);
+            BeanUtils.copyProperties(fsPatientVO,patient);
+            dto.setBirthday(DateUtils.parseDateToStr("yyyy-MM-dd",fsPatientVO.getBirthday()));
+        }
         BeanUtils.copyProperties(patient,dto);
+
+
         dto.setAge(String.valueOf( DateUtil.ageOfNow(patient.getBirthday())));
         // 使用 SimpleDateFormat 格式化日期对象
         dto.setBirthday(new SimpleDateFormat("yyyy-MM-dd").format(patient.getBirthday()));

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

@@ -504,7 +504,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
         FsPatient patient=null;
         FsDoctor doctor=null;
         FsPackage fsPackage=fsPackageMapper.selectFsPackageByPackageId(param.getPackageId());
-        if(fsPackage.getProductType()!= null &&(fsPackage.getProductType()==1 || fsPackage.getProductType()==2)){
+        if(fsPackage.getProductType()!= null &&((fsPackage.getProductType()==1 || fsPackage.getProductType()==2)|| CloudHostUtils.hasCloudHostName("金牛明医"))){
             if(param.getPatientId()!=null){
                 patient=fsPatientMapper.selectFsPatientByPatientId(param.getPatientId());
                 if (patient==null){
@@ -514,7 +514,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                 return R.error("请提交患者信息");
             }
             logger.info("是否是中药或者西药{},{}",fsPackage.getProductType(),fsPackage.getProductType() == 1 || fsPackage.getProductType() == 2);
-            if (fsPackage.getProductType() == 1 || fsPackage.getProductType() == 2) {
+            if (fsPackage.getProductType() == 1 || fsPackage.getProductType() == 2 || CloudHostUtils.hasCloudHostName("金牛明医")) {
                 if (StringUtils.isEmpty(patient.getIdCard())) {
                     return R.error("请完善患者身份证信息");
                 }