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