|
@@ -601,9 +601,9 @@ public class InquiryOrderController extends AppBaseController {
|
|
|
public R getInquiryOrderById(@RequestParam("orderId")Long orderId)
|
|
public R getInquiryOrderById(@RequestParam("orderId")Long orderId)
|
|
|
{
|
|
{
|
|
|
FsInquiryOrder order=inquiryOrderService.selectFsInquiryOrderByOrderId(orderId);
|
|
FsInquiryOrder order=inquiryOrderService.selectFsInquiryOrderByOrderId(orderId);
|
|
|
-// if(!order.getUserId().equals(Long.parseLong(getUserId()))){
|
|
|
|
|
-// return R.error("非法操作");
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ if(!order.getUserId().equals(Long.parseLong(getUserId()))){
|
|
|
|
|
+ return R.error("非法操作");
|
|
|
|
|
+ }
|
|
|
if(order!=null&&StringUtils.isNotEmpty(order.getPatientJson())){
|
|
if(order!=null&&StringUtils.isNotEmpty(order.getPatientJson())){
|
|
|
FsInquiryOrderPatientDTO dto=JSONUtil.toBean(order.getPatientJson(),FsInquiryOrderPatientDTO.class);
|
|
FsInquiryOrderPatientDTO dto=JSONUtil.toBean(order.getPatientJson(),FsInquiryOrderPatientDTO.class);
|
|
|
dto.setMobile(ParseUtils.parsePhone(dto.getMobile()));
|
|
dto.setMobile(ParseUtils.parsePhone(dto.getMobile()));
|
|
@@ -620,9 +620,9 @@ public class InquiryOrderController extends AppBaseController {
|
|
|
{
|
|
{
|
|
|
Map<String,Object> maps=new HashMap<>();
|
|
Map<String,Object> maps=new HashMap<>();
|
|
|
FsInquiryOrder order=inquiryOrderService.selectFsInquiryOrderByOrderId(orderId);
|
|
FsInquiryOrder order=inquiryOrderService.selectFsInquiryOrderByOrderId(orderId);
|
|
|
-// if(!order.getUserId().equals(Long.parseLong(getUserId()))){
|
|
|
|
|
-// return R.error("非法操作");
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ if(!order.getUserId().equals(Long.parseLong(getUserId()))){
|
|
|
|
|
+ return R.error("非法操作");
|
|
|
|
|
+ }
|
|
|
if(order!=null&&StringUtils.isNotEmpty(order.getPatientJson())){
|
|
if(order!=null&&StringUtils.isNotEmpty(order.getPatientJson())){
|
|
|
FsInquiryOrderPatientDTO dto=JSONUtil.toBean(order.getPatientJson(),FsInquiryOrderPatientDTO.class);
|
|
FsInquiryOrderPatientDTO dto=JSONUtil.toBean(order.getPatientJson(),FsInquiryOrderPatientDTO.class);
|
|
|
dto.setMobile(ParseUtils.parsePhone(dto.getMobile()));
|
|
dto.setMobile(ParseUtils.parsePhone(dto.getMobile()));
|
|
@@ -695,9 +695,9 @@ public class InquiryOrderController extends AppBaseController {
|
|
|
public R getInquiryOrderReport(@RequestParam("orderId")Long orderId)
|
|
public R getInquiryOrderReport(@RequestParam("orderId")Long orderId)
|
|
|
{
|
|
{
|
|
|
FsInquiryOrderReportUVO report=orderReportService.selectFsInquiryOrderReportUVOByOrderId(orderId);
|
|
FsInquiryOrderReportUVO report=orderReportService.selectFsInquiryOrderReportUVOByOrderId(orderId);
|
|
|
-// if(!report.getUserId().equals(Long.parseLong(getUserId()))){
|
|
|
|
|
-// return R.error("非法操作");
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ if(!report.getUserId().equals(Long.parseLong(getUserId()))){
|
|
|
|
|
+ return R.error("非法操作");
|
|
|
|
|
+ }
|
|
|
if(report!=null&&StringUtils.isNotEmpty(report.getPatientJson())){
|
|
if(report!=null&&StringUtils.isNotEmpty(report.getPatientJson())){
|
|
|
FsInquiryOrderPatientDTO dto=JSONUtil.toBean(report.getPatientJson(),FsInquiryOrderPatientDTO.class);
|
|
FsInquiryOrderPatientDTO dto=JSONUtil.toBean(report.getPatientJson(),FsInquiryOrderPatientDTO.class);
|
|
|
dto.setMobile(ParseUtils.parsePhone(dto.getMobile()));
|
|
dto.setMobile(ParseUtils.parsePhone(dto.getMobile()));
|
|
@@ -725,9 +725,9 @@ public class InquiryOrderController extends AppBaseController {
|
|
|
public R getCompanyUserInquiryOrderById(@RequestParam("orderId")Long orderId)
|
|
public R getCompanyUserInquiryOrderById(@RequestParam("orderId")Long orderId)
|
|
|
{
|
|
{
|
|
|
FsInquiryOrder order=inquiryOrderService.selectFsInquiryOrderByOrderId(orderId);
|
|
FsInquiryOrder order=inquiryOrderService.selectFsInquiryOrderByOrderId(orderId);
|
|
|
-// if(!order.getCompanyUserId().equals(getCompanyUserId())){
|
|
|
|
|
-// return R.error("非法操作");
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ if(!order.getCompanyUserId().equals(getCompanyUserId())){
|
|
|
|
|
+ return R.error("非法操作");
|
|
|
|
|
+ }
|
|
|
if(order!=null&&StringUtils.isNotEmpty(order.getPatientJson())){
|
|
if(order!=null&&StringUtils.isNotEmpty(order.getPatientJson())){
|
|
|
FsInquiryOrderPatientDTO dto=JSONUtil.toBean(order.getPatientJson(),FsInquiryOrderPatientDTO.class);
|
|
FsInquiryOrderPatientDTO dto=JSONUtil.toBean(order.getPatientJson(),FsInquiryOrderPatientDTO.class);
|
|
|
dto.setMobile(ParseUtils.parsePhone(dto.getMobile()));
|
|
dto.setMobile(ParseUtils.parsePhone(dto.getMobile()));
|