[解决bug]

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

@@ -126,8 +126,16 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
            @ApiParam(name = "pickUpNum", value = "取药码")
            @RequestParam(value = "pickUpNum", required = false) String pickUpNum,
            @ApiParam(name = "cardNum", value = "社保卡号")
            @RequestParam(value = "cardNum", required = false) String cardNum
    ) {
            @RequestParam(value = "cardNum", required = false) String cardNum,
            @ApiParam(name = "ehcCard", value = "电子健康卡")
            @RequestParam(value = "ehcCard", required = false) String ehcCard
    ) throws Exception {
        if (StringUtils.isNoneBlank(ehcCard)){
            cardNum = orderservice.getEhcCardInfo(ehcCard);
            if (!StringUtils.isNoneBlank(cardNum)){
                return failed("电子健康卡扫码失败");
            }
        }
        JSONObject jsonObject =  orderservice.checkOrderAndReturnOrderList(deviceId, pickUpNum, cardNum);
        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

@@ -1469,15 +1469,33 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                result.put("response", ConstantUtils.FAIL);
                return result;
            }
            MedicineDevicePrintMessage devicePrintMessage = printMessageDao.findDeviceId(deviceId);
            if (devicePrintMessage==null){
                WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("printSys");
                if (hospitalSysDictDO!=null){
                    JSONObject object = JSONObject.parseObject(hospitalSysDictDO.getDictValue());
                    map.put("phone", object.getString("phone"));
                    map.put("remark",object.getString("remark"));
                    map.put("qrCodeContent", object.getString("qrCodeContent"));
                    map.put("info", object.getString("info"));
                }else {
                    map.put("phone", "123456");
                    map.put("remark", "若未取到货物，请您扫描小票二维码申请退款。\n谢谢慢走，祝您生活愉快！");
                    map.put("qrCodeContent", "谢谢慢走，祝您生活愉快！");
                    map.put("info","community,phone,equNum,shipTime");
                }
            }else {
                map.put("phone",devicePrintMessage.getPhone());
                map.put("remark",devicePrintMessage.getRemark()+"\n"+devicePrintMessage.getRemarkEnd());
                map.put("qrCodeContent", devicePrintMessage.getPicture());
                map.put("info",devicePrintMessage.getInfo());
            }
            map.put("orderId", order.getId());
            map.put("prescribeNum", order.getPrescribeNum());
            map.put("community", dmHospitalDO == null ? "" : dmHospitalDO.getName());
            map.put("phone", "123456");
            map.put("num", order.getPrescribeNum());
            map.put("date", DateUtil.dateToStr(new Date(), "yyyy-MM-dd"));
            map.put("time", DateUtil.dateToStr(new Date(), "HH:mm:ss"));
            map.put("remark", "若未取到货物，请您扫描小票二维码申请退款。\n谢谢慢走，祝您生活愉快！");
            map.put("qrCodeContent", "谢谢慢走，祝您生活愉快！");
            if ("1".equals(order.getSellState())) {
                map.put("status", 1);
                map.put("statusName", "已取药");

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

@@ -419,7 +419,7 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
                    }
                }
            }
            Mediicinestockup mediicinestockup = upDao.findOne(map.get("id").toString());
            Mediicinestockup mediicinestockup = upDao.findOne(map.get("upNum").toString());
            if (mediicinestockup!=null){
                map.put("upNo",mediicinestockup.getDocNum());
            }