Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

@@ -1390,7 +1390,7 @@ public class XzzxEntranceService extends BaseJpaService {
    }
    public Map<String,Object> updatePreStatus(String admNo,String realOrder,String status) throws Exception {
/*    public Map<String,Object> updatePreStatus(String admNo,String realOrder,String status) throws Exception {
        Map<String,Object> map = new HashedMap();
        List<WlyyOutpatientDO> wlyyOutpatientDOList = outpatientDao.findByAdmNo(admNo);
        if (wlyyOutpatientDOList!=null&&wlyyOutpatientDOList.size()!=0){
@@ -1441,7 +1441,7 @@ public class XzzxEntranceService extends BaseJpaService {
            }
        }
        return map;
    }
    }*/

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/order/BusinessOrderService.java

@@ -3,8 +3,6 @@ package com.yihu.jw.hospital.service.order;
import org.springframework.stereotype.Service;
import java.util.UUID;
/**
 *
 * 业务订单