金牛

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

@@ -513,6 +513,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 == null || patJson.getPatientId() == null){
+            return null;
+        }
         long currentTimeMillis = System.currentTimeMillis();
         long ageInMillis = currentTimeMillis - patJson.getBirthday();
         long ageInSeconds = ageInMillis / 1000;

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

@@ -4215,7 +4215,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
                 Long doctorID = iFsDoctorService.selectFsDoctorDoctorByPackage();
                 packageOrder.setDoctorId(doctorID);
             }
-            if (packageSubType == 3 ) {
+            if (packageSubType == 3 && !CloudHostUtils.hasCloudHostName("金牛明医")) {
                 inquiryOrderService.createOrderByPackageOrderStatus4(packageOrder);
             }
             prescribeId = fsPrescribeService.insertFsPrescribeByPackageOrder(packageOrder);