Merge branch 'medicare' of liubing/wlyy2.0 into medicare

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/ServiceNoLoginEndPoint.java

@@ -31,6 +31,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -68,6 +69,8 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
    private BaseTownService baseTownService;
    @Autowired
    private WlyyHttpLogService wlyyHttpLogService;
    @Value("${spring.profiles}")
    private String springProfiles;
    @GetMapping(value = "/devinfo")
    @ApiOperation(value = "获取单个设备上的所有广告")
@@ -164,10 +167,13 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
            }
        }
        //拉取线下智业订单
        if (StringUtils.isNoneBlank(cardNum)){
            orderservice.getPhysicApplyWaitExecList(deviceId,cardNum,patientName);
        if (!"jwtest".equals(springProfiles)){//测试线不走这个
            //拉取线下智业订单
            if (StringUtils.isNoneBlank(cardNum)){
                orderservice.getPhysicApplyWaitExecList(deviceId,cardNum,patientName);
            }
        }
        JSONObject jsonObject =  orderservice.checkOrderAndReturnOrderList(deviceId, pickUpNum, cardNum,patientName);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));

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

@@ -2235,6 +2235,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        }
        if (!StringUtils.isEmpty(cardNum)) {
            orders.addAll(orderDao.findMediicineordersBySocialSecurityCardNumAndSellStateAndBelongCommunity(cardNum, "0",mediicinedevice.getBelongCommunity()));
            orders.addAll(orderDao.findMediicineordersBySocialSecurityCardNumAndSellStateAndBelongCommunity(cardNum, "-5",mediicinedevice.getBelongCommunity()));
        }
        orders = orders.stream().distinct().collect(Collectors.toList());
        if (orders == null || orders.size() == 0) {
@@ -2329,8 +2330,13 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                orderList.add(map);
                continue;
            }
            map.put("status", 0);
            map.put("statusName", "未取药");
            if ("-5".equals(order.getSellState())){
                map.put("status", -5);
                map.put("statusName", "出药异常订单已被锁定");
            }else {
                map.put("status", 0);
                map.put("statusName", "未取药");
            }
            //取得订单详情
            List<Mediicineorderdetail> list = orderdetailDao.findMediicineorderdetailsByIdOrder(order.getId());
            //未取药列表

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/MedicineService.java

@@ -229,6 +229,7 @@ public class MedicineService {
    public void syncPrescriptionStatus() {
        List<Mediicineorder> mediicineorderList = mediicineorderDao.findMediicineorderBySellState("0");
        mediicineorderList.addAll(mediicineorderDao.findMediicineorderBySellState("-5"));
        int i=0;
        for (Mediicineorder mediicineorder:mediicineorderList){
            String result = getDataStatus(mediicineorder.getPickUpNum(),mediicineorder.getBelongCommunity());