Browse Source

资金对接返回值修改

chenjiasheng 3 năm trước cách đây
mục cha
commit
573550968c

+ 0 - 2
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/FundsManagementEndpoint.java

@ -65,9 +65,7 @@ public class FundsManagementEndpoint extends EnvelopRestEndpoint {
        MixEnvelop expressages=null;
        MixEnvelop expressages=null;
        try {
        try {
            expressages = medicineOrderService.getSumAmount(belongCommunity,equNum,page,size);
            expressages = medicineOrderService.getSumAmount(belongCommunity,equNum,page,size);
            if (expressages!=null)
            return success(expressages);
            return success(expressages);
            else return failed("该设备不存在");
        } catch (Exception e) {
        } catch (Exception e) {
            return failedException(e);
            return failedException(e);
        }
        }

+ 3 - 3
svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@ -1618,7 +1618,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                if (!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
                if (!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
                    Mediicinedevice device=deviceDao.findByBelongCommunity(belongCommunity);
                    Mediicinedevice device=deviceDao.findByBelongCommunity(belongCommunity);
                    if (device==null){
                    if (device==null){
                        return null;
                        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,new ArrayList());
                    }
                    }
                    map.put("community",device.getCommunity());
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
@ -1626,7 +1626,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    oneSql += "AND t.shipping_equ = '" + equNum + "'";
                    oneSql += "AND t.shipping_equ = '" + equNum + "'";
                    Mediicinedevice device=deviceDao.findByBelongCommunityAndEquNum(belongCommunity,equNum);
                    Mediicinedevice device=deviceDao.findByBelongCommunityAndEquNum(belongCommunity,equNum);
                    if (device==null){
                    if (device==null){
                        return null;
                        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,new ArrayList());
                    }
                    }
                    map.put("community",device.getCommunity());
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
@ -1639,7 +1639,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    oneSql += "AND t.shipping_equ = '" + equNum + "'";
                    oneSql += "AND t.shipping_equ = '" + equNum + "'";
                    Mediicinedevice device=deviceDao.findMediicinedeviceByEquNum(equNum);
                    Mediicinedevice device=deviceDao.findMediicinedeviceByEquNum(equNum);
                    if (device==null){
                    if (device==null){
                        return null;
                        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,new ArrayList());
                    }
                    }
                    map.put("community",device.getCommunity());
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));