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

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

@@ -1282,6 +1282,8 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
            if (ylzMedicalRelationDO.getMedicalState()==null||(ylzMedicalRelationDO.getMedicalState()!=null&&ylzMedicalRelationDO.getMedicalState()==0)){
                flag=true;
                YlzMedicalRelationInvoiceDO invoiceDO = new YlzMedicalRelationInvoiceDO();
                ylzMedicalRelationDO.setPayDate(new Date());
                ylzMedicalRelationDO = ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                try {
                    logger.info("=================电子发票开具开始=================");
                    requestBillingNew(outpatientId,1);

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -1917,19 +1917,23 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
    public JSONObject selectOrderTime(String relationCode){
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("PAY_TIME");
        BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(relationCode);
        Date createDate = businessOrderDO.getCreateTime();
        Date createDate;
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(createDate);
        if (businessOrderDO.getOrderCategory().equalsIgnoreCase("4")){
            calendar.add(Calendar.MINUTE,Integer.parseInt(wlyyHospitalSysDictDO.getPyCode()));
        }else {
        if (businessOrderDO!=null){
            createDate = businessOrderDO.getCreateTime();
            calendar.add(Calendar.MINUTE,Integer.parseInt(wlyyHospitalSysDictDO.getDictCode()));
            calendar.setTime(createDate);
        }else {
            calendar.add(Calendar.MINUTE,Integer.parseInt(wlyyHospitalSysDictDO.getPyCode()));
            WlyyPrescriptionDO prescriptionDO = prescriptionDao.findOne(relationCode);
            calendar.setTime(prescriptionDO.getCreateTime());
            createDate =prescriptionDO.getCreateTime();
        }
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String time = sdf.format(calendar.getTime());
        JSONObject object = new JSONObject();
        object.put("endTime",time);
        object.put("createTime",businessOrderDO.getCreateTime());
        object.put("createTime",createDate);
        return object;
    }