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/YkyyEntranceService.java

@@ -1056,8 +1056,12 @@ public class YkyyEntranceService {
                params.put("json",jsonString);
                params.put("table","HLW_CF01");
                logger.info("HLW_CF01："+jsonString);
                /**
                 {"message":null,"status":200,"obj":{"cfhm":1898356,"cfsb":5390518}}
                 */
                HttpResponse response = HttpUtils.doGet(saveUrl,params);
                String cfsb = "";
                String cfsb = null;
                if (response.getStatus()==200){
                    logger.info("content"+response.getContent());
                    String content = response.getContent();
@@ -1065,11 +1069,11 @@ public class YkyyEntranceService {
                    JSONObject object = jsonObject.getJSONObject("obj");
                    if (object!=null){
                        cfsb = object.getString("cfsb");
                        logger.info("kaishi=========="+cfsb);
                        List<WlyyPrescriptionDO> wlyyPrescriptionDOS = prescriptionDao.findById(code);
                        if (wlyyPrescriptionDOS!=null&&wlyyPrescriptionDOS.size()!=0){
                            WlyyPrescriptionDO wlyyPrescriptionDO = wlyyPrescriptionDOS.get(0);
                            wlyyPrescriptionDO.setRealOrder(cfsb);
                            wlyyPrescriptionVO.setRealOrder(cfsb);
                            prescriptionDao.save(wlyyPrescriptionDO);
                        }
                    }
@@ -1078,8 +1082,8 @@ public class YkyyEntranceService {
                }else {
                    logger.info("表HLW_CF01同步失败！"+response.getErrorMsg());
                }
                logger.info("处方："+wlyyPrescriptionVO);
                if (!StringUtils.isNoneBlank(cfsb)){
                logger.info("处方："+cfsb);
                if (StringUtils.isEmpty(cfsb)){
                    throw new Exception("添加失败");
                }
                List<WlyyPrescriptionInfoVO> wlyyPrescriptionInfoVOS =wlyyPrescriptionVO.getInfoVOs();

business/base-service/src/main/java/com/yihu/jw/utils/hibernate/HibenateUtils.java

@@ -166,11 +166,7 @@ public class HibenateUtils {
    public void save(Object object) {
        Session session = (Session) entityManager.getDelegate();
        Transaction transaction = session.beginTransaction();
        transaction.begin();
        session.save(object);
        transaction.commit();
        entityManager.persist(object);
    }
    /**

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/YkyyController.java

@@ -126,7 +126,7 @@ public class YkyyController extends EnvelopRestEndpoint {
            ykyyEntranceService.save(hlwCf01VO);
        }
        return success(envelop);
        return envelop;
    }
    
    @GetMapping(value = "/getUpcomingByDoctor")