补货日志

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicineorderDao.java

@@ -8,6 +8,7 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
import java.util.List;
public interface MediicineorderDao extends PagingAndSortingRepository<Mediicineorder, String>, JpaSpecificationExecutor<Mediicineorder> {
@@ -32,5 +33,7 @@ public interface MediicineorderDao extends PagingAndSortingRepository<Mediicineo
    Mediicineorder findMediicineorderByPickUpNum(String pickUpNum);
    Mediicineorder findMediicineorderBySocialSecurityCardNum(String cardNum);
    List<Mediicineorder> findMediicineordersBySocialSecurityCardNum(String cardNum);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineDeviceEndpoint.java

@@ -503,13 +503,15 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.BaseDevice.getDeviceInventoryRecordListWithUserId)
    @ApiOperation(value = "获取设备列表and补货记录夹带userId", notes = "获取设备列表and补货记录")
    public PageEnvelop getDeviceInventoryRecordListWithUserId(
                                                @ApiParam(name = "type", value = "日志类型", required = true)
                                                @RequestParam(value = "type") String type,
                                               @ApiParam(name = "userId", value = "用户id", required = true)
                                               @RequestParam(value = "userId") String userId,
                                               @ApiParam(name = "page", value = "页码", required = true, defaultValue = "1")
                                               @RequestParam(value = "page") int page,
                                               @ApiParam(name = "size", value = "分页大小", required = true, defaultValue = "15")
                                               @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = deviceService.getDeviceInventoryRecordListWithUserId(userId, page, size);
        JSONObject result = deviceService.getDeviceInventoryRecordListWithUserId(type, userId, page, size);
        return success(result.getJSONArray("msg"), result.getInteger("count"), page, size);
    }

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

@@ -493,6 +493,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            return result;
        }
        Mediicineorder mediicineorder = null;
//        List<Mediicineorder> mediicineorders = new ArrayList<>();
        if (!StringUtils.isEmpty(pickUpNum)) {
            mediicineorder = orderDao.findMediicineorderByPickUpNum(pickUpNum);
        }

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

@@ -1981,7 +1981,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    }
    public JSONObject getDeviceInventoryRecordListWithUserId(String userId, int page, int size) throws Exception {
    public JSONObject getDeviceInventoryRecordListWithUserId(String type, String userId, int page, int size) throws Exception {
        JSONObject result = new JSONObject();
        UserDO user = userDao.findOne(userId);
@@ -2160,7 +2160,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            stringObjectMap.put("children",
                    inventoryRecordDao.findMedicineDrugInventoryRecordsByDeviceIdAndEquNumAndType(
                            stringObjectMap.get("id").toString(),
                            stringObjectMap.get("equNum").toString(), "1"));
                            stringObjectMap.get("equNum").toString(), type));
        }
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +